Changeset da9cd4 in git

Timestamp:

May 26, 2014, 10:07:35 PM (9 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

3056723f8ded0bf113146118e3fddcb035d965b2

Parents:

da6b0c32582419e09e23b1db297a38db461d884a

git-author:

Martin Lee <martinlee84@web.de>2014-05-26 22:07:35+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-06-04 11:54:57+02:00

Message:

fix: really need a charSet

Location:

factory

Files:

• cfCharSets.h (modified) (1 diff)
• facAlgFunc.cc (modified) (2 diffs)

factory/cfCharSets.h

@@ -42 +42 @@
 CFList
 modCharSet (const CFList& PS, bool removeContents);
+
+CFList
+charSetViaCharSetN (const CFList& PS);
+
+CFList
+charSetN (const CFList &PS);
 
 /// modified characteristic set, i.e. a characteristic set with certain

factory/facAlgFunc.cc

@@ -833 +833 @@
   CFList transform;
 
+  bool found;
   for (iter= tmp; iter.hasItem(); iter++)
   {
+    found= false;
     transform= transBack;
     CanonicalForm factor= iter.getItem().factor();
@@ -840 +842 @@
     transform.append (factor);
     transform= modCharSet (transform, false);
+
+retry:
+    if (transform.isEmpty())
+    {
+      transform= transBack;
+      transform.append (factor);
+      transform= charSetViaCharSetN (transform);
+    }
     for (i= transform; i.hasItem(); i++)
     {
       if (degree (i.getItem(), f.mvar()) > 0)
       {
+        if (i.getItem().level() > f.level())
+          break;
+        found= true;
         factor= i.getItem();
         break;
       }
+    }
+
+    if (!found)
+    {
+      found= false;
+      transform= CFList();
+      goto retry;
     }