Changeset 13be01 in git for factory

Timestamp:

Jul 3, 2008, 12:02:17 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

84acfb6c0595b6d484ac13d1c4749d9828283c0e

Parents:

cf315c3c3d6ea2b0b48d53abb5830ae445c6e822

Message:

*hannes: fieldGCD -> gcd in recursion


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

File:

• factory/fieldGCD.cc (modified) (7 diffs)

factory/fieldGCD.cc

@@ -13 +13 @@
 #include "cf_generator.h"
 
+void out_cf(char *s1,const CanonicalForm &f,char *s2);
+
+
 CanonicalForm fieldGCD( const CanonicalForm & F, const CanonicalForm & G );
 void CRA(const CanonicalForm & x1, const CanonicalForm & q1, const CanonicalForm & x2, const CanonicalForm & q2, CanonicalForm & xnew, CanonicalForm & qnew);
@@ -24 +27 @@
 {// this is the modular method by Brown
  // assume F,G are multivariate polys over Z/p for big prime p
- if(F.isZero())
+  if(F.isZero())
   {
     if(G.isZero())
@@ -40 +43 @@
   if(F.inCoeffDomain() || G.inCoeffDomain())
     return CanonicalForm(1);
+  //out_cf("F=",F,"\n");
+  //out_cf("G=",G,"\n");
   CFMap MM,NN;
   CFArray ps(1,2);
@@ -62 +67 @@
   g/=cg;
   if(f.inCoeffDomain() || g.inCoeffDomain())
+  {
+    //printf("=============== inCoeffDomain\n");
     return NN(c);
+  }
   int *L = new int[mv+1]; // L is addressed by i from 2 to mv
   int *M = new int[mv+1];
@@ -87 +95 @@
     if(gamma_image.isZero()) // skip lc-bad points var(1)-alpha
       continue;
-    g_image = fieldGCD( f(alpha, Variable(1)), g(alpha, Variable(1)) ); // recursive call with one var less
+    g_image = gcd( f(alpha, Variable(1)), g(alpha, Variable(1)) ); // recursive call with one var less
     if(g_image.inCoeffDomain()) // early termination
+    {
+      //printf("================== inCoeffDomain\n");
       return NN(c);
+    }
     for(int i=2; i<=mv; i++)
       dg_im[i] = 0; // reset (this is necessary, because some entries may not be updated by call to leadDeg)
@@ -105 +116 @@
       {
         g_image = gm / vcontent(gm, Variable(2));
+        //out_cf("=========== try ",g_image,"\n");
         if(fdivides(g_image,f) && fdivides(g_image,g)) // trial division
+        {
+          //printf("=========== okay\n");
           return NN(c*g_image);
+        }
       }
       gm = gnew;
@@ -117 +132 @@
     if(isLess(dg_im, L, 2, mv)) // dg_im < L --> all previous points were unlucky
     {
+      //printf("=========== reset\n");
       m = CanonicalForm(1); // reset
       gm = 0; // reset