Changeset bffe62d in git for factory/cf_gcd_smallp.cc

Timestamp:

Nov 19, 2012, 5:26:28 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8e51caea071beef6e0f3c31472a9553c63c8df6d

Parents:

a209e1d3deac62269a6170eb87b8dd656049e036

git-author:

Martin Lee <martinlee84@web.de>2012-11-19 17:26:28+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-11-19 18:01:22+01:00

Message:

chg: skip zz_p::init() if it is already correctly initialized

File:

• factory/cf_gcd_smallp.cc (modified) (9 diffs)

factory/cf_gcd_smallp.cc

@@ -414 +414 @@
 Variable chooseExtension (const Variable & alpha)
 {
-  zz_p::init (getCharacteristic());
+  if (fac_NTL_char != getCharacteristic())
+  {
+    fac_NTL_char= getCharacteristic();
+    zz_p::init (getCharacteristic());
+  }
   zz_pX NTLIrredpoly;
   int i, m;
@@ -440 +444 @@
 {
   int p= getCharacteristic();
-  zz_p::init (p);
+  if (p != fac_NTL_char)
+  {
+    fac_NTL_char= p;
+    zz_p::init (p);
+  }
   zz_pX NTLirredpoly;
   //TODO: replace d by max_{i} (deg_x{i}(f))
@@ -1333 +1341 @@
 {
   int p= getCharacteristic();
-  zz_p::init (p);
+  if (fac_NTL_char != p)
+  {
+    fac_NTL_char= p;
+    zz_p::init (p);
+  }
   zz_pX NTLirredpoly;
   CanonicalForm CFirredpoly;
@@ -1998 +2010 @@
 #else
   int p= getCharacteristic ();
-  zz_p::init (p);
+  if (fac_NTL_char != p)
+  {
+    fac_NTL_char= p;
+    zz_p::init (p);
+  }
   mat_zz_p *NTLN= convertFacCFMatrix2NTLmat_zz_p(*N);
   long rk= gauss (*NTLN);
@@ -2028 +2044 @@
     (*N) (j, M.columns() + 1)= L[i];
   int p= getCharacteristic ();
-  zz_p::init (p);
+  if (fac_NTL_char != p)
+  {
+    fac_NTL_char= p;
+    zz_p::init (p);
+  }
   zz_pX NTLMipo= convertFacCF2NTLzzpX (getMipo (alpha));
   zz_pE::init (NTLMipo);
@@ -2069 +2089 @@
 #else
   int p= getCharacteristic ();
-  zz_p::init (p);
+  if (fac_NTL_char != p)
+  {
+    fac_NTL_char= p;
+    zz_p::init (p);
+  }
   mat_zz_p *NTLN= convertFacCFMatrix2NTLmat_zz_p(*N);
   long rk= gauss (*NTLN);
@@ -2109 +2133 @@
     (*N) (j, M.columns() + 1)= L[i];
   int p= getCharacteristic ();
-  zz_p::init (p);
+  if (fac_NTL_char != p)
+  {
+    fac_NTL_char= p;
+    zz_p::init (p);
+  }
   zz_pX NTLMipo= convertFacCF2NTLzzpX (getMipo (alpha));
   zz_pE::init (NTLMipo);
@@ -4594 +4622 @@
     if (p == 2 && d < 6)
     {
-      zz_p::init (p);
+      if (fac_NTL_char != p)
+      {
+        fac_NTL_char= p;
+        zz_p::init (p);
+      }
       bool primFail= false;
       Variable vBuf;
@@ -4618 +4650 @@
     else if ((p == 3 && d < 4) || ((p == 5 || p == 7) && d < 3))
     {
-      zz_p::init (p);
+      if (fac_NTL_char != p)
+      {
+        fac_NTL_char= p;
+        zz_p::init (p);
+      }
       bool primFail= false;
       Variable vBuf;