Changeset 13f494 in git

Timestamp:

Jul 7, 2011, 9:02:01 AM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

3b77086d506b6745e947edd3c323b6687e2d521c

Parents:

42281d63800a31c74efe7fb9afecba0a2d1cbe9d

Message:

use new division and divisibility test in gcd over Q(a)


git-svn-id: file:///usr/local/Singular/svn/trunk@14329 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• factory/algext.cc (modified) (3 diffs)

factory/algext.cc

@@ -459 +459 @@
   if(fail)
     return;
-  bool divides = true;
-  CanonicalForm tmp;
   // f /= cf
-  tryDivide(f,cf,M,tmp,divides,fail); // 'divides' is not checked
+  f.tryDiv (cf, M, fail);
   if(fail)
     return;
-  f = tmp;
   // g /= cg
-  tryDivide(g,cg,M,tmp,divides,fail); // 'divides' is not checked
+  g.tryDiv (cg, M, fail);
   if(fail)
     return;
-  g = tmp;
   if(f.inCoeffDomain())
   {
@@ -509 +505 @@
   FFGenerator gen = FFGenerator();
   Variable x= Variable (1);
+  bool divides= true;
   for(FFGenerator gen = FFGenerator(); gen.hasItems(); gen.next())
   {
@@ -552 +549 @@
           return;
         divides = true;
-        tryDivide(gm,cf,M,g_image,divides,fail); // 'divides' is ignored
+        g_image= gm;
+        g_image.tryDiv (cf, M, fail);
         if(fail)
           return;
-        tryDivide(f,g_image,M,tmp,divides,fail); // trial division (f)
+        divides= tryFdivides (g_image,f, M, fail); // trial division (f)
         if(fail)
           return;
         if(divides)
         {
-          tryDivide(g,g_image,M,tmp,divides,fail); // trial division (g)
+          bool divides2= tryFdivides (g_image,g, M, fail); // trial division (g)
           if(fail)
             return;
-          if(divides)
+          if(divides2)
           {
             result = NN(reduce (c*g_image, M));