Use BinomialInt in dt.c and dteval.c, remove binomial

gap-system · Feb 3, 2018 · f16d0bd · f16d0bd
1 parent e0c0804
commit f16d0bd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 36 deletions.
diff --git a/src/dt.c b/src/dt.c
@@ -639,7 +639,7 @@ Obj    MakeFormulaVector(
                 if ( ELM_PLIST(rel, j) == gen  )
                 {
                     prod = ProdInt(ELM_PLIST(vec, 2),
-                                   binomial(ELM_PLIST(rel, j+1), 
+                                   BinomialInt(ELM_PLIST(rel, j+1), 
                                             INTOBJ_INT(i)        )        );
                     SET_ELM_PLIST(vec,  2, prod);
                     /*  tell gasman that vec has changed                     */
@@ -680,34 +680,6 @@ Obj    FuncMakeFormulaVector(
 }
 
 
-/*****************************************************************************
-**
-*F  binomial(<n>, <k>) . . . . . . . . . binomial coefficient of <n> and <k>
-**
-**  'binomial' returns the binomial coefficient of the integers <n> and <k>.
-*/
-Obj  binomial( Obj   n,
-               Obj   k  )
-{
-    UInt    j, kc;
-    Obj     bin, help;
-
-    if ( LtInt( INTOBJ_INT(0), n)  &&  LtInt(n, k)  )
-        return INTOBJ_INT(0);
-    if ( IS_INTOBJ(n)  &&  n == k )
-        return INTOBJ_INT(1);
-    kc = INT_INTOBJ(k);
-    bin = INTOBJ_INT(1);
-    help = DiffInt(n, k);
-    for (j=1; j<=kc; j++)
-        bin = ProdInt( bin, SumInt(help, INTOBJ_INT(j) )  );
-    for (j=1; j<=kc; j++)
-        bin = QuoInt(bin, INTOBJ_INT(j) );
-    return  bin;
-}
-
-
-
 /****************************************************************************
 **
 *F  Leftof(<tree1>,<index1>,<tree2>,<index2>) . . . . test if one tree is left

diff --git a/src/dt.h b/src/dt.h
@@ -59,11 +59,6 @@ extern Obj    MakeFormulaVector(
                           Obj    pr   );
 
 
-extern Obj  binomial(
-               Obj     n,
-               Obj     k    );
-
-
 extern Int     Leftof(
                 Obj     tree1,
                 Int     index1,

diff --git a/src/dteval.c b/src/dteval.c
@@ -132,7 +132,7 @@ Obj     Evaluation(
     if ( IS_INTOBJ(power)  &&  INT_INTOBJ(power) > 0  &&  
          power < ELM_PLIST(vec, 6)     )
         return INTOBJ_INT(0);
-    prod = binomial(power, ELM_PLIST(vec, 6) );
+    prod = BinomialInt(power, ELM_PLIST(vec, 6) );
     len = LEN_PLIST(vec);
     for (i=7; i < len; i+=2)
     {
@@ -141,7 +141,7 @@ Obj     Evaluation(
              ( INT_INTOBJ(help) == 0                 ||
                ( INT_INTOBJ(help) > 0  &&  help < ELM_PLIST(vec, i+1) )  ) )
             return INTOBJ_INT(0);
-        prod = ProdInt( prod, binomial( help, ELM_PLIST(vec, i+1) ) );
+        prod = ProdInt( prod, BinomialInt(help, ELM_PLIST(vec, i+1) ) );
     }
     return prod;
 }