Changeset 34636b in git for factory/cfNewtonPolygon.h

Timestamp:

Apr 29, 2013, 12:35:53 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

dd5ab893f9075772f5a92bae7a22a2e986ce4f10

Parents:

e2c9b2fd1bc99d892a2a72d1c9e5046a794ac330

git-author:

Martin Lee <martinlee84@web.de>2013-04-29 12:35:53+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-05-23 18:18:13+02:00

Message:

chg: rewrote convex dense compression with mpz_t

File:

• factory/cfNewtonPolygon.h (modified) (5 diffs)

factory/cfNewtonPolygon.h

@@ -16 +16 @@
 
 // #include "config.h"
-
-#ifdef HAVE_NTL
-#include "NTLconvert.h"
-#endif
 
 /// compute a polygon
@@ -104 +100 @@
                           );
 
-
-#ifdef HAVE_NTL
 /// Algorithm 5 as described in Convex-Dense Bivariate Polynomial Factorization
 /// by Berthomieu, Lecerf
@@ -111 +105 @@
                                  ///< M (points)+A
                   int sizePoints,///< [in] size of points
-                  mat_ZZ& M,     ///< [in,out] returns an invertible matrix
-                  vec_ZZ& A      ///< [in,out] returns translation
+                  mpz_t*& M,     ///< [in,out] returns an invertible 2x2 matrix
+                  mpz_t*& A      ///< [in,out] returns translation
                  );
 
@@ -122 +116 @@
 compress (const CanonicalForm& F, ///< [in] compressed, i.e. F.level()==2,
                                   ///< bivariate poly
-          mat_ZZ& inverseM,       ///< [in,out] returns the inverse of M,
+          mpz_t*& inverseM,       ///< [in,out] returns the inverse of M,
                                   ///< if computeMA==true, M otherwise
-          vec_ZZ& A,              ///< [in,out] returns translation
+          mpz_t*& A,              ///< [in,out] returns translation
           bool computeMA= true    ///< [in] whether to compute M and A
          );
@@ -135 +129 @@
 decompress (const CanonicalForm& F,///< [in] compressed, i.e. F.level()<= 2,
                                    ///< uni- or bivariate poly
-            const mat_ZZ& M,       ///< [in] matrix M obtained from compress
-            const vec_ZZ& A        ///< [in] vector A obtained from compress
+            const mpz_t* M,       ///< [in] matrix M obtained from compress
+            const mpz_t* A        ///< [in] vector A obtained from compress
            );
-#endif
 
 #endif