Issue 517 - Fix combin() function to a) increase upper limit and b) keep it from continually recomputing the same values in recursion

git-svn-id: http://google-refine.googlecode.com/svn/trunk@2459 7d457c2a-affb-35e4-300a-418c747d4874

main/src/com/google/refine/expr/functions/math/Combin.java

@@ -59,18 +59,31 @@ public class Combin implements Function {
         return Combin.combination(((Number) args[0]).intValue(), ((Number) args[1]).intValue());
     }
 
-    public static long combination(long n, long k){
+    /*
-        if (k > n) {
+     * Compute binomial coefficient using dynamic programming which takes 
-            throw new IllegalArgumentException ("the number of elements, n, should be larger than the number of combinations, k");
+     * advantage of Pascal's identity as described in:
+     * http://introcs.cs.princeton.edu/java/96optimization/
+     */
+    public static long combination(int n, int k) {
+        long[][] binomial = new long[n+1][k+1];
+
+        for (int j = 1; j <= k; j++) {
+            binomial[0][j] = 0;
         }
-        if (n < 1) {
+        for (int i = 0; i <= n; i++) {
-            throw new IllegalArgumentException ("the number of elements, n, cannot be less than 1");
+            binomial[i][0] = 1;
         }
-        // TODO: This needs to use a more efficient Binomial Coefficient algorithm
+
-        long nFact = FactN.factorial(n, 1);
+        for (int i = 1; i <= n; i++) {
-        long rFact = FactN.factorial(k, 1);
+            for (int j = 1; j <= k; j++) {
-        long nminusrFact = FactN.factorial(n - k, 1);
+                binomial[i][j] = binomial[i-1][j-1] + binomial[i-1][j];
-        return nFact / (rFact * nminusrFact);
+                if (binomial[i][j] > Long.MAX_VALUE || binomial[i][j] < 0) {
+                    throw new RuntimeException("Range limit exceeded");
+                }
+            }
+        }
+
+        return binomial[n][k];
     }
 
     @Override