Changeset 32d8cb in git for dyn_modules/callpolymake/polymake_conversion.h

Timestamp:

Oct 25, 2013, 8:34:39 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9cf75aab8ce4766fcf49c2135012db6957300a95

Parents:

6a6ae29f7bcf2272aa28c90bb17f8e9a0337de6e62de8de7d677c1aa9a6da3c0e58b04a58a9a884b

Message:

Merge pull request #408 from YueRen/spielwiese

polymake/gfanlib modules

File:

• dyn_modules/callpolymake/polymake_conversion.h (modified) (4 diffs)

dyn_modules/callpolymake/polymake_conversion.h

@@ -3 +3 @@
 
 #include <kernel/mod2.h>
-
-#ifdef HAVE_FANS
 
 #include <gmpxx.h>
@@ -14 +12 @@
 #include <polymake/Set.h>
 #include <polymake/common/lattice_tools.h>
+#include <polymake/IncidenceMatrix.h>
 
 #include <gfanlib/gfanlib.h>
 #include <gfanlib/gfanlib_q.h>
 
+#include <libpolys/coeffs/numbers.h>
+#include <libpolys/coeffs/bigintmat.h>
 #include <libpolys/misc/intvec.h>
+#include <Singular/lists.h>
 
 /* Functions for converting Integers, Rationals and their Matrices
@@ -43 +45 @@
 intvec* PmVectorInteger2Intvec (const polymake::Vector<polymake::Integer>* vi, bool &ok);
 intvec* PmMatrixInteger2Intvec (polymake::Matrix<polymake::Integer>* mi, bool &ok);
-// intvec* PmIncidenceMatrix2Intvec (polymake::IncidenceMatrix<polymake::NonSymmetric>* icmat);
+lists PmIncidenceMatrix2ListOfIntvecs (polymake::IncidenceMatrix<polymake::NonSymmetric>* icmat);
+lists PmAdjacencyMatrix2ListOfEdges (polymake::IncidenceMatrix<polymake::NonSymmetric>* icmat);
 intvec* PmSetInteger2Intvec (polymake::Set<polymake::Integer>* si, bool &b);
+number PmInteger2Number (const polymake::Integer& pi);
+bigintmat* PmMatrixInteger2Bigintmat (polymake::Matrix<polymake::Integer>* mi);
 
 /* polymake <- singular */
@@ -62 +67 @@
 
 #endif
-#endif