Changeset ae8a3a in git

Timestamp:

Dec 27, 2014, 4:10:36 PM (8 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

4058df38c2114c692455481741dc4f1a8439e01b

Parents:

2f3b2753bc2be6d7396f61b99d46ba1977c9388d

git-author:

Martin Lee <martinlee84@web.de>2014-12-27 16:10:36+01:00

git-committer:

Martin Lee <martinlee84@web.de>2015-03-17 21:34:47+01:00

Message:

fix: bug in substitution

Location:

factory

Files:

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

factory/facAlgFunc.cc

@@ -327 +327 @@
     R= Astar.getFirst();
     rb= R.mvar();
+    Returnlist.append (rb);
+    if (isFunctionField)
+      Returnlist.append (denrb);
   }
   else
@@ -408 +411 @@
       if (isFunctionField)
         Returnlist.append (denra);
-    }
-  }
-  Returnlist.append (rb);
-  if (isFunctionField)
-    Returnlist.append (denrb);
+      Returnlist.append (rb);
+      if (isFunctionField)
+        Returnlist.append (denrb);
+    }
+  }
 
   if (isRat && getCharacteristic() == 0)

factory/facAlgFuncUtil.cc

@@ -122 +122 @@
 {
   if (isFunctionField)
-    ASSERT (2*a.length() == b.length(), "wrong length of lists");
+    ASSERT ((a.length() - 1)*4 == b.length() || (a.length() == 1 && b.length() == 2), "wrong length of lists");
   else
-    ASSERT (a.length() == b.length(), "lists of equal length expected");
+    ASSERT ((a.length() - 1)*2 == b.length() || (a.length() == 1 && b.length() == 1), "lists of equal length expected");
   CFListIterator j= b;
-  CanonicalForm result= f, tmp, powj;
+  CanonicalForm result= f, tmp, powj, tmp3;
   CFListIterator i= a;
-  int length= a.length();
-  int count= 0;
-  for (; i.hasItem() && j.hasItem(); i++, j++, count++)
-  {
-    if (length - count == 2)
-    {
-      if (!isFunctionField)
-      {
-        result= result (b.getLast(), a.getLast().mvar());
-        result= result (j.getItem(), i.getItem().mvar());
-        break;
-      }
-      else
-      {
-        tmp= b.getLast();
+  CanonicalForm tmp1= i.getItem();
+  i++;
+  CanonicalForm tmp2= j.getItem();
+  j++;
+  for (;i.hasItem() && j.hasItem(); i++, j++)
+  {
+    if (!isFunctionField)
+    {
+      result= result (j.getItem(), i.getItem().mvar());
+      result= result (tmp2, tmp1.mvar());
+      tmp1= i.getItem();
+      j++;
+      if (j.hasItem())
+        tmp2= j.getItem();
+    }
+    else
+    {
+        tmp= j.getItem();
         j++;
+        tmp3= j.getItem();
         j++;
-        powj= power (tmp, degree (result, a.getLast().mvar()));
-        result= evaluate (result, j.getItem(), tmp, powj, a.getLast().mvar());
+        powj= power (j.getItem(), degree (result, i.getItem().mvar()));
+        result= evaluate (result, tmp3, j.getItem(), powj, i.getItem().mvar());
+
+        if (fdivides (powj, result, tmp3))
+          result= tmp3;
+
+        result /= vcontent (result, Variable (i.getItem().level() + 1));
+
+        powj= power (tmp, degree (result, tmp1.mvar()));
+        result= evaluate (result, tmp2, tmp, powj, tmp1.mvar());
 
         if (fdivides (powj, result, tmp))
           result= tmp;
 
-        result /= vcontent (result, Variable (a.getLast().level() + 1));
-        j--;
-        j--;
-        tmp= j.getItem();
+        result /= vcontent (result, Variable (tmp1.level() + 1));
+        tmp1= i.getItem();
         j++;
-        powj= power (j.getItem(), degree (result, i.getItem().mvar()));
-        result= evaluate (result, tmp, j.getItem(), powj, i.getItem().mvar());
-
-        if (fdivides (powj, result, tmp))
-          result= tmp;
-
-        result /= vcontent (result, Variable (i.getItem().level() + 1));
-        break;
-      }
-    }
-    else
-    {
-      if (!isFunctionField)
-        result= result (j.getItem(), i.getItem().mvar());
-      else
-      {
-        tmp= j.getItem();
-        j++;
-        powj= power (j.getItem(), degree (result, i.getItem().mvar()));
-        result= evaluate (result, tmp, j.getItem(), powj, i.getItem().mvar());
-
-        if (fdivides (powj, result, tmp))
-          result= tmp;
-
-        result /= vcontent (result, Variable (i.getItem().level() + 1));
-      }
+        if (j.hasItem())
+          tmp2= j.getItem();
     }
   }