Changeset 4a7e5c in git

Timestamp:

Aug 27, 2012, 10:53:58 AM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

935632e9d66d12abe5da2483364feb9f4f1266ef

Parents:

0facdca6b24379ab6fa4c490c0c6105b9f0e8c45

git-author:

Martin Lee <martinlee84@web.de>2012-08-27 10:53:58+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-09-04 18:01:19+02:00

Message:

fix: do not use cf_prepgcd

File:

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

factory/cf_gcd.cc

@@ -36 +36 @@
 
 static CanonicalForm cf_content ( const CanonicalForm &, const CanonicalForm & );
-static void cf_prepgcd( const CanonicalForm &, const CanonicalForm &, int &, int &, int & );
 
 void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
@@ -697 +696 @@
 {
   CanonicalForm fc, gc, d1;
-  int mp, cc, p1, pe;
-  mp = f.level()+1;
   bool fc_isUnivariate=f.isUnivariate();
   bool gc_isUnivariate=g.isUnivariate();
   bool fc_and_gc_Univariate=fc_isUnivariate && gc_isUnivariate;
-  cf_prepgcd( f, g, cc, p1, pe);
-  if ( cc != 0 )
-  {
-    if ( cc > 0 )
-    {
-      fc = replacevar( f, Variable(cc), Variable(mp) );
-      gc = g;
-    }
-    else
-    {
-      fc = replacevar( g, Variable(-cc), Variable(mp) );
-      gc = f;
-    }
-    return cf_content( fc, gc );
-  }
-// now each appearing variable is in f and g
   fc = f;
   gc = g;
@@ -739 +720 @@
     else
     #endif
-    if ( p1 == fc.level() )
-      fc = gcd_poly_p( fc, gc );
-    else
-    {
-      fc = replacevar( fc, Variable(p1), Variable(mp) );
-      gc = replacevar( gc, Variable(p1), Variable(mp) );
-      fc = replacevar( gcd_poly_p( fc, gc ), Variable(mp), Variable(p1) );
-    }
+    fc = gcd_poly_p( fc, gc );
   }
   else if (!fc_and_gc_Univariate)
   {
     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
-      {
-        fc = replacevar( fc, Variable(pe), Variable(1) );
-        gc = replacevar( gc, Variable(pe), Variable(1) );
-        fc = replacevar( ezgcd( fc, gc ), Variable(1), Variable(pe) );
-      }
-      else
-      {
-        pe = -pe;
-        fc = swapvar( fc, Variable(pe), Variable(1) );
-        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
+    else if (isOn(SW_USE_CHINREM_GCD))
       fc = chinrem_gcd( fc, gc);
-    #endif
-    }
     else
     {
@@ -1100 +1041 @@
 *    p1 in "gcd_poly1"
 */
-static
+/*static
 void optvalues ( const int * df, const int * dg, const int n, int & p1, int &pe )
 {
@@ -1130 +1071 @@
         i--;
     }
-}
+}*/
 
 /*
 *  make some changes of variables, see optvalues
 */
-static void
+/*static void
 cf_prepgcd( const CanonicalForm & f, const CanonicalForm & g, int & cc, int & p1, int &pe )
 {
@@ -1182 +1123 @@
     delete [] degsf;
     delete [] degsg;
-}
+}*/