Changeset b44d16 in git

Timestamp:

Jan 19, 2004, 12:27:46 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

241b061058e7977a7c88da78f369a2fc3b76e55f

Parents:

f11d7badcdaf6188ba929aa6bf7fcc40bfccf113

Message:

*hannes: zzp routines


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

File:

• factory/cf_factor.cc (modified) (2 diffs)

factory/cf_factor.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_factor.cc,v 1.21 2003-08-28 14:13:12 Singular Exp $ */
+/* $Id: cf_factor.cc,v 1.22 2004-01-19 11:27:46 Singular Exp $ */
 
 //{{{ docu
@@ -207 +207 @@
       {
         // set remainder
+        #ifdef NTL_ZZ
         ZZ r;
         r=getCharacteristic();
         ZZ_pContext ccc(r);
+        #else
+        zz_pContext ccc(getCharacteristic());
+        #endif
         ccc.restore();
+        #ifdef NTL_ZZ
         ZZ_p::init(r);
+        #else
+        zz_p::init(getCharacteristic());
+        #endif
         // convert to NTL
+        #ifdef NTL_ZZ
         ZZ_pX f1=convertFacCF2NTLZZpX(f);
         ZZ_p leadcoeff = LeadCoeff(f1);
+        #else
+        zz_pX f1=convertFacCF2NTLzzpX(f);
+        zz_p leadcoeff = LeadCoeff(f1);
+        #endif
         //make monic
         f1=f1 / LeadCoeff(f1);
 
         // factorize
+        #ifdef NTL_ZZ
         vec_pair_ZZ_pX_long factors;
+        #else
+        vec_pair_zz_pX_long factors;
+        #endif
         CanZass(factors,f1);
 
         // convert back to factory
+        #ifdef NTL_ZZ
         F=convertNTLvec_pair_ZZpX_long2FacCFFList(factors,leadcoeff,f.mvar());
+        #else
+        F=convertNTLvec_pair_zzpX_long2FacCFFList(factors,leadcoeff,f.mvar());
+        #endif
         //test_cff(F,f);
       }