Changeset b1d287 in git for factory/cf_gcd.cc

Timestamp:

Aug 1, 2012, 2:25:24 AM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

0df59c8a8e59eded04e4aca4e57cfed188a00cf1

Parents:

09afeb85ea17e564813761786f76281c8162dad0362fc6799a207ad61d3be8abe0206e52b5782e50

Message:

Merge pull request #157 from mmklee/factory_catch_up_sw

Factory catch up sw

File:

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

factory/cf_gcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id$ */
 
 #include "config.h"
@@ -1233 +1232 @@
   cl =  gcd (f.lc(),g.lc());
   CanonicalForm gcdcfcg= gcd (cf, cg);
+  CanonicalForm fp, gp;
   CanonicalForm b= 1;
   int minCommonDeg= 0;
@@ -1260 +1260 @@
 
   CanonicalForm cof, cog, cofp, cogp, newCof, newCog, cofn, cogn;
+  int maxNumVars= tmax (getNumVars (f), getNumVars (g));
   //Off (SW_RATIONAL);
   while ( true )
@@ -1272 +1273 @@
     //printf("try p=%d\n",p);
     setCharacteristic( p );
+    fp= mapinto (f);
+    gp= mapinto (g);
 #ifdef HAVE_NTL
-    Dp = GCD_small_p (mapinto (f), mapinto (g), cofp, cogp);
+    if (size (fp)/maxNumVars > 500 && size (gp)/maxNumVars > 500)
+      Dp = GCD_small_p (fp, gp, cofp, cogp);
+    else
+    {
+      Dp= gcd_poly (fp, gp);
+      cofp= fp/Dp;
+      cogp= gp/Dp;
+    }
 #else
-    Dp= gcd_poly (mapinto (f), mapinto (g));
-    cofp= mapinto (f)/Dp;
-    cogp= mapinto (g)/Dp;
+    Dp= gcd_poly (fp, gp);
+    cofp= fp/Dp;
+    cogp= gp/Dp;
 #endif
     Dp /=Dp.lc();