Changeset 12f992 in git

Timestamp:

Mar 10, 2014, 2:58:13 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

b8f562019d20b1ae9a24693975ad6c264a8fa5e9

Parents:

c78743104173a106f27611fdf3b220e3b470d84e

git-author:

Martin Lee <martinlee84@web.de>2014-03-10 14:58:13+01:00

git-committer:

Martin Lee <martinlee84@web.de>2014-03-11 11:06:27+01:00

Message:

chg: deleted SW_USE_NTL_GCD_*

Files:

• Singular/extra.cc (modified) (2 diffs)
• Singular/misc_ip.cc (modified) (1 diff)
• factory/cf_defs.h (modified) (1 diff)
• factory/cf_gcd.cc (modified) (6 diffs)
• factory/cf_switches.cc (modified) (1 diff)
• factory/cf_switches.h (modified) (1 diff)

Singular/extra.cc

@@ -3588 +3588 @@
         {
 #ifdef HAVE_PLURAL
-          Print("NTL_0:%d (use NTL for gcd of polynomials in char 0)\n",isOn(SW_USE_NTL_GCD_0));
-          Print("NTL_p:%d (use NTL for gcd of polynomials in char p)\n",isOn(SW_USE_NTL_GCD_P));
           Print("EZGCD:%d (use EZGCD for gcd of polynomials in char 0)\n",isOn(SW_USE_EZGCD));
           Print("EZGCD_P:%d (use EZGCD_P for gcd of polynomials in char p)\n",isOn(SW_USE_EZGCD_P));
@@ -3605 +3603 @@
           char *s=(char *)h->Data();
 #ifdef HAVE_PLURAL
-          if (strcmp(s,"NTL_0")==0) { if (d) On(SW_USE_NTL_GCD_0); else Off(SW_USE_NTL_GCD_0); } else
-          if (strcmp(s,"NTL_p")==0) { if (d) On(SW_USE_NTL_GCD_P); else Off(SW_USE_NTL_GCD_P); } else
           if (strcmp(s,"EZGCD")==0) { if (d) On(SW_USE_EZGCD); else Off(SW_USE_EZGCD); } else
           if (strcmp(s,"EZGCD_P")==0) { if (d) On(SW_USE_EZGCD_P); else Off(SW_USE_EZGCD_P); } else

Singular/misc_ip.cc

@@ -1168 +1168 @@
 {
 // factory default settings: -----------------------------------------------
-  On(SW_USE_NTL_GCD_0); // On -> seg11 in Old/algnorm, Old/factor...
-  On(SW_USE_NTL_GCD_P); // On -> cyle in Short/brnoeth_s: fixed
   On(SW_USE_EZGCD);
   On(SW_USE_CHINREM_GCD);

factory/cf_defs.h

@@ -27 +27 @@
 const int SW_RATIONAL = 0;
 const int SW_SYMMETRIC_FF = 1;
-const int SW_BERLEKAMP = 2;
-const int SW_FAC_QUADRATICLIFT = 3;
-const int SW_USE_EZGCD = 4;
-const int SW_USE_EZGCD_P = 5;
-const int SW_USE_NTL_GCD_0=6;
-const int SW_USE_NTL_GCD_P=7;
-const int SW_USE_NTL_SORT=8;
-const int SW_USE_CHINREM_GCD=9;
-const int SW_USE_QGCD=10;
-const int SW_USE_FF_MOD_GCD=11;
+const int SW_USE_EZGCD = 2;
+const int SW_USE_EZGCD_P = 3;
+const int SW_USE_NTL_SORT=4;
+const int SW_USE_CHINREM_GCD=5;
+const int SW_USE_QGCD=6;
+const int SW_USE_FF_MOD_GCD=7;
 //}}}
 

factory/cf_gcd.cc

@@ -336 +336 @@
   }
 #else
-  if (isOn(SW_USE_NTL_GCD_P) && ( getCharacteristic() > 0 ) && (CFFactory::gettype() != GaloisFieldDomain)
+  if (( getCharacteristic() > 0 ) && (CFFactory::gettype() != GaloisFieldDomain)
   &&  (f.level()==g.level()) && isPurePoly(f) && isPurePoly(g))
   {
@@ -377 +377 @@
   }
 #else
-  if (isOn(SW_USE_NTL_GCD_0) && ( getCharacteristic() ==0)
+  if (( getCharacteristic() ==0)
   && (f.level()==g.level()) && isPurePoly(f) && isPurePoly(g))
   {
@@ -400 +400 @@
       else
       {
-        Off(SW_USE_NTL_GCD_0);
-        r=extgcd(f,g,a,b);
-        if (isOn(SW_RATIONAL))
-        {
-          a/=r.lc();
-          b/=r.lc();
-          r/=r.lc();
-        }
-        On(SW_USE_NTL_GCD_0);
+        F1 /= R;
+        G1 /= R;
+        XGCD (RR, A,B,F1,G1,1);
+        rr=convertZZ2CF(RR);
+        a=convertNTLZZX2CF(A,f.mvar())*(fc/rr);
+        b=convertNTLZZX2CF(B,f.mvar())*(gc/rr);
       }
     }
@@ -422 +419 @@
       else
       {
-        Off(SW_USE_NTL_GCD_0);
-        r=extgcd(f,g,a,b);
-        if (isOn(SW_RATIONAL))
-        {
-          a/=r.lc();
-          b/=r.lc();
-          r/=r.lc();
-        }
-        On(SW_USE_NTL_GCD_0);
+        F1 /= R;
+        G1 /= R;
+        XGCD (RR, A,B,F1,G1,1);
+        rr=convertZZ2CF(RR);
+        a=convertNTLZZX2CF(A,f.mvar())*(fc/rr);
+        b=convertNTLZZX2CF(B,f.mvar())*(gc/rr);
       }
       return r;
@@ -675 +669 @@
 #else
 #ifdef HAVE_NTL
-        if ( isOn(SW_USE_NTL_GCD_P) && bpure && (CFFactory::gettype() != GaloisFieldDomain))
+        if (bpure && (CFFactory::gettype() != GaloisFieldDomain))
             return gcd_univar_ntlp(pi, pi1 ) * C;
 #endif
@@ -794 +788 @@
 #else
 #ifdef HAVE_NTL
-        if ( isOn(SW_USE_NTL_GCD_0) && isPurePoly(pi) && isPurePoly(pi1) )
+        if (isPurePoly(pi) && isPurePoly(pi1) )
             return gcd_univar_ntl0(pi, pi1 ) * C;
 #endif

factory/cf_switches.cc

@@ -31 +31 @@
 #ifdef HAVE_NTL
   On(SW_USE_CHINREM_GCD);
-  //Off(SW_USE_NTL_GCD_0);
-  //Off(SW_USE_NTL_GCD_P);
   //Off(SW_USE_NTL_SORT);
 #endif

factory/cf_switches.h

@@ -18 +18 @@
 //
 //}}}
-const int CFSwitchesMax = 12;
+const int CFSwitchesMax = 8;
 //}}}