Changeset 5ce0932 in git

Timestamp:

Aug 30, 2014, 1:04:36 PM (9 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '91e5db82acc17434e4062bcfa44e6efa7d41fd30')

Children:

3b6f1bf8adb986d207f385b4473052dca49baf56

Parents:

be56d6d38f95c7e07d9b7061b326b0851e840fe4

Message:

fix: template instantiations

Location:

factory

Files:

• cfCharSets.cc (modified) (9 diffs)
• cfCharSetsUtil.cc (modified) (6 diffs)
• ftmpl_inst.cc (modified) (1 diff)
• include/factory/templates/ftmpl_list.h (modified) (1 diff)
• templates/ftmpl_list.cc (modified) (1 diff)

factory/cfCharSets.cc

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

factory/cfCharSetsUtil.cc

@@ -487 +487 @@
   {
     elem= i.getItem();
-    if ((!elem.isEmpty()) && (!find (b, elem, operator==)))
+    if ((!elem.isEmpty()) && (!find (b, elem)))
       b.insert(elem);
   }
@@ -509 +509 @@
     return iss;
 
-  qhi= Difference (qh, qs, operator==);
+  qhi= Difference (qh, qs);
   length= qhi.length();
 
@@ -547 +547 @@
   if (iscopy.isEmpty())
     return iss;
-  qhi= Difference (qh, qs, operator==);
+  qhi= Difference (qh, qs);
   length= qhi.length();
   for (i= iscopy; i.hasItem(); i++)
@@ -940 +940 @@
   {
     iitem= i.getItem();
-    if (!find (mem, iitem, operator==))
+    if (!find (mem, iitem))
     {
       j= i;
@@ -947 +947 @@
       {
         jitem= j.getItem();
-        if (!find (mem, jitem, operator==))
+        if (!find (mem, jitem))
         {
           if (contractsub (iitem, jitem))
@@ -963 +963 @@
     }
   }
-  return Difference (cs,ts, operator==);
-}
-
+  return Difference (cs,ts);
+}
+

factory/ftmpl_inst.cc

@@ -153 +153 @@
 template int operator== (const List<CanonicalForm> &, const List<CanonicalForm> &);
 template List<CanonicalForm> Union ( const List<CanonicalForm> &, const List<CanonicalForm> & );
-template List<List<CanonicalForm> > Union ( const List<List<CanonicalForm> >&, const List<List<CanonicalForm> >&, int operator== (const List<CanonicalForm> &, const List<CanonicalForm> &));
+template List<CFList> Union ( const List<CFList>&, const List<CFList>&);
 template List<CanonicalForm> Difference ( const List<CanonicalForm> &, const List<CanonicalForm> & );
-template List<List<CanonicalForm> > Difference ( const List<List<CanonicalForm> >&, const List<List<CanonicalForm> >&, int operator== (const List<CanonicalForm> &, const List<CanonicalForm> &));
-template List<List<CanonicalForm> > Difference ( const List<List<CanonicalForm> >&, const List<CanonicalForm>&, int operator== (const List<CanonicalForm> &, const List<CanonicalForm> &));
+template List<List<CanonicalForm> > Difference ( const List<List<CanonicalForm> >&, const List<List<CanonicalForm> >&);
+template List<List<CanonicalForm> > Difference ( const List<List<CanonicalForm> >&, const List<CanonicalForm>&);
+
 template CanonicalForm prod ( const List<CanonicalForm> & );
 template bool find ( const List<CanonicalForm> &, const CanonicalForm&);
-template bool find ( const List<List<CanonicalForm> >&, const List<CanonicalForm>&, int operator== (const List<CanonicalForm> &, const List<CanonicalForm> &));
+template bool find ( const List<List<CanonicalForm> >&, const List<CanonicalForm>&);
 // place here your own template stuff, not yet instantiated by factory
 //

factory/include/factory/templates/ftmpl_list.h

@@ -127 +127 @@
 
 template <class T>
+List<T> Difference ( const List<T> & F, const T & G);
+
+template <class T>
 List<T> Difference ( const List<T> & F, const T & G, int (*ecmpf)( const T&, const T& ));
 

factory/templates/ftmpl_list.cc

@@ -673 +673 @@
 
 template <class T>
+List<T> Difference ( const List<T> & F, const T & G)
+{
+    List<T> L;
+    ListIterator<T> i;
+    int found;
+    for ( i = F; i.hasItem(); ++i )
+    {
+        found = G == i.getItem();
+        if ( ! found )
+            L.append( i.getItem() );
+    }
+    return L;
+}
+
+template <class T>
 T prod ( const List<T> & F )
 {