Changeset f7a4e9 in git for factory/cf_gcd.cc

Timestamp:

Apr 14, 2012, 1:39:51 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

c244d04150a9fd45331938d2c9fb6f89985acb05

Parents:

a9a6dcbcbc4f0be99516f14eae42b1776235ca9f

git-author:

Martin Lee <martinlee84@web.de>2012-04-14 13:39:51+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-05-07 14:14:17+02:00

Message:

chg: towards better EZGCD

File:

• factory/cf_gcd.cc (modified) (2 diffs)

factory/cf_gcd.cc

@@ -757 +757 @@
   else if (!fc_and_gc_Univariate)
   {
-    if (
-    isOn(SW_USE_CHINREM_GCD)
-    && (isPurePoly_m(fc)) && (isPurePoly_m(gc))
-    )
-    {
-    #if 0
-      if ( p1 == fc.level() )
-        fc = chinrem_gcd( fc, gc );
-      else
-      {
-        fc = replacevar( fc, Variable(p1), Variable(mp) );
-        gc = replacevar( gc, Variable(p1), Variable(mp) );
-        fc = replacevar( chinrem_gcd( fc, gc ), Variable(mp), Variable(p1) );
-      }
-    #else
-      fc = chinrem_gcd( fc, gc);
-    #endif
-    }
-    else if ( isOn( SW_USE_EZGCD ) )
-    {
-      if ( pe == 1 )
+    if ( isOn( SW_USE_EZGCD ) )
+    {
+      fc= ezgcd (fc, gc);
+      /*if ( pe == 1 )
         fc = ezgcd( fc, gc );
       else if ( pe > 0 )// no variable at position 1
@@ -791 +774 @@
         gc = swapvar( gc, Variable(pe), Variable(1) );
         fc = swapvar( ezgcd( fc, gc ), Variable(1), Variable(pe) );
+      }*/
+    }
+    else if (
+    isOn(SW_USE_CHINREM_GCD)
+    && (isPurePoly_m(fc)) && (isPurePoly_m(gc))
+    )
+    {
+    #if 0
+      if ( p1 == fc.level() )
+        fc = chinrem_gcd( fc, gc );
+      else
+      {
+        fc = replacevar( fc, Variable(p1), Variable(mp) );
+        gc = replacevar( gc, Variable(p1), Variable(mp) );
+        fc = replacevar( chinrem_gcd( fc, gc ), Variable(mp), Variable(p1) );
       }
+    #else
+      fc = chinrem_gcd( fc, gc);
+    #endif
     }
     else