Changeset 1372ae in git

Timestamp:

Nov 22, 2010, 3:27:21 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

a35d14fe5659007b14c281f4f4ccfc7721921c14

Parents:

29c2151951215fc3083ba3cfb8b8a690059884f6

Message:

Variable(i) ->v.level()

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

Location:

factory

Files:

• cf_gcd_smallp.cc (modified) (1 diff)
• facFqBivar.cc (modified) (4 diffs)
• facFqBivarUtil.cc (modified) (1 diff)
• facFqFactorize.cc (modified) (4 diffs)
• facFqSquarefree.cc (modified) (2 diffs)

factory/cf_gcd_smallp.cc

@@ -1778 +1778 @@
         random += result.getLast()*power (x, i);
       }
-      else if (alpha != Variable(1))
+      else if (alpha.level() != 1)
       {
         AlgExtRandomF genAlgExt (alpha);

factory/facFqBivar.cc

@@ -77 +77 @@
   double bound;
   int p= getCharacteristic ();
-  if (alpha != Variable(1))
+  if (alpha.level() != 1)
   {
     mipo= getMipo (alpha);
@@ -173 +173 @@
     }
   }
-  else if (alpha != Variable(1))
+  else if (alpha.level() != 1)
   {
     if (getCharacteristic() > 2)
@@ -248 +248 @@
             (LC (F, 1)*prodMod (factors, M) == F));
   int degMipoBeta;
-  if (!k && beta == Variable(1))
+  if (!k && beta.level() == 1)
     degMipoBeta= 1;
-  else if (!k && beta != Variable(1))
+  else if (!k && beta.level() != 1)
     degMipoBeta= degree (getMipo (beta));
 
@@ -616 +616 @@
   CFList source, dest;
   int degMipoBeta;
-  if (!k && beta == Variable(1))
+  if (!k && beta.level() == 1)
     degMipoBeta= 1;
-  else if (!k && beta != Variable(1))
+  else if (!k && beta.level() != 1)
     degMipoBeta= degree (getMipo (beta));
   for (CFListIterator i= factors; i.hasItem(); i++)

factory/facFqBivarUtil.cc

@@ -185 +185 @@
   CanonicalForm g= f;
   int degMipoBeta;
-  if (!k && beta == Variable(1))
+  if (!k && beta.level() == 1)
     degMipoBeta= 1;
-  else if (!k && beta != Variable(1))
+  else if (!k && beta.level() != 1)
     degMipoBeta= degree (getMipo (beta));
   if (k > 1)

factory/facFqFactorize.cc

@@ -702 +702 @@
 
   int degMipoBeta;
-  if (!k && beta == Variable(1))
+  if (!k && beta.level() == 1)
     degMipoBeta= 1;
-  else if (!k && beta != Variable(1))
+  else if (!k && beta.level() != 1)
     degMipoBeta= degree (getMipo (beta));
 
@@ -987 +987 @@
   int nBuf;
   int degMipoBeta;
-  if (!k && beta == Variable(1))
+  if (!k && beta.level() == 1)
     degMipoBeta= 1;
-  else if (!k && beta != Variable(1))
+  else if (!k && beta.level() != 1)
     degMipoBeta= degree (getMipo (beta));
 
@@ -1136 +1136 @@
 
   int degMipoBeta;
-  if (!k && beta == Variable(1))
+  if (!k && beta.level() == 1)
     degMipoBeta= 1;
-  else if (!k && beta != Variable(1))
+  else if (!k && beta.level() != 1)
     degMipoBeta= degree (getMipo (beta));
 
@@ -1238 +1238 @@
         random += result.getLast()*power (x, i);
       }
-      else if (alpha != Variable(1))
+      else if (alpha.level() != 1)
       {
         AlgExtRandomF genAlgExt (alpha);

factory/facFqSquarefree.cc

@@ -128 +128 @@
     GF= true;
   }
-  if (alpha != Variable(1))
+  if (alpha.level() != 1)
     k= degree (getMipo (alpha));
   else
@@ -144 +144 @@
       if (GF)
         tmp1= sqrfPosDer (A, buf, k, alpha, tmp);
-      else if (GF == false && alpha != Variable(1))
+      else if (GF == false && alpha.level() != 1)
         tmp1= sqrfPosDer (A, buf, k, alpha, tmp);
       else