Changeset c410e23 in git


Ignore:
Timestamp:
Nov 13, 2014, 9:23:00 PM (9 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
0bd4b29132baebe2504d6f0ade75a81dd2dda8b5
Parents:
35b22008def2f9d3089731593614349d5c092c98
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-11-13 21:23:00+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-11-13 21:24:13+01:00
Message:
Fix the bugs in ' Merge pull request #670 from adipopescu/Flint'
Location:
libpolys/polys
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • libpolys/polys/flintconv.cc

    r35b220 rc410e23  
    99
    1010
    11 
    12 
    1311#include <misc/auxiliary.h>
    14 #include "flintconv.h"
    1512#include <coeffs/coeffs.h>
    1613#include <polys/monomials/p_polys.h>
    1714
    1815#include <omalloc/omalloc.h>
    19 #include <coeffs/longrat.h>
    20 #include <coeffs/modulop.h>
     16// #include <coeffs/longrat.h>
     17// #include <coeffs/modulop.h>
    2118#include <polys/sbuckets.h>
    2219#include <polys/clapconv.h>
    … …  
    2421#include "simpleideals.h"
    2522
     23#include "flintconv.h"
     24
    2625#ifdef HAVE_FLINT
    27 #ifdef FLINT_VER_2_4_5
    2826int convFlintISingI (fmpz_t f)
    2927{
    … …  
    5048
    5149
     50#ifdef FLINT_VER_2_4_5
    5251bigintmat* singflint_LLL(bigintmat*  m)
    5352{

  • libpolys/polys/flintconv.h

    r35b220 rc410e23  
    66* ABSTRACT: convert data between Singular and Flint
    77*/
     8#ifndef LIBPOLYS_POLYS_FLINTCONV_H
     9#define LIBPOLYS_POLYS_FLINTCONV_H
     10
     11#include <polys/matpol.h>
     12#include <coeffs/bigintmat.h>
     13// #include <polys/monomials/ring.h>
    814
    915
    10 #include <polys/monomials/ring.h>
    11 //#include <factory/factory.h>
    1216#ifdef HAVE_FLINT
    1317
     18#include <flint/flint.h>
     19#include <flint/fmpz.h>
     20#include <flint/fmpq.h>
    1421#include <flint/fmpz_poly.h>
    15 #include <flint/fmpz_lll.h>
    1622#include <flint/fmpz_poly_mat.h>
    17 
    18 #endif
    19 #include <polys/matpol.h>
    20 #include <coeffs/bigintmat.h>
    2123
    2224//  Have to define this when the new version of Flint is released
    2325//#define FLINT_VER_2_4_5
    2426
    25 #ifdef HAVE_FLINT
    2627#ifdef FLINT_VER_2_4_5
     28#include <flint/fmpz_lll.h>
     29#endif
     30
     31
     32
    2733int convFlintISingI (fmpz_t f);
    2834void convSingIFlintI(fmpz_t f, int p);
    2935void convFlintNSingN (mpz_t z, fmpz_t f);
    3036void convSingNFlintN(fmpz_t f, mpz_t z);
     37#ifdef FLINT_VER_2_4_5
    3138bigintmat*  singflint_LLL(bigintmat* A);
    3239intvec* singflint_LLL(intvec* A);
    3340#endif
    3441#endif
     42
     43
     44#endif
     45// LIBPOLYS_POLYS_FLINTCONV_H
Note: See TracChangeset for help on using the changeset viewer.