Changeset 95c043 in git

Timestamp:

May 16, 2014, 9:58:03 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

7b2d39f82b860ea7b9a1d2d8acc9d0035e965f1f

Parents:

89889e8f44c96b31ec50d021b6a513497cfbbfcc

git-author:

Martin Lee <martinlee84@web.de>2014-05-16 21:58:03+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-05-21 15:06:55+02:00

Message:

fix: bug in removeFactors
chg: improved normalize

File:

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

factory/cfCharSetsUtil.cc

@@ -709 +709 @@
     if (isRat)
       On (SW_RATIONAL);
+    if (lc(G) < 0)
+      G= -G;
     return G;
   }
@@ -934 +936 @@
     testlist.append (CanonicalForm (Variable (i)));
 
+  // remove already removed factors
   for (j= StoredFactors.FS1; j.hasItem(); j++)
   {
     while (fdivides (j.getItem(), r, quot))
     {
-      if (!quot.inCoeffDomain())
-        r= quot;
-      else
-        break;
-    }
-  }
-
-  // remove already removed factors
+      r= quot;
+    }
+  }
+
   for (j= StoredFactors.FS2; j.hasItem(); j++)
   {
     divides= false;
-    while (fdivides (j.getItem(), r, quot))
-    {
-      if (!quot.inCoeffDomain())
+    if (j.getItem() != r)
+    {
+      while (fdivides (j.getItem(), r, quot))
       {
         divides= true;
         r= quot;
       }
-      else
-        break;
-    }
-    if (divides)
-      removedFactors= Union (removedFactors, CFList (j.getItem()));
+      if (divides)
+        removedFactors= Union (removedFactors, CFList (j.getItem()));
+    }
   }
   r= normalize (r);
@@ -967 +964 @@
   for (j= testlist; j.hasItem() && !r.isOne(); j++)
   {
-    while (fdivides (j.getItem(), r, quot))
-    {
-      if (!quot.inCoeffDomain())
+    divides= false;
+    if (j.getItem() != r)
+    {
+      while (fdivides (j.getItem(), r, quot))
+      {
+        divides= true;
         r= quot;
-      else
-        break;
-      removedFactors= Union (removedFactors, CFList (j.getItem()));
-    }
-  }
+      }
+      if (divides)
+        removedFactors= Union (removedFactors, CFList (j.getItem()));
+     }
+  }
+  r= normalize (r);
 }