Changeset 2dbe57 in git

Timestamp:

Feb 3, 2013, 11:41:08 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

f4d7641e74a466b25fca59f236f67698ac0ac369

Parents:

f18f58e98999305024a09db437ce1cd47ef15d21

git-author:

Martin Lee <martinlee84@web.de>2013-02-03 23:41:08+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-02-18 15:00:18+01:00

Message:

chg: clean up and editing

File:

• factory/facFqFactorize.cc (modified) (29 diffs)

factory/facFqFactorize.cc

@@ -50 +50 @@
 TIMING_DEFINE_PRINT(fac_fq_compress)
 
-
-void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
-void out_cff(CFFList &L);
 
 static inline
@@ -1328 +1325 @@
              const CFArray& evalPoint)
 {
-  for (int i= 0; i < evalPoint.size(); i++)
-    out_cf ("evalPoint= ", evalPoint[i], "\n");
-
   CanonicalForm F= G;
   CFFList sqrfFactorization;
@@ -1346 +1340 @@
   CanonicalForm test= evalSqrfPartF.getFirst() (evalPoint[0], 2);
 
-  out_cf ("test= ", test, "\n");
-  out_cf ("sqrfPartF= ", sqrfPartF, "\n");
   if (degree (test) != degree (sqrfPartF, 1) || test.inCoeffDomain())
     return 0;
@@ -1389 +1381 @@
       for (iter= bufSqrfFactors [i]; iter.hasItem(); iter++)
       {
-        out_cf ("bufSqrfFactors[0]= ", iter.getItem().factor(), "\n");
         if (iter.getItem().factor().inCoeffDomain())
           continue;
@@ -1400 +1391 @@
     else
     {
-      printf ("i= %d\n", i);
       for (iter= bufSqrfFactors [i]; iter.hasItem(); iter++)
       {
@@ -1408 +1398 @@
                                   Lc (iter.getItem().factor()),
                                   iter.getItem().exp());
-        out_cf ("bufSqrfFactors[i]= ", iter.getItem().factor(), "\n");
         if (!find (factors, iter.getItem().factor()))
           factors.append (iter.getItem().factor());
@@ -1416 +1405 @@
 
   test= prod (factors);
-  out_cf ("test= ", test, "\n");
   tmp= evalSqrfPartF.getFirst() (evalPoint[0],2);
-  out_cf ("tmp= ", tmp, "\n");
   if (test/Lc (test) != tmp/Lc (tmp))
     return 0;
@@ -1432 +1419 @@
                        )
 {
-  out_cf ("LCF= ", LCF, "\n");
-  printf ("LCFFactors.length()= %d\n", LCFFactors.length());
-  for (CFListIterator iter= evaluation; iter.hasItem(); iter++)
-    out_cf ("evaluation= ", iter.getItem(), "\n");
-  for (CFListIterator iter= LCFFactors; iter.hasItem(); iter++)
-    out_cf ("LCFFactors= ", iter.getItem(), "\n");
-
-  for (int j= 0; j < lSecondVarLCs; j++)
-  {
-    printf ("differentSecondVar= ");
-    for (CFListIterator iter= differentSecondVarLCs[j]; iter.hasItem(); iter++)
-      out_cf ("", iter.getItem(), " ");
-    printf ("\n");
-  }
   y= Variable (1);
   if (LCF.inCoeffDomain())
@@ -1452 +1425 @@
     for (int i= 1; i <= LCFFactors.length() + 1; i++)
       result.append (1);
-      printf ("exit00\n");
     return result;
   }
@@ -1498 +1470 @@
       result.insert (Lc (LCF));
     else
-    {
-      //for (CFListIterator i= result; i.hasItem(); i++)
-        //result.append (1);
       result.insert (LCF);
-    }
-      printf ("exit0\n");
+
     return result;
   }
@@ -1528 +1496 @@
   buf= swap;
   for (int i= 0; i < evaluation.length() - 1; i++)
-  {
-    out_cf ("buf[i]= ", buf[i], "\n");
     evalPoint[i]= buf[i+1];
-  }
-  out_cf ("buf[i]= ", buf[evaluation.length()-1], "\n");
+
   int pass= testFactors (F, factors, alpha, sqrfPartF,
                          bufFactors, bufSqrfFactors, evalSqrfPartF, evalPoint);
@@ -1570 +1535 @@
         bufBufFactors= bufFactors;
         evalPoint= CFArray (evaluation.length() - 1);
-        out_cf ("x= ", x, "\n");
-        out_cf ("z= ", z, "\n");
         for (int k= 1; k < evaluation.length(); k++)
         {
@@ -1579 +1542 @@
             evalPoint[k-1]= buf[0];
         }
-        printf ("swap war nötig\n");
-        for (int jj= 0; jj < evalPoint.size(); jj++)
-          out_cf ("evalPoint= ", evalPoint[jj], "\n");
         pass= testFactors (bufF, bufBufFactors, alpha, sqrfPartF, bufFactors,
                            bufSqrfFactors, evalSqrfPartF, evalPoint);
-        //pass= false;
         if (pass)
         {
@@ -1603 +1562 @@
             result.append (1);
           result= distributeContent (result, differentSecondVarLCs, lSecondVarLCs);
-          printf ("this exit\n");
           y= Variable (1);
-          /*if (!result.getFirst().inCoeffDomain())
-          {
-            CFListIterator iter= result;
-            CanonicalForm tmp= iter.getItem();
-            iter++;
-            for (; iter.hasItem(); iter++)
-              iter.getItem() *= tmp;
-          }
-          y= Variable (1);*/
           delete [] bufSqrfFactors;
           return result;
@@ -1627 +1576 @@
       result.append (1);
     result= distributeContent (result, differentSecondVarLCs, lSecondVarLCs);
-    printf ("no that exit\n");
-    /*if (!result.getFirst().inCoeffDomain())
-    {
-      CFListIterator iter= result;
-      CanonicalForm tmp= iter.getItem();
-      iter++;
-      for (; iter.hasItem(); iter++)
-        iter.getItem() *= tmp;
-    }*/
     y= Variable (1);
     delete [] bufSqrfFactors;
@@ -1786 +1726 @@
   result.insert (N (F));
 
-  out_cf ("result.getFirst()= ", result.getFirst(), "\n");
-  out_cf ("content (result.getFirst())= ", content (result.getFirst()), "\n");
-  printf ("foundDifferent= %d\n", foundDifferent);
-    for (int i= 0; i < lSecondVarLCs; i++)
-    {
-      printf ("differentSecondVarLCs ");
-      for (CFListIterator pp= differentSecondVarLCs[i]; pp.hasItem(); pp++)
-        out_cf ("", pp.getItem(), " ");
-      printf ("\n");
-    }
-      for (CFListIterator pp= LCFFactors; pp.hasItem(); pp++)
-        out_cf ("LCFactors", pp.getItem(), "\n");
-  printf ("y.level()= %d\n", y.level());
-  printf ("x.level()= %d\n", x.level());
-  printf ("z.level()= %d\n", z.level());
-
   result= distributeContent (result, differentSecondVarLCs, lSecondVarLCs);
 
-        for (CFListIterator iter= result; iter.hasItem(); iter++)
-          out_cf ("result bis kurz vor schluß= ", iter.getItem(), "\n");
-
   if (!result.getFirst().inCoeffDomain())
   {
+    // prepare input for recursion
     if (foundDifferent)
     {
       for (CFListIterator i= result; i.hasItem(); i++)
         i.getItem()= swapvar (i.getItem(), Variable (2), y);
-      CFList l= differentSecondVarLCs [j]; //nasty
+      CFList l= differentSecondVarLCs [j];
       for (CFListIterator i= l; i.hasItem(); i++)
         i.getItem()= swapvar (i.getItem(), y, z);
       differentSecondVarLCs [j]= l;
     }
-    printf ("not the whole leading coeff\n");
-    out_cf ("result.getFirst()= ", result.getFirst(), "\n");
-    out_cf ("y= ", y, "\n");
-    out_cf ("LCF= ", LCF, "\n");
-    for (int i= 0; i < lSecondVarLCs; i++)
-    {
-      printf ("differentSecondVarLCs ");
-      for (CFListIterator pp= differentSecondVarLCs[i]; pp.hasItem(); pp++)
-        out_cf ("", pp.getItem(), " ");
-      printf ("\n");
-    }
-    CFListIterator i; //= result;
-    CanonicalForm tmp;
-    /*if (foundDifferent)
-      i.getItem()= swapvar (i.getItem(), Variable (2), y);
-
-    tmp= i.getItem();
-
-    i++;
-    for (; i.hasItem(); i++)
-    {
-      out_cf ("lc= ", i.getItem(), "\n");
-      if (foundDifferent)
-        i.getItem()= swapvar (i.getItem(), Variable (2), y); //*tmp;
-    }*/
-    for (i=evaluation; i.hasItem(); i++)
-      out_cf ("eval= ", i.getItem(), "\n");
-    for (int jj= 0; jj < evalPoint.size(); jj++)
-      out_cf ("evalPoint= ", evalPoint[jj], "\n");
 
     F= result.getFirst();
@@ -1864 +1757 @@
       }
     }
-    printf ("y.level()= %d\n", y.level());
-    printf ("lSecondVarLCs= %d\n", lSecondVarLCs);
 lcretry:
     if (lSecondVarLCs - level > 0)
@@ -1872 +1763 @@
       int j= lSecondVarLCs+2;
       CanonicalForm swap;
+      CFListIterator i;
       for (i= evaluation2; i.hasItem(); i++, j--)
       {
@@ -1894 +1786 @@
         goto lcretry;
       }
-      i= newLCs; //kann leer sein!?
+      i= newLCs;
       CFListIterator iter= result;
       iter++;
@@ -1903 +1795 @@
         {
           int count= evaluation.length()+1;
-          for (CFListIterator iter2= evaluation2; iter2.hasItem(); iter2++, count--)
+          for (CFListIterator iter2= evaluation2; iter2.hasItem(); iter2++,
+                                                                    count--)
           {
             if (count != level+3)
@@ -1928 +1821 @@
               {
                 int count= evaluation.length()+1;
-                for (CFListIterator iter2= evaluation2; iter2.hasItem(); iter2++, count--)
+                for (CFListIterator iter2= evaluation2; iter2.hasItem();iter2++,
+                                                                        count--)
                 {
                   if (count != j+3)
@@ -1943 +1837 @@
         evaluation2.removeLast();
       Variable dummyvar= Variable (1);
-      for (i= evaluation2; i.hasItem(); i++)
-        out_cf ("evaluation2= ", i.getItem(), "\n");
-      for (i= newLCs; i.hasItem(); i++)
-        out_cf ("newLCs= ", i.getItem(), "\n");
-
-      //// test
+
       CanonicalForm newLCF= result.getFirst();
       newLCF=swapvar (newLCF, Variable (2), Variable (level+3));
       for (i=newLCs; i.hasItem(); i++)
         i.getItem()= swapvar (i.getItem(), Variable (2), Variable (level+3));
-      for (int j= 0; j < lSecondVarLCs-level-1;j++)
-      {
-        for (i= differentSecondVarLCs2[j]; i.hasItem(); i++)
-          i.getItem()= swapvar (i.getItem(), Variable (2+j+1), Variable (level+3+j+1));
-        newLCF= swapvar (newLCF, Variable (2+j+1), Variable (level+3+j+1));
-      }
-      ////
-      for (int j= 0; j < lSecondVarLCs-level-1; j++)
-      {
-        printf ("differentSecondVarLCs2\n");
-        for (i= differentSecondVarLCs2[j]; i.hasItem(); i++)
-          out_cf ("", i.getItem(), " ");
-        printf ("\n");
-      }
-      for (i= newLCs; i.hasItem(); i++)
-        out_cf ("newLCs= ", i.getItem(), "\n");
-      out_cf ("newLCF= ", newLCF, "\n");
-      printf ("before recursion\n");
-      CFList recursiveResult= precomputeLeadingCoeff(newLCF, newLCs, alpha, evaluation2, differentSecondVarLCs2, lSecondVarLCs - level - 1, dummyvar);
+      for (int j= 1; j < lSecondVarLCs-level;j++)
+      {
+        for (i= differentSecondVarLCs2[j-1]; i.hasItem(); i++)
+          i.getItem()= swapvar (i.getItem(), Variable (2+j),
+                                             Variable (level+3+j));
+        newLCF= swapvar (newLCF, Variable (2+j), Variable (level+3+j));
+      }
+
+      CFList recursiveResult=
+      precomputeLeadingCoeff (newLCF, newLCs, alpha, evaluation2,
+                              differentSecondVarLCs2, lSecondVarLCs - level - 1,
+                              dummyvar);
 
       if (dummyvar.level() != 1)
@@ -1981 +1863 @@
       {
         for (int j= lSecondVarLCs-level-1; j > 0; j--)
-          i.getItem()=swapvar (i.getItem(), Variable (2+j), Variable (level+3+j));
+          i.getItem()=swapvar (i.getItem(), Variable (2+j),
+                                      Variable (level+3+j));
         i.getItem()= swapvar (i.getItem(), Variable (2), Variable (level+3));
       }
 
-      out_cf ("recursiveResult.getFirst()= ", recursiveResult.getFirst(), "\n");
       if (recursiveResult.getFirst() == result.getFirst())
       {
-        /*i= result;
-        i++;
-        for (; i.hasItem(); i++)
-          i.getItem() *= tmp;*/
         delete [] bufSqrfFactors;
         delete [] differentSecondVarLCs2;
@@ -1998 +1876 @@
       else
       {
-        CFListIterator iter=recursiveResult;
+        iter=recursiveResult;
         i= result;
         i.getItem()= iter.getItem();
@@ -2004 +1882 @@
         iter++;
         for (; i.hasItem(); i++, iter++)
-        {
           i.getItem() *= iter.getItem();
-        }
-        for (CFListIterator iter= result; iter.hasItem(); iter++)
-          out_cf ("result am Ende= ", iter.getItem(), "\n");
         delete [] differentSecondVarLCs2;
       }
@@ -2523 +2397 @@
   CanonicalForm lcmCont= lcmContent (A, contentAi);
   A /= lcmCont;
-  out_cf ("lcmCont= ", lcmCont, "\n");
-  for (int i= 1; i <= A.level(); i++)
-    out_cf ("LC= ", LC (A,i), "\n");
   TIMING_END_AND_PRINT (fac_fq_content, "time to extract content over Fq: ");
 
@@ -2915 +2786 @@
 
   CanonicalForm LCmultiplier= leadingCoeffs.getFirst();
-  out_cf ("LCmultiplier= ", LCmultiplier, "\n");
   bool LCmultiplierIsConst= LCmultiplier.inCoeffDomain();
   leadingCoeffs.removeFirst();
@@ -3490 +3360 @@
 tryAgainWithoutHeu:
   TIMING_START (fac_fq_shift_to_zero);
-  out_cf ("LC (A,1)= ", LC (A,1), "\n");
-  out_cf ("LC (oldA,1)= ", LC (oldA,1), "\n");
   A= shift2Zero (A, Aeval, evaluation);
 
@@ -3546 +3414 @@
   if (noOneToOne)
   {
-    printf ("noOneToOne\n");
     if (!LCmultiplierIsConst && LCheuristic)
     {