Changeset e3cdb4 in git for factory

Timestamp:

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

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

2a1008a43e16989a659f416d3aea369943c415b4

Parents:

320ca656a049b44638dd1949fd1b8982a1226531

git-author:

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

git-committer:

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

Message:

chg: make removal of contents optional

Location:

factory

Files:

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

factory/cfCharSets.cc

@@ -1256 +1256 @@
 /// modified medial set
 CFList
-modCharSet (const CFList& L, StoreFactors& StoredFactors)
+modCharSet (const CFList& L, StoreFactors& StoredFactors, bool removeContents)
 {
   CFList QS= L, RS= L, CSet, tmp, contents, initial, removedFactors;
@@ -1262 +1262 @@
   CanonicalForm r, cF;
   bool noRemainder= true;
-  StoreFactors StoredFactors2, StoredFactors3;
+  StoreFactors StoredFactors2;
 
   QS= uniGcd (L);
@@ -1288 +1288 @@
         {
           noRemainder= false;
-          removeContent (r, cF);
-
-          if (!cF.isZero())
-            contents= Union (contents, factorPSet (CFList(cF))); //factorPSet maybe too much it should suffice to do a squarefree factorization instead
+          if (removeContents)
+          {
+            removeContent (r, cF);
+
+            if (!cF.isZero())
+              contents= Union (contents, factorPSet (CFList(cF))); //factorPSet maybe too much it should suffice to do a squarefree factorization instead
+          }
 
           removeFactors (r, StoredFactors2, removedFactors);
@@ -1303 +1306 @@
       }
 
-      if (!noRemainder)
+      if (removeContents && !noRemainder)
       {
         StoredFactors.FS1= Union (StoredFactors2.FS1, contents);
@@ -1325 +1328 @@
 /// characteristic set via modified medial set
 CFList
-charSetViaModCharSet (const CFList& PS, StoreFactors& StoredFactors)
-{
-  CFList result= modCharSet (PS, StoredFactors);
+charSetViaModCharSet (const CFList& PS, StoreFactors& StoredFactors, bool removeContents)
+{
+  CFList result= modCharSet (PS, StoredFactors, removeContents);
   if (result.isEmpty() || result.getFirst().inCoeffDomain())
     return CFList(1);
@@ -1342 +1345 @@
     return result;
 
-  return charSetViaModCharSet (Union (PS, Union (RS, result)), StoredFactors);
+  return charSetViaModCharSet (Union (PS, Union (RS, result)), StoredFactors, removeContents);
 }
 
 CFList
-charSetViaModCharSet (const CFList& PS)
+charSetViaModCharSet (const CFList& PS, bool removeContents)
 {
   StoreFactors tmp;
-  return charSetViaModCharSet (PS, tmp);
-}
-
-CFList
-modCharSet (const CFList& PS)
-{
-  StoreFactors tmp;
-  return modCharSet (PS, tmp);
+  return charSetViaModCharSet (PS, tmp, removeContents);
 }
 

factory/cfCharSets.h

@@ -54 +54 @@
 /// modified medial set
 CFList
-modCharSet (const CFList& PS, StoreFactors& StoredFactors);
-
-/// wrapper for modCharSet
-CFList
-modCharSet (const CFList& PS);
+modCharSet (const CFList& PS, StoreFactors& StoredFactors, bool removeContents= true);
 
 /// modified characteristic set, i.e. a characteristic set with certain
 /// factors removed
 CFList
-charSetViaModCharSet (const CFList& PS);
+charSetViaModCharSet (const CFList& PS, StoreFactors& StoredFactors, bool removeContents= true);
+
+/// modified characteristic set, i.e. a characteristic set with certain
+/// factors removed
+CFList
+charSetViaModCharSet (const CFList& PS, bool removeContents= true);
 
 /// characteristic series

factory/facAlgFunc.cc

@@ -1503 +1503 @@
   // factor F with minimal polys given in asnew
   asnew.append (F);
-  asnew= charSetViaModCharSet (asnew); // TODO use modCharSet
+  asnew= charSetViaModCharSet (asnew, false);
 
   F= asnew.getLast();
@@ -1549 +1549 @@
     factor= M (factor);
     transform.append (factor);
-    transform= charSetViaModCharSet (transform); //TODO use modCharSet
+    transform= charSetViaModCharSet (transform, false);
     for (i= transform; i.hasItem(); i++)
     {