Changeset ffb732 in git

Timestamp:

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

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '91e5db82acc17434e4062bcfa44e6efa7d41fd30')

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

Location:

factory

Files:

• cfCharSets.cc (modified) (9 diffs)
• cfCharSetsUtil.cc (modified) (8 diffs)
• cfCharSetsUtil.h (modified) (2 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

factory/cfCharSetsUtil.cc

@@ -457 +457 @@
 
 /* basic operations on lists */
-
-bool
-isMember (const CanonicalForm& f, const CFList& F)
-{
-  for (CFListIterator i= F; i.hasItem(); i++)
-  {
-    if (i.getItem().mapinto() == f.mapinto())
-      return 1;
-  }
-  return 0;
-}
-
-/// are list A and B the same?
-bool
-isSame (const CFList& A, const CFList& B)
-{
-  if (A.length() != B.length())
-    return 0;
-
-  CFListIterator i;
-
-  for (i= A; i.hasItem(); i++)
-  {
-    if (!isMember (i.getItem(), B))
-      return 0;
-  }
-  for (i= B; i.hasItem(); i++)
-  {
-    if (!isMember (i.getItem(), A))
-      return 0;
-  }
-  return 1;
-}
-
-
-/// is List cs contained in List of lists pi?
-bool
-isMember (const CFList& cs, const ListCFList& pi)
-{
-  if (pi.isEmpty())
-    return 0;
-
-  ListCFListIterator i;
-
-  for (i= pi; i.hasItem(); i++)
-  {
-    if (i.getItem().length() != cs.length())
-      continue;
-    if (isSame (cs, i.getItem()))
-      return 1;
-  }
-  return 0;
-}
-
 /// is PS a subset of Cset ?
 bool
@@ -517 +463 @@
   for (CFListIterator i= PS; i.hasItem(); i++)
   {
-    if (!isMember (i.getItem(), Cset))
+    if (!find (Cset, i.getItem()))
       return 0;
   }
   return 1;
-}
-
-/// Union of two List of Lists
-ListCFList
-MyUnion (const ListCFList& a, const ListCFList& b)
-{
-  if (a.isEmpty())
-    return b;
-  if (b.isEmpty())
-    return a;
-
-  ListCFList output;
-  ListCFListIterator i;
-  CFList elem;
-
-  for (i= a; i.hasItem(); i++)
-  {
-    elem= i.getItem();
-    if ((!elem.isEmpty()) && (!isMember (elem, output)))
-      output.append(elem);
-  }
-
-  for (i= b; i.hasItem(); i++)
-  {
-    elem= i.getItem();
-    if ((!elem.isEmpty()) && (!isMember (elem, output)))
-      output.append(elem);
-  }
-  return output;
 }
 
@@ -570 +487 @@
   {
     elem= i.getItem();
-    if ((!elem.isEmpty()) && (!isMember (elem, b)))
+    if ((!elem.isEmpty()) && (!find (b, elem, operator==)))
       b.insert(elem);
   }
-}
-
-///if list b is member of the list of lists a remove b and return the rest
-ListCFList
-minus (const ListCFList& a, const CFList& b)
-{
-  ListCFList output;
-  ListCFListIterator i;
-  CFList elem;
-
-  for (i= a; i.hasItem(); i++)
-  {
-    elem= i.getItem();
-    if ((!elem.isEmpty()) && (!isSame (elem, b)))
-      output.append (elem);
-  }
-  return output;
-}
-
-/// remove all elements of b from list of lists a and return the rest
-ListCFList
-minus (const ListCFList& a, const ListCFList& b)
-{
-  ListCFList output= a;
-
-  for (ListCFListIterator i= b; i.hasItem(); i++)
-    output = minus (output, i.getItem());
-
-  return output;
 }
 
@@ -621 +509 @@
     return iss;
 
-  qhi= minus (qh, qs);
+  qhi= Difference (qh, qs, operator==);
   length= qhi.length();
 
@@ -659 +547 @@
   if (iscopy.isEmpty())
     return iss;
-  qhi= minus (qh, qs);
+  qhi= Difference (qh, qs, operator==);
   length= qhi.length();
   for (i= iscopy; i.hasItem(); i++)
@@ -1052 +940 @@
   {
     iitem= i.getItem();
-    if (!isMember (iitem, mem))
+    if (!find (mem, iitem, operator==))
     {
       j= i;
@@ -1059 +947 @@
       {
         jitem= j.getItem();
-        if (!isMember (jitem, mem))
+        if (!find (mem, jitem, operator==))
         {
           if (contractsub (iitem, jitem))
@@ -1075 +963 @@
     }
   }
-  return minus (cs,ts);
-}
-
+  return Difference (cs,ts, operator==);
+}
+

factory/cfCharSetsUtil.h

@@ -101 +101 @@
 
 bool
-isMember (const CFList& cs, const ListCFList& pi);
-
-bool
 isSubset (const CFList &PS, const CFList& Cset);
-
-ListCFList
-minus (const ListCFList& a, const CFList& b);
 
 ListCFList
@@ -115 +109 @@
 adjoinb (const CFList & is, const CFList & qs, const ListCFList & qh,
          const CFList & cs);
-
-ListCFList
-MyUnion (const ListCFList& a, const ListCFList& b);
 
 void