Changeset 261602 in git

Timestamp:

Feb 18, 2013, 11:04:27 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

edb81bb221ceae0874c0570e0ac83e5a84b6f77d

Parents:

1daf0ddfd6bd8856ea1fcf2f6e1f8533f4625c75

Message:

chg: some missing parts of Adi's commit

File:

• Singular/iparith.cc (modified) (3 diffs)

Singular/iparith.cc

@@ -63 +63 @@
 #include <Singular/linearAlgebra_ip.h>
 #ifdef HAVE_FACTORY
+#  include <factory/factory.h>
 #  include <polys/clapsing.h>
 #  include <kernel/kstdfac.h>
-#endif /* HAVE_FACTORY */
-#ifdef HAVE_FACTORY
 #  include <kernel/fglm.h>
 #  include <Singular/fglm.h>
@@ -2351 +2350 @@
 static BOOLEAN jjGCD_BI(leftv res, leftv u, leftv v)
 {
+#ifdef HAVE_FACTORY
+  number n1 = (number) u->CopyD();
+  number n2 = (number) v->CopyD();
+  CanonicalForm C1, C2;
+  C1 = coeffs_BIGINT->convSingNFactoryN (n1,TRUE,coeffs_BIGINT);
+  C2 = coeffs_BIGINT->convSingNFactoryN (n2,TRUE,coeffs_BIGINT);
+  CanonicalForm G = gcd (C1,C2);
+  number g = coeffs_BIGINT->convFactoryNSingN (G,coeffs_BIGINT);
+  res->data = g;
+  return FALSE;
+#else
   number a=(number) u->Data();
   number b=(number) v->Data();
@@ -2364 +2374 @@
   }
   return FALSE;
+#endif
 }
 static BOOLEAN jjGCD_N(leftv res, leftv u, leftv v)