Changeset fd4146 in git

Timestamp:

Mar 20, 2012, 6:42:42 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

4e17e756636ff916fc6ee4d68b7d5079d2ba2642

Parents:

dc390ce13119de61633c0198d8b80e1e0d75c091

git-author:

Martin Lee <martinlee84@web.de>2012-03-20 18:42:42+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:42:27+02:00

Message:

fix: bug in evaluation point search

File:

• factory/facBivar.cc (modified) (3 diffs)

factory/facBivar.cc

@@ -174 +174 @@
       {
         if (testPoint (F, result, -i))
+        {
+          i= -i;
           return result;
+        }
+        else if (i < 0)
+          i= -i;
       }
       k++;
@@ -489 +494 @@
     bufAeval2= evalPoint (buf, bufEvaluation2);
 
-
     // univariate factorization
     TIMING_START (uni_factorize);
@@ -594 +598 @@
       if (bufUniFactors.length() < uniFactors.length())
       {
-        if (evaluation != 0)
-        {
-          uniFactors= bufUniFactors;
-          Aeval= bufAeval;
-          evaluation= bufEvaluation;
-        }
-      }
-    }
-    bufEvaluation++;
-    bufEvaluation2++;
-  }
-
-  if (evaluation != 0 && (uniFactors.length() > uniFactors2.length() ||
+        uniFactors= bufUniFactors;
+        Aeval= bufAeval;
+        evaluation= bufEvaluation;
+      }
+    }
+    if (bufEvaluation > 0)
+      bufEvaluation++;
+    else
+      bufEvaluation= -bufEvaluation + 1;
+    if (bufEvaluation > 0)
+      bufEvaluation2++;
+    else
+      bufEvaluation2= -bufEvaluation2 + 1;
+  }
+
+  if (uniFactors.length() > uniFactors2.length() ||
       (uniFactors.length() == uniFactors2.length()
-       && degs.getLength() > degs2.getLength())))
+       && degs.getLength() > degs2.getLength()))
   {
     degs= degs2;