Changeset c3e25cb in git for factory/facFqFactorize.cc

Timestamp:

Feb 2, 2013, 12:17:41 AM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

ef3f67d990aa73f5fe348cbacb2fba503293039d

Parents:

b27212a0b8d7c43fe879f98588cf7d17e96a720d

git-author:

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

git-committer:

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

Message:

fix: make sure the right level is computed

File:

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

factory/facFqFactorize.cc

@@ -2200 +2200 @@
   CFArray l;
   int pos, index;
+  bool leaveLoop=false;
   for (int j= 0; j < AevalLength; j++)
   {
@@ -2207 +2208 @@
       for (iter= evaluation; iter.hasItem(); iter++, i--)
       {
-        if (i == Aeval[j].getFirst().level())
-        {
-          evalPoint= iter.getItem();
+        for (iter2= Aeval[j]; iter2.hasItem(); iter2++)
+        {
+          if (i == iter2.getItem().level())
+          {
+            evalPoint= iter.getItem();
+            leaveLoop= true;
+            break;
+          }
+        }
+        if (leaveLoop)
+        {
+          leaveLoop= false;
           break;
         }
@@ -2256 +2266 @@
                       int minFactorsLength)
 {
-  CFListIterator iter;
+  CFListIterator iter, iter2;
   CanonicalForm evalPoint;
   int i;
@@ -2262 +2272 @@
   Variable y= Variable (2);
   CFList list;
+  bool leaveLoop= false;
   for (int j= 0; j < A.level() - 2; j++)
   {
@@ -2270 +2281 @@
       for (iter= evaluation; iter.hasItem(); iter++, i--)
       {
-        if (i == Aeval[j].getFirst().level())
-        {
-          evalPoint= iter.getItem();
+        for (iter2= Aeval[j]; iter2.hasItem(); iter2++)
+        {
+          if (i == iter2.getItem().level())
+          {
+            evalPoint= iter.getItem();
+            leaveLoop= true;
+            break;
+          }
+        }
+        if (leaveLoop)
+        {
+          leaveLoop= false;
           break;
         }