Changeset 320ca6 in git

Timestamp:

May 5, 2014, 4:51:48 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e3cdb4839932af176f7bc54e157f8c427bd81b25

Parents:

844dcf092b230992c12b6f9bf2cc9b41371a7a53

git-author:

Martin Lee <martinlee84@web.de>2014-05-05 16:51:48+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-05-12 14:35:02+02:00

Message:

chg: added removeContent

File:

• factory/cfCharSets.cc (modified) (5 diffs)

factory/cfCharSets.cc

@@ -1050 +1050 @@
 }
 
+CFList
+removeContent (const CFList & PS, StoreFactors & StoredFactors)
+{
+  CFListIterator i= PS;
+  if ((!i.hasItem()) || (PS.getFirst().level() == 0 ))
+    return PS;
+
+  CFList output;
+  CanonicalForm cc,elem;
+
+  for (; i.hasItem(); i++)
+  {
+    elem= i.getItem();
+    cc= content (elem, elem.mvar());
+    if (cc.level() > 0 )
+    {
+      output.append (elem / cc);
+      StoredFactors.FS1 = Union (CFList (cc), StoredFactors.FS1);
+    }
+    else
+      output.append(elem);
+  }
+  return output;
+}
 
 static bool
@@ -1445 +1469 @@
   {
     nr += 1;
-    if (degree(i.getItem()) > 1)
+    if (degree (i.getItem()) > 1)
     {
       qs= factorize (i.getItem());
@@ -1452 +1476 @@
     }
     else
-      qs= CFFList (CFFactor(i.getItem(),1));
+      qs= CFFList (CFFactor (i.getItem(), 1));
 
     if ((qs.length() >= 2 ) || (qs.getFirst().exp() > 1))
@@ -1477 +1501 @@
         {  // search for a non linear elem
           qs= newfactoras (i.getItem(), as, success);
+          if (qs.getFirst().factor().inCoeffDomain())
+            qs.removeFirst();
           if (qs.length() > 1 || qs.getFirst().exp() > 1)
           { //found elem is reducible
@@ -1531 +1557 @@
     StoreFactors StoredFactors;
     cs= charSetViaModCharSet (qs, StoredFactors);
-
-    //cs = removeContent (cs, StoredFactors); //do I really need it
+    cs= removeContent (cs, StoredFactors);
+
     factorset= StoredFactors.FS1;