Changeset 647b762 in git


Ignore:
Timestamp:
Feb 17, 2020, 10:08:41 AM (4 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c7af8613769b29c741d6c338945669719f1fc4f8')
Children:
f051930c5ecfb853e0c8fdfb602c026c3727ddf9
Parents:
4e2bcee68a92d9f12978b9eb139f7470a4460b6e
Message:
fix: trac #861: removed NTL references from libpolys
Location:
libpolys
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • libpolys/coeffs/modulop.h

    r4e2bce r647b762  
    2929#define NV_MAX_PRIME 32749
    3030#define FACTORY_MAX_PRIME 536870909
    31 
    32 #ifdef USE_NTL_XGCD
    33 // in ntl.a
    34 extern void XGCD(long& d, long& s, long& t, long a, long b);
    35 #endif
    3631
    3732struct n_Procs_s; typedef struct  n_Procs_s  *coeffs;
     
    187182   long s, t;
    188183
    189 #ifdef USE_NTL_XGCD
    190    long d;
    191    XGCD(d, s, t, a, R->ch);
    192    assume (d == 1);
    193 #else
    194184   long  u, v, u0, v0, u1, u2, q, r;
    195185
     
    198188   u = a; v = R->ch;
    199189
    200    while (v != 0)
     190   do
    201191   {
    202192      q = u / v;
     
    208198      u2 = u1 - q*u2;
    209199      u1 = u0;
    210    }
     200   } while (v != 0);
    211201
    212202   assume(u==1);
    213203   s = u1;
    214 #endif
    215204#ifdef HAVE_GENERIC_ADD
    216205   if (s < 0)
  • libpolys/libpolys.pc.in

    r4e2bce r647b762  
    1313
    1414Cflags: -I${includedir} -I${includedir}/singular @SINGULAR_CFLAGS@ @FLINT_CFLAGS@ @GMP_CPPFLAGS@
    15 Libs: -L${libdir} -lpolys @FLINT_LIBS@ @NTL_LIBS@ @GMP_LIBS@ @USEPPROCSDYNAMICLD@
     15Libs: -L${libdir} -lpolys @FLINT_LIBS@ @GMP_LIBS@ @USEPPROCSDYNAMICLD@
    1616Libs.private:
    1717
  • libpolys/polys/clapsing.cc

    r4e2bce r647b762  
    17631763}
    17641764
    1765 #ifdef HAVE_NTL
     1765#ifdef HAVE_NTL   /*define derived from factory*/
    17661766matrix singntl_HNF(matrix  m, const ring s )
    17671767{
Note: See TracChangeset for help on using the changeset viewer.