Changeset 0aa5d5 in git

Timestamp:

Mar 10, 2014, 4:02:26 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

df3eef0007e351efd7a2c08a22185605e7ae6dd2

Parents:

5f4e0e5f2f9ec9aea8d113e4a58ecbc39cf69c35

git-author:

Martin Lee <martinlee84@web.de>2014-03-10 16:02:26+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-03-17 18:31:54+01:00

Message:

chg: separate non function field case from function field case
chg: better readability of code

File:

• factory/libfac/charset/alg_factor.cc (modified) (8 diffs)

factory/libfac/charset/alg_factor.cc

@@ -733 +733 @@
 #ifndef DEBUGOUTPUT
 static CFFList
-alg_factor( const CanonicalForm & f, const CFList & Astar, const Variable & vminpoly, const Varlist /*& oldord*/, const CFList & as)
+alg_factor( const CanonicalForm & F, const CFList & Astar, const Variable & vminpoly, const Varlist /*& oldord*/, const CFList & as, bool isFunctionField)
 #else
 static CFFList
-alg_factor( const CanonicalForm & f, const CFList & Astar, const Variable & vminpoly, const Varlist & oldord, const CFList & as)
+alg_factor( const CanonicalForm & F, const CFList & Astar, const Variable & vminpoly, const Varlist & oldord, const CFList & as, bool isFunctionField)
 #endif
 {
   CFFList L, Factorlist;
-  CanonicalForm R, Rstar, s, g, h;
+  CanonicalForm R, Rstar, s, g, h, f= F;
   CFList substlist;
 
@@ -747 +747 @@
 
   //out_cf("start alg_factor:",f,"\n");
-  substlist= simpleextension(Astar, vminpoly, Rstar);
+  substlist= simpleextension(Astar, vminpoly, isFunctionField, Rstar);
   DEBOUTLN(CERR, "alg_factor: substlist= ", substlist);
   DEBOUTLN(CERR, "alg_factor: minpoly Rstar= ", Rstar);
   DEBOUTLN(CERR, "alg_factor: vminpoly= ", vminpoly);
+
+  f= subst (f, Astar, substlist, Rstar, isFunctionField);
+
+  Variable alpha;
+  if (!isFunctionField)
+  {
+    alpha= rootOf (Rstar);
+    g= replacevar (f, Rstar.mvar(), alpha);
+
+    Factorlist= factorize (g, alpha);
+
+    for (CFFListIterator i= Factorlist; i.hasItem(); i++)
+    {
+      h= i.getItem().factor();
+      if (!h.inCoeffDomain())
+      {
+        h= replacevar (h, alpha, Rstar.mvar());
+        h *= bCommonDen(h);
+        h= Prem (h, as);
+        L.append (CFFactor (h, i.getItem().exp()));
+      }
+    }
+    return L;
+  }
 
   sqrf_norm(f, Rstar, vminpoly, s, g, R );
@@ -1047 +1071 @@
   CFFList Factorlist;
   Varlist gcdord= Union(ord,newuord); gcdord.append(f.mvar());
+  bool isFunctionField= (newuord.length() > 0);
+
   // This is for now. we need alg_sqrfree implemented!
-  CanonicalForm Fgcd;
-          Fgcd= alg_gcd(f,f.deriv(),Astar);
+  CanonicalForm Fgcd= 0;
+  if (isFunctionField)
+    Fgcd= alg_gcd(f,f.deriv(),Astar);
+
   if ( Fgcd == 0 ) {DEBOUTMSG(CERR, "WARNING: p'th root ?");}
-  if (( degree(Fgcd, f.mvar()) > 0) && (!(f.deriv().isZero())) ){
+  if (isFunctionField && ( degree(Fgcd, f.mvar()) > 0) && (!(f.deriv().isZero())) )
+  {
     DEBOUTLN(CERR, "Nontrivial GCD found of ", f);
     CanonicalForm Ggcd= divide(f, Fgcd,Astar);
+    if (getCharacteristic() == 0)
+    {
+      CFFList result= newfactoras (Ggcd,as,success); //Ggcd is the squarefree part of f
+      multiplicity (result, f, Astar);
+      return result;
+    }
     DEBOUTLN(CERR, "  split into ", Fgcd);
     DEBOUTLN(CERR, "         and ", Ggcd);
@@ -1060 +1095 @@
     return myUnion(newfactoras(Fgcd,as,success) , newfactoras(Ggcd,as,success));
   }
-  if ( getCharacteristic() > 0 ){
-
+  if ( getCharacteristic() > 0 )
+  {
     // First look for extension!
     IntList degreelist;
@@ -1077 +1112 @@
         vminpoly= rootOf(MIPO);
       }
-      Factorlist= alg_factor(f, Astar, vminpoly, oldord, as);
+      Factorlist= alg_factor(f, Astar, vminpoly, oldord, as, isFunctionField);
       DEBDECLEVEL(CERR,"newfactoras");
       return Factorlist;
@@ -1097 +1132 @@
         DEBOUTLN(CERR, "degree(vminpoly)= ", degree(vminpoly));
       }
-      Factorlist= alg_factor(f, Astar, vminpoly, oldord, as);
+      Factorlist= alg_factor(f, Astar, vminpoly, oldord, as, isFunctionField);
       DEBDECLEVEL(CERR,"newfactoras");
       return Factorlist;
@@ -1105 +1140 @@
     DEBOUTMSG(CERR, "Char=0! Apply Trager!");
     Variable vminpoly;
-    Factorlist= alg_factor(f, Astar, vminpoly, oldord, as);
+    Factorlist= alg_factor(f, Astar, vminpoly, oldord, as, isFunctionField);
       DEBDECLEVEL(CERR,"newfactoras");
       return Factorlist;
@@ -1117 +1152 @@
 newcfactor(const CanonicalForm & f, const CFList & as, int & success )
 {
-  Off(SW_RATIONAL);
-  CFFList Output, output, Factors=Factorize(f);
-  On(SW_RATIONAL);
-  Factors.removeFirst();
-
-  if ( as.length() == 0 ){ success=1; return Factors;}
-  if ( cls(f) <= cls(as.getLast()) ) { success=1; return Factors;}
+  On (SW_RATIONAL);
+  CFFList Output, output, Factors= factorize(f);
+  if (Factors.getFirst().factor().inCoeffDomain())
+    Factors.removeFirst();
+
+  if ( as.length() == 0 )
+  {
+    success=1;
+    return Factors;
+  }
+  if ( cls(f) <= cls(as.getLast()) )
+  {
+    success=1;
+    return Factors;
+  }
 
   success=1;