Changeset 2667bc8 in git

Timestamp:

May 3, 2005, 11:35:34 AM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

c1ff21d1e591041b2b4caf753adaa803d9f4c342

Parents:

d87eb099bbb670866fe02db984e08d588bedb2b4

Message:

*hannes:


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

Location:

factory

Files:

• cf_defs.h (modified) (2 diffs)
• cf_gcd.cc (modified) (4 diffs)
• cf_switches.cc (modified) (2 diffs)
• cf_switches.h (modified) (2 diffs)
• fac_ezgcd.cc (modified) (2 diffs)

factory/cf_defs.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_defs.h,v 1.9 2003-02-11 16:28:50 Singular Exp $ */
+/* $Id: cf_defs.h,v 1.10 2005-05-03 09:35:33 Singular Exp $ */
 
 #ifndef INCL_CF_DEFS_H
@@ -36 +36 @@
 const int SW_USE_SPARSEMOD = 7;
 const int SW_USE_NTL=8;
-const int SW_USE_NTL_GCD=9;
-const int SW_USE_NTL_SORT=10;
+const int SW_USE_NTL_GCD_0=9;
+const int SW_USE_NTL_GCD_P=10;
+const int SW_USE_NTL_SORT=11;
 //}}}
 

factory/cf_gcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_gcd.cc,v 1.29 2005-02-11 13:22:44 Singular Exp $ */
+/* $Id: cf_gcd.cc,v 1.30 2005-05-03 09:35:34 Singular Exp $ */
 
 #include <config.h>
@@ -147 +147 @@
 {
 #ifdef HAVE_NTL
-  if (isOn(SW_USE_NTL_GCD) && ( getCharacteristic() > 0 )
+  if (isOn(SW_USE_NTL_GCD_P) && ( getCharacteristic() > 0 )
   && isPurePoly(f) && isPurePoly(g))
   {
@@ -194 +194 @@
 {
 #ifdef HAVE_NTL
-  if (isOn(SW_USE_NTL_GCD) && isPurePoly(F) && isPurePoly(G))
+  if (isOn(SW_USE_NTL_GCD_P) && isPurePoly(F) && isPurePoly(G))
   {
     if ( getCharacteristic() > 0 )
@@ -343 +343 @@
     {
 #ifdef HAVE_NTL
-      if (isOn(SW_USE_NTL_GCD) && isPurePoly(pi) && isPurePoly(pi1))
+      if ((isOn(SW_USE_NTL_GCD_P)||isOn(SW_USE_NTL_GCD_0))
+       && isPurePoly(pi) && isPurePoly(pi1))
          return gcd_poly_univar0(f, g, true);
 #endif

factory/cf_switches.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_switches.cc,v 1.6 2005-02-17 13:59:27 Singular Exp $ */
+/* $Id: cf_switches.cc,v 1.7 2005-05-03 09:35:34 Singular Exp $ */
 
 //{{{ docu
@@ -30 +30 @@
 #ifdef HAVE_NTL
   On(SW_USE_NTL);
-  //Off(SW_USE_NTL_GCD);
+  //Off(SW_USE_NTL_GCD_0);
+  //Off(SW_USE_NTL_GCD_P);
   //Off(SW_USE_NTL_SORT);
 #endif

factory/cf_switches.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_switches.h,v 1.8 2005-02-17 13:59:28 Singular Exp $ */
+/* $Id: cf_switches.h,v 1.9 2005-05-03 09:35:34 Singular Exp $ */
 
 #ifndef INCL_CF_SWITCHES_H
@@ -19 +19 @@
 //
 //}}}
-const int CFSwitchesMax = 11;
+const int CFSwitchesMax = 12;
 //}}}
 

factory/fac_ezgcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: fac_ezgcd.cc,v 1.18 2005-02-11 13:24:27 Singular Exp $ */
+/* $Id: fac_ezgcd.cc,v 1.19 2005-05-03 09:35:34 Singular Exp $ */
 
 #include <config.h>
@@ -222 +222 @@
 #if 1
     Off(SW_USE_EZGCD);
-    //bool ntl=isOn(SW_USE_NTL_GCD);
-    //Off(SW_USE_NTL_GCD);
+    //bool ntl0=isOn(SW_USE_NTL_GCD_0);
+    //Off(SW_USE_NTL_GCD_0);
+    //bool ntlp=isOn(SW_USE_NTL_GCD_P);
+    //Off(SW_USE_NTL_GCD_P);
     d=gcd( F, G );
-    //if (ntl) On(SW_USE_NTL_GCD);
+    //if (ntl0) On(SW_USE_NTL_GCD_0);
+    //if (ntlp) On(SW_USE_NTL_GCD_P);
     On(SW_USE_EZGCD);
     return d;