Changeset bb82f0 in git

Timestamp:

Jun 16, 2008, 2:55:41 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

c99b6b9aa9684f111c07fca497f1d2256859ad05

Parents:

ca4a07322f31d377c0c316a145437504fb8e6be0

Message:

*hannes: SW_USE_QGCD


git-svn-id: file:///usr/local/Singular/svn/trunk@10762 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)

factory/cf_defs.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_defs.h,v 1.13 2007-11-20 10:08:02 Singular Exp $ */
+/* $Id: cf_defs.h,v 1.14 2008-06-16 12:55:08 Singular Exp $ */
 
 #ifndef INCL_CF_DEFS_H
@@ -42 +42 @@
 const int SW_USE_CHINREM_GCD=13;
 const int SW_USE_GCD_P=14;
+const int SW_USE_QGCD=15;
 //}}}
 

factory/cf_gcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_gcd.cc,v 1.61 2008-05-16 13:11:31 Singular Exp $ */
+/* $Id: cf_gcd.cc,v 1.62 2008-06-16 12:55:41 Singular Exp $ */
 
 #include <config.h>
@@ -16 +16 @@
 #include "ftmpl_functions.h"
 #include "ffreval.h"
+#include "algext.h"
 
 #ifdef HAVE_NTL
@@ -762 +763 @@
                 return cf_content( g, f );
         }
+        if (isOn(SW_USE_QGCD))
+        {
+          Variable m;
+          if ((hasFirstAlgVar(f,m) || hasFirstAlgVar(g,m))
+          //&& f.isUnivariate()
+          //&& g.isUnivariate()
+          && (getCharacteristic() == 0)
+          )
+            return QGCD(f,g);
+        }
+            
         if ( f.inExtension() && getReduce( f.mvar() ) )
-            return 1;
+            return CanonicalForm(1);
         else
         {
@@ -1149 +1161 @@
   }
 }
+#include "algext.cc"

factory/cf_switches.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_switches.cc,v 1.9 2007-11-20 10:08:03 Singular Exp $ */
+/* $Id: cf_switches.cc,v 1.10 2008-06-16 12:54:25 Singular Exp $ */
 
 //{{{ docu
@@ -37 +37 @@
   On(SW_USE_EZGCD);
   //On(SW_USE_EZGCD_P); // still testing
+  //On(SW_USE_QGCD);
 }
 //}}}

factory/cf_switches.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_switches.h,v 1.12 2007-11-20 10:08:03 Singular Exp $ */
+/* $Id: cf_switches.h,v 1.13 2008-06-16 12:54:05 Singular Exp $ */
 
 #ifndef INCL_CF_SWITCHES_H
@@ -19 +19 @@
 //
 //}}}
-const int CFSwitchesMax = 15;
+const int CFSwitchesMax = 16;
 //}}}