Changeset 6298d6 in git

Timestamp:

Jul 15, 2013, 12:31:19 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

0382d520426f565cac32c4dfe0d40f988d7c50ad

Parents:

ee9bbe6149d97d547f224a27ae68ee67f173f19d9af5e1fd287578e090f0a1c2d719a85d22012795

Message:

Merge pull request #339 from mmklee/templates_sw

Templates sw

Files:

• doc/cones.no.doc (added)
• doc/cones.yes.doc (moved) (moved from doc/cones.doc)
• doc/pyobject.no.doc (added)
• doc/pyobject.yes.doc (moved) (moved from doc/pyobject.doc)
• factory/ftmpl_inst.cc (modified) (2 diffs)
• factory/gengftables-conway.cc (modified) (1 diff)
• factory/gfops.cc (modified) (2 diffs)
• factory/singext.h (modified) (1 diff)
• factory/templates/ftmpl_afactor.cc (modified) (1 diff)

factory/ftmpl_inst.cc

@@ -70 +70 @@
 template List<Variable> Difference ( const List<Variable>&, const List<Variable>& );
 
+// NTL 6
+#ifdef HAVE_NTL
+#include<NTL/version.h>
+#if NTL_MAJOR_VERSION == 6
+
+#include<NTL/tools.h>
+#include<NTL/lzz_pE.h>
+#include<NTL/lzz_pEX.h>
+#include<NTL/lzz_p.h>
+#include<NTL/vector.h>
+#include<NTL/pair.h>
+#include<NTL/GF2X.h>
+#include<NTL/GF2EX.h>
+#include<NTL/ZZ.h>
+#include<NTL/ZZX.h>
+#include<NTL/ZZ_pX.h>
+#include<NTL/vector.h>
+#ifdef NTL_CLIENT               // in <NTL/tools.h>: using of name space NTL
+NTL_CLIENT
+#endif
+template void BlockDestroy<zz_pE> (zz_pE*, long);
+template void BlockConstruct<zz_pE> (zz_pE*, long);
+template void BlockDestroy<Pair<zz_pEX, long> > (Pair<zz_pEX, long>*, long);
+template void BlockDestroy<Pair<GF2EX, long> > (Pair<GF2EX, long>*, long);
+template void BlockDestroy<Pair<ZZX, long> > (Pair<ZZX, long>*, long);
+template void BlockDestroy<Pair<ZZ_pX, long> > (Pair<ZZ_pX, long>*, long);
+template void BlockDestroy<Pair<GF2X, long> > (Pair<GF2X, long>*, long);
+template void BlockDestroy<Vec<zz_pE> > (Vec<zz_pE>*, long);
+template class Vec<zz_p>;
+template class Vec<Vec<zz_p> >;
+template class Vec<zz_pE>;
+template class Vec<ZZ>;
+template class Vec<Vec<ZZ> >;
+template class Mat<zz_p>;
+template class Mat<zz_pE>;
+template class Mat<ZZ>;
+template class Vec<Pair<zz_pEX, long> >;
+template class Vec<Pair<GF2EX, long> >;
+template class Vec<Pair<ZZX, long> >;
+template class Vec<Pair<ZZ_pX, long> >;
+template class Vec<Pair<GF2X, long> >;
+template class Vec<Vec<zz_pE> >;
+template void swap<zz_pE>(Vec<zz_pE>&, Vec<zz_pE>&);
+template long operator==<zz_p>(Vec<zz_p> const&, Vec<zz_p> const&);
+#endif
+#endif
+
 //}}}
 
@@ -81 +128 @@
 template OSTREAM & operator << ( OSTREAM &, const Matrix<CanonicalForm> & );
 template OSTREAM & operator << ( OSTREAM &, const Array<REvaluation> & );
+//template OSTREAM & operator << ( OSTREAM &, const AFactor<CanonicalForm> & );
 #endif /* NOSTREAMIO */
 

factory/gengftables-conway.cc

@@ -200 +200 @@
     // open file to write to
         ostrstream fname;
-    fname << "gftables/gftable." << p << "." << d << '\0';
+    fname << "gftables/" << q << '\0';
     char * fn = fname.str();
     ofstream outfile;

factory/gfops.cc

@@ -108 +108 @@
     if (gftable_dir)
     {
-      sprintf( buffer, "/gftable.%d.%d", p, n );
+      sprintf( buffer, "gftables/%d", q);
       gffilename = (char *)malloc(strlen(gftable_dir) + strlen(buffer) + 1);
       STICKYASSERT(gffilename,"out of memory");
@@ -118 +118 @@
     {
 #ifndef SINGULAR
-      sprintf( buffer, GFTABLEDIR "/gftable.%d.%d", p, n );
+      sprintf( buffer, "gftables/%d", q );
       gffilename = buffer;
       inputfile = fopen( buffer, "r" );

factory/singext.h

@@ -9 +9 @@
 #include <factory/cf_gmp.h>
 
+#ifdef SINGULAR
 #include <resources/feFopen.h>
+#endif
 
 /*BEGINPUBLIC*/

factory/templates/ftmpl_afactor.cc

@@ -26 +26 @@
 {
     if ( exp() == 1 )
-        s << "(" << factor(), ", " << minpoly() << ")";
+        s << "(" << factor() << ", " << minpoly() << ")";
     else
         s << "((" << factor() << ")^" << exp() << ", " << minpoly() << ")";