Changeset 69806a in git for libpolys/polys

Timestamp:

Nov 18, 2014, 10:18:34 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

74ec76637457a12f86e1aac1d0d62d5918e92d61806aa81abc5cb8a600086b328a894cb962aed3fb

Parents:

889c73e82f19ba5822a7a44e4284ce63de2a0951

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-11-18 10:18:34+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-11-18 10:19:05+01:00

Message:

fix+doc: FLINT_VER_2_4_5

Location:

libpolys/polys

Files:

• flintconv.cc (modified) (3 diffs)
• flintconv.h (modified) (5 diffs)

libpolys/polys/flintconv.cc

@@ -10 +10 @@
 
 #include <misc/auxiliary.h>
+#include "flintconv.h"
+
+#ifdef FLINT_VER_2_4_5
 #include <coeffs/coeffs.h>
 #include <polys/monomials/p_polys.h>
@@ -21 +24 @@
 #include "simpleideals.h"
 
-#include "flintconv.h"
 
 #ifdef HAVE_FLINT
@@ -48 +50 @@
 
 
-#ifdef FLINT_VER_2_4_5
 bigintmat* singflint_LLL(bigintmat*  m)
 {

libpolys/polys/flintconv.h

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
+#ifndef LIBPOLYS_POLYS_FLINTCONV_H
+#define LIBPOLYS_POLYS_FLINTCONV_H
 /****************************************
 *  Computer Algebra System SINGULAR     *
@@ -6 +8 @@
 * ABSTRACT: convert data between Singular and Flint
 */
-#ifndef LIBPOLYS_POLYS_FLINTCONV_H
-#define LIBPOLYS_POLYS_FLINTCONV_H
+/** @file flintconv.h
+ *
+ * This file is work in progress and currently not part of the official Singular
+ *
+ * @note the code is garded by the undefined macro FLINT_VER_2_4_5
+ * In its current form it will never become an official part.
+ * (conversion routines may be moved to other files/directories, etc.)
+ *
+ * ABSTRACT: Conversion to/from FLINT, and access to some FLINT-routines
+ *
+ * REQUIREMENTS:
+ * - agreement about the interface to LLL
+ * - SINGULAR_4_1
+ * - FLINT providing LLL
+ * (none of the above is currently true, but all of them is required)
+ *
+ **/
 
+//  Have to define this when this code shall be used:
+//#define FLINT_VER_2_4_5
+#ifdef FLINT_VER_2_4_5
 #include <polys/matpol.h>
 #include <coeffs/bigintmat.h>
@@ -15 +35 @@
 
 #ifdef HAVE_FLINT
-
 #include <flint/flint.h>
 #include <flint/fmpz.h>
@@ -21 +40 @@
 #include <flint/fmpz_poly.h>
 #include <flint/fmpz_poly_mat.h>
-
-//  Have to define this when the new version of Flint is released
-//#define FLINT_VER_2_4_5
-
-#ifdef FLINT_VER_2_4_5
 #include <flint/fmpz_lll.h>
-#endif
-
-
 
 int convFlintISingI (fmpz_t f);
@@ -35 +46 @@
 void convFlintNSingN (mpz_t z, fmpz_t f);
 void convSingNFlintN(fmpz_t f, mpz_t z);
-#ifdef FLINT_VER_2_4_5
 bigintmat*  singflint_LLL(bigintmat* A);
 intvec* singflint_LLL(intvec* A);
 #endif
-#endif
-
 
 #endif 
+#endif 
 // LIBPOLYS_POLYS_FLINTCONV_H