Changeset 03c1d2 in git

Timestamp:

Sep 9, 2015, 1:59:11 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

4d031cda72b3385df1b0e2f8f2b790e31626ceb6

Parents:

b6c5b9ea35189a34db58f51d1b3bb752d8b73338c65b73309b230b264308140a3c68d8cf161955a0

Message:

Merge pull request #725 from mmklee/trac739

Trac739

Location:

factory

Files:

• cfCharSets.cc (modified) (2 diffs)
• facAlgFuncUtil.cc (modified) (1 diff)

factory/cfCharSets.cc

@@ -546 +546 @@
           qs= facAlgFunc2 (i.getItem(), as);
           if (qs.length() > 0)
-          {
-            if (qs.getFirst().factor().inCoeffDomain())
+          {
+            if (qs.getFirst().factor().inCoeffDomain())
               qs.removeFirst();
             if (qs.length() > 1 || qs.getFirst().exp() > 1)
@@ -555 +555 @@
               break;
             }
-          }
+          }
         }
       }

factory/facAlgFuncUtil.cc

@@ -203 +203 @@
   {
     ASSERT (F.deriv().isZero(), "derivative of F is not zero");
-    int termCount=0;
     CFIterator i= F;
+    int g= 0;
     for (; i.hasTerms(); i++)
-    {
-      if (i.exp() != 0)
-        termCount++;
-    }
-
-    int j= 1;
-    i= F;
-    for (;j < termCount; j++, i++)
-      ;
-
-    int exp= i.exp();
+        g= igcd (g, i.exp());
+
     int count= 0;
     int p= getCharacteristic();
-    while ((exp >= p) && (exp != 0) && (exp % p == 0))
-    {
-      exp /= p;
+    while ((g >= p) && (g != 0) && (g % p == 0))
+    {
+      g /= p;
       count++;
     }