Changeset 10af64 in git

Timestamp:

Apr 30, 2010, 1:27:48 PM (14 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

fc9f447ee5bbbae5a9b939471a9d59e37de27249

Parents:

9a310ad825cea963668f28e058738412470ae904

Message:

added new modular gcd over finite fields

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

Location:

factory

Files:

• GNUmakefile.in (modified) (4 diffs)
• cf_cyclo.cc (added)
• cf_defs.h (modified) (1 diff)
• cf_gcd.cc (modified) (2 diffs)
• cf_gcd_smallp.cc (added)
• cf_gcd_smallp.h (added)
• cf_map_ext.cc (added)
• cf_switches.h (modified) (1 diff)

factory/GNUmakefile.in

@@ -133 +133 @@
                 cf_char.cc \
                 cf_chinese.cc \
+                cf_cyclo.cc\
                 cf_eval.cc \
                 cf_factor.cc \
@@ -138 +139 @@
                 cf_gcd.cc \
                 cf_gcd_charp.cc \
+                cf_gcd_smallp.cc \
                 cf_generator.cc \
                 cf_globals.cc \
@@ -146 +148 @@
                 cf_linsys.cc \
                 cf_map.cc \
+                cf_map_ext.cc \
                 cf_ops.cc \
                 cf_primes.cc \
@@ -215 +218 @@
                 cf_eval.h \
                 cf_factory.h \
+                cf_gcd_smallp.h \
                 cf_generator.h \
                 cf_globals.h \

factory/cf_defs.h

@@ -44 +44 @@
 const int SW_USE_QGCD=15;
 const int SW_USE_fieldGCD=16;
+const int SW_USE_FF_MOD_GCD=17;
 //}}}
 

factory/cf_gcd.cc

@@ -21 +21 @@
 #include "algext.h"
 #include "fieldGCD.h"
+#include "cf_gcd_smallp.h"
 
 
@@ -584 +585 @@
     {
       fc=newGCD(fc,gc);
+    }
+    else if (isOn(SW_USE_FF_MOD_GCD) && !fc_and_gc_Univariate)
+    {
+      Variable a;
+      if (hasFirstAlgVar (fc, a) || hasFirstAlgVar (gc, a))
+      {
+        fc=GCD_Fp_extension (fc, gc, a);
+      }
+      if (CFFactory::gettype() == GaloisFieldDomain)
+      {
+        fc=GCD_GF (fc, gc);
+      }
+      fc=GCD_small_p (fc, gc);
     }
     else if ( p1 == fc.level() )

factory/cf_switches.h

@@ -19 +19 @@
 //
 //}}}
-const int CFSwitchesMax = 17;
+const int CFSwitchesMax = 18;
 //}}}