Changeset 86acc34 in git

Timestamp:

May 13, 2014, 3:15:26 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

0ac77c459123ddecaf705f0a8aead6339faa5279

Parents:

c9f357778ee9f8d227771940ccf22290fb865982

git-author:

Martin Lee <martinlee84@web.de>2014-05-13 15:15:26+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-05-21 15:06:53+02:00

Message:

chg: do not waste non-sqrfree norm

File:

• factory/facAlgFunc.cc (modified) (1 diff)

factory/facAlgFunc.cc

@@ -490 +490 @@
   }
 
-  sqrfFactors= sqrf_norm (f, Rstar, vminpoly, s, g, R);
-
-  if (getCharacteristic() > 0)
-  {
-    if (sqrfFactors.getFirst().factor().inCoeffDomain())
-      sqrfFactors.removeFirst();
-
-    Variable X;
-    for (iter= sqrfFactors; iter.hasItem(); iter++)
-    {
-      if (hasFirstAlgVar (iter.getItem().factor(), X))
-      {
-        // factorize over alg.extension with X
-        tmp= factorize (iter.getItem().factor(), X);
-      }
+  CFGenerator * Gen;
+  if (getCharacteristic() == 0)
+    Gen= new IntGenerator();
+  else if (degree (vminpoly) > 0)
+    Gen= AlgExtGenerator (vminpoly).clone();
+  else
+    Gen= new FFGenerator();
+
+  CFFList LL= CFFList (CFFactor (f, 1));
+
+  Variable X;
+  do
+  {
+    tmp= CFFList();
+    for (iter= LL; iter.hasItem(); iter++)
+    {
+      f= iter.getItem().factor();
+      sqrfFactors= sqrf_norm_sub (f, Rstar, *Gen, s, g, R, false);
+
+      if (hasFirstAlgVar (R, X))
+        Factorlist= factorize (R, X);
       else
-      {
-        // factorize over k
-        tmp= factorize (iter.getItem().factor(), true);
-      }
-      if (tmp.getFirst().factor().inCoeffDomain())
-        tmp.removeFirst();
-      for (iter2= tmp; iter2.hasItem(); iter2++)
-        Factorlist= append (Factorlist, iter2.getItem());
-    }
-  }
-  else
-    Factorlist= factorize (R, true);
-
-  if (!Factorlist.getFirst().factor().inCoeffDomain())
-    Factorlist.insert (CFFactor (1, 1));
-  if (Factorlist.length() == 2 && Factorlist.getLast().exp() == 1)
-  {
-    f= backSubst (f, backSubsts, Astar);
-    f *= bCommonDen (f);
-    f= Prem (f, as);
-    f /= vcontent (f, as.getFirst().mvar());
-
-    L.append(CFFactor(f,1));
-  }
-  else
-  {
-    g= f;
-    for (iter= Factorlist; iter.hasItem(); iter++)
-    {
-      CanonicalForm fnew= iter.getItem().factor();
-      if (fnew.level() < Rstar.level()) //factor is a constant from the function field
-        continue;
+        Factorlist= factorize (R);
+
+      if (!Factorlist.getFirst().factor().inCoeffDomain())
+        Factorlist.insert (CFFactor (1, 1));
+      if (Factorlist.length() == 2 && Factorlist.getLast().exp() == 1)
+      {
+        f= backSubst (f, backSubsts, Astar);
+        f *= bCommonDen (f);
+        f= Prem (f, as);
+        f /= vcontent (f, as.getFirst().mvar());
+
+        L.append (CFFactor (f, 1));
+        break;
+      }
       else
       {
-        fnew= fnew (g.mvar() + s*Rstar.mvar(), g.mvar());
-        fnew= reduce (fnew, Rstar);
-      }
-
-      h= alg_gcd (g, fnew, Rstarlist);
-      numinv= QuasiInverse (Rstar, alg_LC (h, algExtLevel), Rstar.mvar());
-      h *= numinv;
-      h= Prem (h, Rstarlist);
-      h /= vcontent (h, Rstar.mvar());
-
-      if (h.level() >= Rstar.level())
-      {
-        g= divide (g, h, Rstarlist);
-        h= backSubst (h, backSubsts, Astar);
-        h= Prem (h, as);
-        h *= bCommonDen (h);
-        h /= vcontent (h, as.getFirst().mvar());
-        L.append (CFFactor (h, 1));
-      }
-    }
-    // we are not interested in a
-    // constant (over K_r, which can be a polynomial!)
-    if (degree (g, f.mvar()) > 0)
-      L.append (CFFactor (g, 1));
-  }
-  CFFList LL;
-  if (getCharacteristic() > 0) //do I really need this part?
-  {
-    CFFListIterator i=L;
-    CanonicalForm c_fac=1;
-    CanonicalForm c;
-    for(;i.hasItem(); i++ )
-    {
-      CanonicalForm ff=i.getItem().factor();
-      c=alg_lc(ff);
-      int e=i.getItem().exp();
-      ff/=c;
-      if (!ff.isOne()) LL.append(CFFactor(ff,e));
-      while (e>0) { c_fac*=c;e--; }
-    }
-    if (!c_fac.isOne()) LL.insert(CFFactor(c_fac,1));
-  }
-  else
-  {
-    LL=L;
-  }
+        g= f;
+        for (iter2= Factorlist; iter2.hasItem(); iter2++)
+        {
+          CanonicalForm fnew= iter2.getItem().factor();
+          if (fnew.level() < Rstar.level()) //factor is a constant from the function field
+            continue;
+          else
+          {
+            fnew= fnew (g.mvar() + s*Rstar.mvar(), g.mvar());
+            fnew= reduce (fnew, Rstar);
+          }
+
+          h= alg_gcd (g, fnew, Rstarlist);
+          numinv= QuasiInverse (Rstar, alg_LC (h, algExtLevel), Rstar.mvar());
+          h *= numinv;
+          h= Prem (h, Rstarlist);
+          h /= vcontent (h, Rstar.mvar());
+
+          if (h.level() >= Rstar.level())
+          {
+            g= divide (g, h, Rstarlist);
+            if (degree (h) == 1 || iter2.getItem().exp() == 1)
+            {
+              h= backSubst (h, backSubsts, Astar);
+              h= Prem (h, as);
+              h *= bCommonDen (h);
+              h /= vcontent (h, as.getFirst().mvar());
+              L.append (CFFactor (h, 1));
+            }
+            else
+              tmp.append (CFFactor (h, iter2.getItem().exp()));
+          }
+        }
+      }
+    }
+    LL= tmp;
+    (*Gen).next();
+  }
+  while (!LL.isEmpty());
 
   if (!isRat && getCharacteristic() == 0)
     Off (SW_RATIONAL);
 
-  return LL;
+  delete Gen;
+
+  return L;
 }