Changeset 5af844a in git

Timestamp:

Apr 25, 2007, 1:00:51 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

2bfea7c0834b0c0cf824d85964ac31a0aab95ddb

Parents:

143c6c90f4919bdaebc7dac8c26d98ffa440c1c0

Message:

*hannes: beter use of small primes for NTL


git-svn-id: file:///usr/local/Singular/svn/trunk@9988 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

factory

Files:

• NTLconvert.h (modified) (3 diffs)
• cf_factor.cc (modified) (2 diffs)

factory/NTLconvert.h

@@ -1 @@
-/* $Id: NTLconvert.h,v 1.7 2004-01-19 11:26:20 Singular Exp $ */
+/* $Id: NTLconvert.h,v 1.8 2007-04-25 11:00:51 Singular Exp $ */
 #ifndef INCL_NTLCONVERT_H
 #define INCL_NTLCONVERT_H
@@ -28 +28 @@
 #include <limits.h>
 #include <NTL/ZZ_pEXFactoring.h>
+#include <NTL/lzz_pEXFactoring.h>
 #include <NTL/GF2EXFactoring.h>
 
@@ -54 +55 @@
 GF2EX convertFacCF2NTLGF2EX(CanonicalForm f,GF2X mipo);
 ZZ_pEX convertFacCF2NTLZZ_pEX(CanonicalForm f,ZZ_pX mipo);
+zz_pEX convertFacCF2NTLzz_pEX(CanonicalForm f,zz_pX mipo);
+CFFList convertNTLvec_pair_zzpEX_long2FacCFFList(vec_pair_zz_pEX_long e,zz_pE multi,Variable x,Variable alpha);
 
 #endif

factory/cf_factor.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_factor.cc,v 1.29 2005-12-13 13:59:54 Singular Exp $ */
+/* $Id: cf_factor.cc,v 1.30 2007-04-25 11:00:51 Singular Exp $ */
 
 //{{{ docu
@@ -537 +537 @@
 
       // set minimal polynomial in NTL
+      #ifdef NTL_ZZ
       ZZ_pX minPo=convertFacCF2NTLZZpX(getMipo(alpha));
       ZZ_pEContext c(minPo);
+      #else
+      zz_pX minPo=convertFacCF2NTLzzpX(getMipo(alpha));
+      zz_pEContext c(minPo);
+      #endif
 
       c.restore();
 
       // convert to NTL
+      #ifdef NTL_ZZ
       ZZ_pEX f1=convertFacCF2NTLZZ_pEX(f,minPo);
+      ZZ_pE leadcoeff= LeadCoeff(f1);
+      #else
+      zz_pEX f1=convertFacCF2NTLzz_pEX(f,minPo);
+      zz_pE leadcoeff= LeadCoeff(f1);
+      #endif
 
       //make monic
-      ZZ_pE leadcoeff= LeadCoeff(f1);
       f1=f1 / leadcoeff;
 
       // factorize using NTL
+      #ifdef NTL_ZZ
       vec_pair_ZZ_pEX_long factors;
+      #else
+      vec_pair_zz_pEX_long factors;
+      #endif
       CanZass(factors,f1);
 
       // return converted result
-      F=convertNTLvec_pair_ZZpEX_long2FacCFFList(factors,leadcoeff,f.mvar(),alpha);
+      F=convertNTLvec_pair_zzpEX_long2FacCFFList(factors,leadcoeff,f.mvar(),alpha);
     }
     else