Changeset c6eecb in git for factory/cf_factor.cc

Timestamp:

Apr 26, 2007, 10:22:48 AM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

8251cc1c81aab678de3aec185a8de7969e825393

Parents:

cb637fad8051814719a0ea36ed4b65a20f1114cc

Message:

*hannes: avoid NTL char. switches


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

File:

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

factory/cf_factor.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_factor.cc,v 1.31 2007-04-25 11:13:34 Singular Exp $ */
+/* $Id: cf_factor.cc,v 1.32 2007-04-26 08:22:48 Singular Exp $ */
 
 //{{{ docu
@@ -80 +80 @@
 }
 
-#if 0
+#if 1
+#ifndef NOSTREAMIO
 void out_cf(char *s1,const CanonicalForm &f,char *s2)
 {
@@ -161 +162 @@
 }
 #endif
+#endif
 
 bool isPurePoly(const CanonicalForm & f)
@@ -347 +349 @@
       {
         // 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
+        if (fac_NTL_char!=getCharacteristic())
+        {
+          fac_NTL_char=getCharacteristic();
+          #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
@@ -390 +396 @@
       {
         // Specialcase characteristic==2
-        ZZ r;r=2;
-        ZZ_p::init(r);
-
-        // remainder is 2 --> nothing to set
-
+        if (fac_NTL_char!=2)
+        {
+          fac_NTL_char=2;
+          zz_p::init(2);
+        }
         // convert to NTL using the faster conversion routine for characteristic 2
         GF2X f1=convertFacCF2NTLGF2X(f);
@@ -531 +537 @@
       // First all cases with characteristic !=2
       // set remainder
-      #ifdef NTL_ZZ
-      ZZ r;
-      r=getCharacteristic();
-      ZZ_pContext ccc(r);
-      ccc.restore();
-      #else
-      zz_pContext ccc(getCharacteristic());
-      ccc.restore();
-      #endif
+      if (fac_NTL_char!=getCharacteristic())
+      {
+        fac_NTL_char=getCharacteristic();
+        #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
+      }
 
       // set minimal polynomial in NTL