Changeset d8946a4 in git

Timestamp:

Sep 9, 2015, 8:07:18 PM (8 years ago)

Author:

Stephan Oberfranz <oberfran@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

fcf18ffbaf4c9d71286ca608a7909d5071b3e54e

Parents:

b430ca2b1337f52e1932f689e451e9abb002ec4a510257fc6c7ff9c0c28e81f62f6fe06e63f024f8

Message:

update

Merge branch 'spielwiese' of github.com:oberfran/Sources into spielwiese

Files:

• Singular/walk.cc (deleted)
• Tst/Short/bug_tr739.res.gz.uu (added)
• Tst/Short/bug_tr739.stat (added)
• Tst/Short/bug_tr739.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)
• factory/cfCharSets.cc (modified) (2 diffs)
• factory/facAlgFuncUtil.cc (modified) (1 diff)

Tst/Short/ok_s.lst

@@ -49 +49 @@
 bug_732
 bug_tr735
+bug_tr739
 bug_genus_etc
 conv_bi

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++;
     }