Changeset 1e4b53 in git

Timestamp:

May 3, 2012, 3:53:02 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

60cc1289a79586c1732ba3885997c3cb49bc01d9

Parents:

0d56271c672440c06e14ca2528a5185bb37e1e6f

git-author:

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

git-committer:

Martin Lee <martinlee84@web.de>2012-05-07 14:18:40+02:00

Message:

chg: first test LC's before doing a full termination test in GCD

Location:

factory

Files:

• cf_gcd.cc (modified) (1 diff)
• cf_gcd_smallp.cc (modified) (6 diffs)
• cf_gcd_smallp.h (modified) (1 diff)

factory/cf_gcd.cc

@@ -1345 +1345 @@
         equal= true;
       //Dn /=vcontent(Dn,Variable(1));
-      if (((abs (cofn*Dn)==abs (f)) && (abs (cogn*Dn)==abs (g))) ||
+      if ((terminationTest (f,g, cofn, cogn, Dn)) ||
           ((equal || q > b) && fdivides (Dn, f) && fdivides (Dn, g)))
       {

factory/cf_gcd_smallp.cc

@@ -51 +51 @@
 TIMING_DEFINE_PRINT(newton_interpolation)
 
+bool
+terminationTest (const CanonicalForm& F, const CanonicalForm& G,
+                 const CanonicalForm& coF, const CanonicalForm& coG,
+                 const CanonicalForm& cand)
+{
+  CanonicalForm LCCand= abs (LC (cand));
+  if (LCCand*abs (LC (coF)) == abs (LC (F)))
+  {
+    if (LCCand*abs (LC (coG)) == abs (LC (G)))
+    {
+      if (abs (cand)*abs (coF) == abs (F))
+      {
+        if (abs (cand)*abs (coG) == abs (G))
+          return true;
+      }
+      return false;
+    }
+    return false;
+  }
+  return false;
+}
+
 static const double log2exp= 1.442695041;
 
@@ -805 +827 @@
         if (((degree (ppCoF,1)+degree (ppH,1) == bound1) &&
              (degree (ppCoG,1)+degree (ppH,1) == bound2) &&
-             (ppA == ppCoF*ppH && ppB == ppCoG*ppH)) || 
+             terminationTest (ppA, ppB, ppCoF, ppCoG, ppH)) || 
              (fdivides (ppH, ppA, ppCoF) && fdivides (ppH, ppB, ppCoG)))
         {
@@ -828 +850 @@
       else if (((degree (ppCoF,1)+degree (ppH,1) == bound1) &&
                 (degree (ppCoG,1)+degree (ppH,1) == bound2) &&
-                (ppA == ppCoF*ppH && ppB == ppCoG*ppH)) ||
+                terminationTest (ppA, ppB, ppCoF, ppCoG, ppH)) ||
                 (fdivides (ppH, ppA, ppCoF) && fdivides (ppH, ppB, ppCoG)))
       {
@@ -1255 +1277 @@
         if (((degree (ppCoF,1)+degree (ppH,1) == bound1) &&
              (degree (ppCoG,1)+degree (ppH,1) == bound2) &&
-             (ppA == ppCoF*ppH && ppB == ppCoG*ppH)) ||
+             terminationTest (ppA, ppB, ppCoF, ppCoG, ppH)) ||
              (fdivides (ppH, ppA, ppCoF) && fdivides (ppH, ppB, ppCoG)))
         {
@@ -1279 +1301 @@
       if (((degree (ppCoF,1)+degree (ppH,1) == bound1) &&
            (degree (ppCoG,1)+degree (ppH,1) == bound2) &&
-           (ppA == ppCoF*ppH && ppB == ppCoG*ppH)) ||
+           terminationTest (ppA, ppB, ppCoF, ppCoG, ppH)) ||
            (fdivides (ppH, ppA, ppCoF) && fdivides (ppH, ppB, ppCoG)))
         {
@@ -1773 +1795 @@
       if (((degree (ppCoF,1)+degree (ppH,1) == bound1) &&
            (degree (ppCoG,1)+degree (ppH,1) == bound2) &&
-           (ppA == ppCoF*ppH && ppB == ppCoG*ppH)) ||
+           terminationTest (ppA, ppB, ppCoF, ppCoG, ppH)) ||
            (fdivides (ppH, ppA, ppCoF) && fdivides (ppH, ppB, ppCoG)))
       {

factory/cf_gcd_smallp.h

@@ -112 +112 @@
 CFArray
 getMonoms (const CanonicalForm& F);
+
+bool
+terminationTest (const CanonicalForm& F, const CanonicalForm& G,
+                 const CanonicalForm& coF, const CanonicalForm& coG,
+                 const CanonicalForm& cand);
 #endif