Changeset ffb732 in git for factory/cfCharSets.cc

Timestamp:

Aug 26, 2014, 12:17:46 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

d1a30265ddb8a7ddc9d68bb7a60e37212c7f06b0

Parents:

8b7b108474a7f7dcc5bffc2636ab9027c6131d3d

git-author:

Martin Lee <martinlee84@web.de>2014-08-26 12:17:46+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-08-26 12:29:12+02:00

Message:

replaced isSame, isMember, MyUnion, minus by new templates

File:

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

factory/cfCharSets.cc

@@ -437 +437 @@
     l= tmp.getFirst();
 
-    tmp= minus (tmp, l);
+    tmp= Difference (tmp, l, operator==);
 
     select (ppi, l.length(), ppi1, ppi2);
@@ -444 +444 @@
 
     if (count > 0)
-      ppi= MyUnion (ListCFList (l), ppi1);
+      ppi= Union (ppi1, ListCFList (l), operator==);
     else
       ppi= ListCFList();
@@ -455 +455 @@
     if (charset.length() > 0 && charset.getFirst().level() > 0)
     {
-      result= MyUnion (result, ListCFList (charset));
+      result= Union (ListCFList (charset), result, operator==);
       ini= factorsOfInitials (charset);
 
@@ -468 +468 @@
 
     tmp2= adjoin (ini, l, qqi);
-    tmp= MyUnion (tmp, tmp2);
+    tmp= Union (tmp2, tmp, operator==);
 
     StoredFactors.FS1= CFList();
@@ -616 +616 @@
     {
       nr_of_iteration += 1;
-      ppi= MyUnion (ListCFList (qs), ppi1);
+      ppi= Union (ppi1, ListCFList (qs), operator==);
     }
 
@@ -636 +636 @@
         if (!isSubset (cs,qs))
           cs= charSetViaCharSetN (Union (qs,cs));
-        if (!isMember (cs, pi))
+        if (!find (pi, cs, operator==))
         {
-          pi= MyUnion (pi, ListCFList (cs));
+          pi= Union (ListCFList (cs), pi, operator==);
           if (cs.getFirst().level() > 0)
           {
@@ -645 +645 @@
             if (indexRed <= 0) //irreducible
             {
-              qsi= MyUnion (qsi, ListCFList(cs));
+              qsi= Union (ListCFList(cs), qsi, operator==);
               if (cs.length() == highestlevel)
                 is= factorPSet (factorset);
@@ -674 +674 @@
           }
           is= Union (factorsOfInitials (cst), is);
-          iss= MyUnion (adjoin (is, qs, qqi), adjoinb (ts, qs, qqi, cst));
+          iss= Union (adjoinb (ts, qs, qqi, cst), adjoin (is, qs, qqi), operator==);
         }
         else
@@ -685 +685 @@
     {
       qhi.removeFirst();
-      qhi= MyUnion (qhi, iss);
+      qhi= Union (iss, qhi, operator==);
     }
     else