Changeset b90a36 in git

Timestamp:

Jul 15, 2014, 5:53:46 PM (9 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

88355ebe9326d86d566d6c175b82b315be5b63ed

Parents:

8b00cafb736eed4e74873c4326a7c6d326b488af

git-author:

Martin Lee <martinlee84@web.de>2014-07-15 17:53:46+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-07-17 12:07:11+02:00

Message:

fix: messing up variables in newtonDiv

File:

• factory/facMul.cc (modified) (7 diffs)

factory/facMul.cc

@@ -230 +230 @@
 mulFLINTQTrunc (const CanonicalForm& F, const CanonicalForm& G, int m)
 {
-  if (F.inCoeffDomain() || G.inCoeffDomain())
-    return mod (F*G, power (Variable (1), m));
+  if (F.inCoeffDomain() && G.inCoeffDomain())
+    return F*G;
+  if (F.inCoeffDomain())
+    return mod (F*G, power (G.mvar(), m));
+  if (G.inCoeffDomain())
+    return mod (F*G, power (F.mvar(), m));
   Variable alpha;
   if (hasFirstAlgVar (F, alpha) || hasFirstAlgVar (G, alpha))
@@ -257 +261 @@
 }
 
-CanonicalForm uniReverse (const CanonicalForm& F, int d)
+CanonicalForm uniReverse (const CanonicalForm& F, int d, const Variable& x)
 {
   if (d == 0)
     return F;
   if (F.inCoeffDomain())
-    return F*power (Variable (1),d);
-  Variable x= Variable (1);
+    return F*power (x,d);
   CanonicalForm result= 0;
   CFIterator i= F;
@@ -275 +278 @@
 
 CanonicalForm
-newtonInverse (const CanonicalForm& F, const int n)
+newtonInverse (const CanonicalForm& F, const int n, const Variable& x)
 {
   int l= ilog2(n);
 
-  CanonicalForm g= F [0];
-
+  CanonicalForm g;
+  if (F.inCoeffDomain())
+    g= F;
+  else
+    g= F [0];
+
+  if (!F.inCoeffDomain())
+    ASSERT (F.mvar() == x, "main variable of F and x differ");
   ASSERT (!g.isZero(), "expected a unit");
 
   if (!g.isOne())
     g = 1/g;
-  Variable x= Variable (1);
   CanonicalForm result;
   int exp= 0;
@@ -328 +336 @@
               CanonicalForm& R)
 {
+  ASSERT (F.level() == G.level(), "F and G have different level");
   CanonicalForm A= F;
   CanonicalForm B= G;
-  Variable x= Variable (1);
-  int degA= degree (A, x);
-  int degB= degree (B, x);
+  Variable x= A.mvar();
+  int degA= degree (A);
+  int degB= degree (B);
   int m= degA - degB;
 
@@ -346 +355 @@
   else
   {
-    R= uniReverse (A, degA);
-
-    CanonicalForm revB= uniReverse (B, degB);
-    CanonicalForm buf= revB;
-    revB= newtonInverse (revB, m + 1);
+    R= uniReverse (A, degA, x);
+
+    CanonicalForm revB= uniReverse (B, degB, x);
+    revB= newtonInverse (revB, m + 1, x);
     Q= mulFLINTQTrunc (R, revB, m + 1);
-    Q= uniReverse (Q, m);
+    Q= uniReverse (Q, m, x);
 
     R= A - mulNTL (Q, B);
@@ -361 +369 @@
 newtonDiv (const CanonicalForm& F, const CanonicalForm& G, CanonicalForm& Q)
 {
+  ASSERT (F.level() == G.level(), "F and G have different level");
   CanonicalForm A= F;
   CanonicalForm B= G;
-  Variable x= Variable (1);
-  int degA= degree (A, x);
-  int degB= degree (B, x);
+  Variable x= A.mvar();
+  int degA= degree (A);
+  int degB= degree (B);
   int m= degA - degB;
 
@@ -378 +387 @@
   else
   {
-    CanonicalForm R= uniReverse (A, degA);
-
-    CanonicalForm revB= uniReverse (B, degB);
-    revB= newtonInverse (revB, m + 1);
+    CanonicalForm R= uniReverse (A, degA, x);
+    CanonicalForm revB= uniReverse (B, degB, x);
+    revB= newtonInverse (revB, m + 1, x);
     Q= mulFLINTQTrunc (R, revB, m + 1);
-    Q= uniReverse (Q, m);
+    Q= uniReverse (Q, m, x);
   }
 }