Changeset 423198 in git

Timestamp:

Jul 17, 2015, 5:26:16 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

b33f5c0f9bef398247a5285d3211cc23ae68f199

Parents:

5f3ec195f4730da6965bf73fa349680438b5db77

Message:

heuristicGcdCancellation: remove also gcd of monomials

Files:

• kernel/GBEngine/kspoly.cc (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (3 diffs)

kernel/GBEngine/kspoly.cc

@@ -137 +137 @@
 
   // and finally,
-  PR->Tail_Minus_mm_Mult_qq(lm, t2, PW->GetpLength() - 1, spNoether);
+  PR->Tail_Minus_mm_Mult_qq(lm, t2, pLength(t2) /*PW->GetpLength() - 1*/, spNoether);
   assume(PW->GetpLength() == pLength(PW->p != NULL ? PW->p : PW->t_p));
   PR->LmDeleteAndIter();

libpolys/polys/ext_fields/transext.cc

@@ -1053 +1053 @@
   }
   COM(result) = COM(fa) + COM(fb) + MULT_COMPLEXITY;
+//  definiteGcdCancellation((number)result, cf,FALSE);
   heuristicGcdCancellation((number)result, cf);
 //  ntTest((number)result);
@@ -1251 +1252 @@
 
 /* modifies a */
+/* this is an intermediate simplification routine - not a comple "normalize" */
 void heuristicGcdCancellation(number a, const coeffs cf)
 {
-//  ntTest(a); // !!!!????
   if (IS0(a)) return;
 
@@ -1297 +1298 @@
         }
       }
-    }
-  }
-
-  ntTest(a);
+      if ((DEN(f)!=NULL)
+      && (pNext(DEN(f))==NULL))
+      {
+        poly den_f=DEN(f);
+        poly h=NUM(f);
+        loop
+        {
+          if (h==NULL)
+          {
+            h=NUM(f);
+            do
+            {
+              p_ExpVectorDiff(h,h,den_f,ntRing);
+              pIter(h);
+            } while(h!=NULL);
+            p_ExpVectorDiff(den_f,den_f,den_f,ntRing);
+            break;
+          }
+          int i=0;
+          do
+          {
+            i++;
+            if (p_GetExp(den_f,i,ntRing) > p_GetExp(h,i,ntRing)) return;
+          } while(i<ntRing->N);
+          pIter(h);
+        }
+      }
+    }
+  }
 }