Changeset 04cdf06 in git

Timestamp:

Dec 14, 2010, 1:53:42 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3da413f2c6332c298e7f4115ffffdc526d5e914a

Parents:

ab5b77f9e4845c4931341d1ae2da855f56b7b706

Message:

factorization now uses 'gcd'


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

Location:

factory

Files:

• facFqBivar.cc (modified) (2 diffs)
• facFqFactorize.cc (modified) (8 diffs)
• facFqSquarefree.cc (modified) (5 diffs)

factory/facFqBivar.cc

@@ -860 +860 @@
   else
   {
-    if (GF)
-      gcdDerivX= GCD_GF (A, derivX);
-    else if (alpha == x)
-      gcdDerivX= GCD_small_p (A, derivX);
-    else
-      gcdDerivX= GCD_Fp_extension (A, derivX, alpha);
+    gcdDerivX= gcd (A, derivX);
     if (degree (gcdDerivX) > 0)
     {
@@ -885 +880 @@
   else
   {
-    if (GF)
-      gcdDerivY= GCD_GF (A, derivY);
-    else if (alpha == x)
-      gcdDerivY= GCD_small_p (A, derivY);
-    else
-      gcdDerivY= GCD_Fp_extension (A, derivY, alpha);
+    gcdDerivY= gcd (A, derivY);
     if (degree (gcdDerivY) > 0)
     {

factory/facFqFactorize.cc

@@ -49 +49 @@
   CanonicalForm G= swapvar (F, F.mvar(), Variable (1));
   CFList L;
-  Variable alpha;
-  bool algExt= hasFirstAlgVar (G, alpha);
   for (CFIterator i= G; i.hasTerms(); i++)
     L.append (i.coeff());
   if (L.length() == 2)
-  {
-    bool GF= (CFFactory::gettype() == GaloisFieldDomain);
-    if (GF)
-    {
-      return swapvar (GCD_GF (L.getFirst(), L.getLast()), F.mvar(),
-                      Variable (1));
-    }
-    else if (!GF && algExt)
-    {
-      return swapvar (GCD_Fp_extension (L.getFirst(), L.getLast(), alpha),
-                                       F.mvar(), Variable (1));
-    }
-    else
-      return swapvar (GCD_small_p (L.getFirst(), L.getLast()), F.mvar(),
-                     Variable (1));
-  }
+    return swapvar (gcd (L.getFirst(), L.getLast()), F.mvar(), Variable (1));
   if (L.length() == 1)
-  {
     return LC (F, Variable (1));
-  }
   return swapvar (listGCD (L), F.mvar(), Variable (1));
 }
@@ -83 +64 @@
   if (L.length() == 1)
     return L.getFirst();
-  Variable alpha;
   if (L.length() == 2)
-  {
-    bool GF= (CFFactory::gettype() == GaloisFieldDomain);
-    if (GF)
-    {
-      return GCD_GF (L.getFirst(), L.getLast());
-    }
-    else if (!GF && (hasFirstAlgVar (L.getFirst(), alpha) ||
-                     hasFirstAlgVar (L.getLast(), alpha)))
-    {
-      return GCD_Fp_extension (L.getFirst(), L.getLast(), alpha);
-    }
-    else
-      return GCD_small_p (L.getFirst(), L.getLast());
-  }
+    return gcd (L.getFirst(), L.getLast());
   else
   {
@@ -104 +71 @@
     CanonicalForm resultHi, resultLo;
     int length= L.length()/2;
-    bool GF= (CFFactory::gettype() == GaloisFieldDomain);
     int j= 0;
     for (CFListIterator i= L; j < length; i++, j++)
@@ -113 +79 @@
     if (resultHi.isOne() || resultLo.isOne())
       return 1;
-    if (GF)
-    {
-      return GCD_GF (resultHi, resultLo);
-    }
-    else if (!GF && (hasFirstAlgVar (resultHi, alpha) ||
-                     hasFirstAlgVar (resultLo, alpha)))
-    {
-      return GCD_Fp_extension (resultHi, resultLo, alpha);
-    }
-    else
-      return GCD_small_p (resultHi, resultLo);
+    return gcd (resultHi, resultLo);
   }
 }
@@ -147 +103 @@
   if (L.length() == 2)
   {
-    bool GF= (CFFactory::gettype() == GaloisFieldDomain);
-    if (GF)
-    {
-      if (swap)
-        return swapvar(GCD_GF (L.getFirst(), L.getLast()), F.mvar(), x);
-      else
-        return GCD_GF (L.getFirst(), L.getLast());
-    }
-    else if (!GF && algExt)
-    {
-      if (swap)
-        return swapvar(GCD_Fp_extension (L.getFirst(), L.getLast(), alpha),
-                                         F.mvar(), x);
-      else
-        return GCD_Fp_extension (L.getFirst(), L.getLast(), alpha);
-    }
+    if (swap)
+      return swapvar (gcd (L.getFirst(), L.getLast()), F.mvar(), x);
     else
-    {
-      if (swap)
-        return swapvar (GCD_small_p (L.getFirst(), L.getLast()), F.mvar(),
-                        x);
-      else
-        return GCD_small_p (L.getFirst(), L.getLast());
-    }
+      return gcd (L.getFirst(), L.getLast());
   }
   if (L.length() == 1)
@@ -181 +117 @@
     return listGCD (L);
 }
-
-static inline
-CanonicalForm
-myLcm (const CanonicalForm& F, const CanonicalForm& G)
-{
-  if ( F.isZero() || G.isZero() )
-    return 0;
-  else
-  {
-    Variable alpha;
-    bool GF= (CFFactory::gettype() == GaloisFieldDomain);
-    if (GF)
-      return (F/GCD_GF (F, G))*G;
-    else if (!GF && (hasFirstAlgVar (F, alpha) ||
-                     hasFirstAlgVar (G, alpha)))
-      return (F/GCD_Fp_extension (F, G, alpha))*G;
-    else
-      return (F/GCD_small_p (F, G))*G;
-  }
-}
-
 
 static inline
@@ -1346 +1261 @@
   contentAi.append (myContent (A, i));
   contentAi.append (myContent (A, i - 1));
-  CanonicalForm result= myLcm (contentAi.getFirst(), contentAi.getLast());
+  CanonicalForm result= lcm (contentAi.getFirst(), contentAi.getLast());
   for (i= i - 2; i > 0; i--)
   {
     contentAi.append (content (A, i));
-    result= myLcm (result, contentAi.getLast());
+    result= lcm (result, contentAi.getLast());
   }
   return result;
@@ -1750 +1665 @@
         A= swapvar (A, x, z);
       }
-      if (GF)
-        gcdDerivZ= GCD_GF (bufA, derivZ);
-      else if (alpha == Variable (1))
-        gcdDerivZ= GCD_small_p (bufA, derivZ);
-      else
-        gcdDerivZ= GCD_Fp_extension (bufA, derivZ, alpha);
+      gcdDerivZ= gcd (bufA, derivZ);
       if (degree (gcdDerivZ) > 0 && !derivZ.isZero())
       {

factory/facFqSquarefree.cc

@@ -77 +77 @@
   Variable buf= alpha;
   CanonicalForm b= deriv (F, x);
-  bool GF= (CFFactory::gettype() == GaloisFieldDomain);
-  if (GF)
-    c= GCD_GF (F, b);
-  else if (GF == false && k != 1)
-    c= GCD_Fp_extension (F, b, buf);
-  else
-    c= GCD_small_p (F, b);
+  c= gcd (F, b);
   CanonicalForm w= F/c;
   CanonicalForm v= b/c;
@@ -93 +87 @@
   while (j < p - 1 && degree(u) >= 0)
   {
-    if (GF)
-      g= GCD_GF (w, u);
-    else if (GF == false && k != 1)
-      g= GCD_Fp_extension (w, u, buf);
-    else
-      g= GCD_small_p (w, u);
+    g= gcd (w, u);
     if (degree(g) > 0)
       result.append (CFFactor (g, j));
@@ -190 +179 @@
     for (CFFListIterator j= tmp1; j.hasItem(); j++)
     {
-      if (GF)
-        tmp= GCD_GF (i.getItem().factor(), j.getItem().factor());
-      else if (GF == false && buf == Variable (1))
-        tmp= GCD_small_p (i.getItem().factor(), j.getItem().factor());
-      else
-        tmp= GCD_Fp_extension (i.getItem().factor(),j.getItem().factor(),buf);
+      tmp= gcd (i.getItem().factor(), j.getItem().factor());
       i.getItem()= CFFactor (i.getItem().factor()/tmp, i.getItem().exp());
       j.getItem()= CFFactor (j.getItem().factor()/tmp, j.getItem().exp());
@@ -243 +227 @@
     return 1;
   }
-  if (GF)
-    w= GCD_GF (A, deriv (A, Variable (i)));
-  else if (GF == false && alpha == Variable (1))
-    w= GCD_small_p (A, deriv (A, Variable (i)));
-  else
-    w= GCD_Fp_extension (A, deriv (A, Variable (i)), vBuf);
+  w= gcd (A, deriv (A, Variable (i)));
 
   b= A/w;
@@ -260 +239 @@
     {
       b= w;
-      if (GF)
-        w= GCD_GF (w, deriv (w, Variable (i)));
-      else if (GF == false && vBuf == Variable (1))
-        w= GCD_small_p (w, deriv (w, Variable (i)));
-      else
-        w= GCD_Fp_extension (w, deriv (w, Variable (i)), vBuf);
+      w= gcd (w, deriv (w, Variable (i)));
       b /= w;
       if (degree (b) < 1)
         break;
       CanonicalForm g;
-      if (GF)
-        g= GCD_GF (b, result);
-      else if (GF == false && vBuf == Variable (1))
-        g= GCD_small_p (b, result);
-      else
-        g= GCD_Fp_extension (b, result, vBuf);
+      g= gcd (b, result);
       if (degree (g) > 0)
         result *= b/g;