Changeset f224fda in git

Timestamp:

Mar 27, 2013, 3:09:15 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')

Children:

b893eca84785476ae5b07f46b47978cbfb2d1b24

Parents:

36ef97a87d28a9e3e20179ac4f978aad9a7883ba

git-author:

Martin Lee <martinlee84@web.de>2013-03-27 15:09:15+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-05-02 11:42:35+02:00

Message:

chg: added new templates to hold absolute factors

Conflicts:

	factory/canonicalform.h
	factory/ftmpl_inst.cc

Location:

factory

Files:

• canonicalform.h (modified) (2 diffs)
• ftmpl_inst.cc (modified) (2 diffs)
• templates/ftmpl_afactor.cc (added)
• templates/ftmpl_afactor.h (added)

factory/canonicalform.h

@@ -23 +23 @@
 #include <factory/templates/ftmpl_list.h>
 #include <factory/templates/ftmpl_array.h>
+#include <factory/templates/ftmpl_afactor.h>
 #include <factory/templates/ftmpl_factor.h>
 #include <factory/templates/ftmpl_matrix.h>
@@ -360 +361 @@
 
 //{{{ type definitions
+typedef AFactor<CanonicalForm> CFAFactor;
+typedef List <CFAFactor> CFAFList;
+typedef ListIterator<CFAFactor> CFAFListIterator;
 typedef Factor<CanonicalForm> CFFactor;
 typedef List<CFFactor> CFFList;

factory/ftmpl_inst.cc

@@ -23 +23 @@
 
 #include "templates/ftmpl_array.cc"
+#include "templates/ftmpl_afactor.cc"
 #include "templates/ftmpl_factor.cc"
 #include "templates/ftmpl_list.cc"
@@ -34 +35 @@
 template class ListItem<CFFactor>;
 template class ListIterator<CFFactor>;
+template class AFactor<CanonicalForm>;
+template class List<CFAFactor>;
+template class ListItem<CFAFactor>;
+template class ListIterator<CFAFactor>;
 template class List<CanonicalForm>;
 template class ListItem<CanonicalForm>;