Changeset 7c2bdef in git

Timestamp:

May 20, 2014, 4:41:29 PM (9 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

cf66047707326b9a2dcd5b0dc16e826e8063a233

Parents:

d0bf7c4ac3e3b6b83feb550488644eae0d452f83

git-author:

Martin Lee <martinlee84@web.de>2014-05-20 16:41:29+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-05-21 15:06:58+02:00

Message:

fix: bug in subst

File:

• factory/facAlgFuncUtil.cc (modified) (1 diff)

factory/facAlgFuncUtil.cc

@@ -123 +123 @@
   CFListIterator j= b;
   CanonicalForm result= f, tmp, powj;
-  for (CFListIterator i= a; i.hasItem() && j.hasItem(); i++, j++)
-  {
-    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));
+  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();
+        j++;
+        j++;
+        powj= power (tmp, degree (result, a.getLast().mvar()));
+        result= evaluate (result, j.getItem(), tmp, powj, a.getLast().mvar());
+
+        if (fdivides (powj, result, tmp))
+          result= tmp;
+
+        result /= vcontent (result, Variable (a.getLast().level() + 1));
+        j--;
+        j--;
+        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));
+        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));
+      }
     }
   }