Changeset bed38b in git

Timestamp:

Aug 27, 2012, 11:46:16 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

e3cb321a536f5d1fea376ee2b01122921297faa8

Parents:

935632e9d66d12abe5da2483364feb9f4f1266ef

git-author:

Martin Lee <martinlee84@web.de>2012-08-27 11:46:16+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-09-05 15:00:01+02:00

Message:

fix: possible infinite loop

Location:

factory

Files:

• facFactorize.cc (modified) (2 diffs)
• facFqFactorize.cc (modified) (2 diffs)

factory/facFactorize.cc

@@ -1175 +1175 @@
               for (int i=1; i <= tmp.level(); i++)
               {
-                if (degree (tmp, i) > 0)
+                if (degree(tmp,i) > 0 &&
+                    (degree(iter2.getItem(),i) > degree (tmp,i)))
                   iter2.getItem() /= power (Variable (i), degree (tmp,i));
               }
@@ -1340 +1341 @@
       for (int i=1; i <= tmp.level(); i++)
       {
-        if (degree (tmp, i) > 0)
+        if (degree(tmp,i) > 0 && (degree(iter2.getItem(),i) > degree (tmp,i)))
           iter2.getItem() /= power (Variable (i), degree (tmp,i));
       }

factory/facFqFactorize.cc

@@ -2836 +2836 @@
               for (int i=1; i <= tmp.level(); i++)
               {
-                if (degree (tmp, i) > 0)
+                if (degree(tmp,i) > 0 &&
+                    (degree(iter2.getItem(),i) > degree (tmp,i)))
                   iter2.getItem() /= power (Variable (i), degree (tmp,i));
               }
@@ -3002 +3003 @@
       for (int i=1; i <= tmp.level(); i++)
       {
-        if (degree (tmp, i) > 0)
+        if (degree (tmp,i) > 0 && (degree (iter2.getItem(),i) > degree (tmp,i)))
           iter2.getItem() /= power (Variable (i), degree (tmp,i));
       }