Changeset 574650 in git for factory/libfac/charset/alg_factor.cc

Timestamp:

Mar 12, 2014, 2:05:02 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

ea0a9dfbfc8e8cda45b109756bdf6380f6d26c3d

Parents:

115a9a7ad94ec1b8b7411e434ab5de5027c3d68e

git-author:

Martin Lee <martinlee84@web.de>2014-03-12 14:05:02+01:00

git-committer:

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

Message:

chg: better recovery of factors

File:

• factory/libfac/charset/alg_factor.cc (modified) (1 diff)

factory/libfac/charset/alg_factor.cc

@@ -821 +821 @@
   else
   {
+    g= f;
     DEBOUTLN(CERR, "alg_factor: g= ", g);
-    CanonicalForm gnew= g(s,s.mvar());
-    DEBOUTLN(CERR, "alg_factor: gnew= ", gnew);
-    g=gnew;
     for ( CFFListIterator i=Factorlist; i.hasItem(); i++)
     {
       CanonicalForm fnew=i.getItem().factor();
-      fnew= fnew(s,s.mvar());
+      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);
+      }
+
       DEBOUTLN(CERR, "alg_factor: fnew= ", fnew);
-      DEBOUTLN(CERR, "alg_factor: substlist= ", substlist);
-      for ( CFListIterator ii=substlist; ii.hasItem(); ii++){
-        DEBOUTLN(CERR, "alg_factor: item= ", ii.getItem());
-        fnew= fnew(ii.getItem(), ii.getItem().mvar());
-        DEBOUTLN(CERR, "alg_factor: fnew= ", fnew);
-      }
-      if (degree(i.getItem().factor()) > 0 )
+
+      h= alg_gcd (g, fnew, Rstarlist);
+      QuasiInverse(Rstar, LC(h), numt, Rstar.mvar());
+      dent= 1;
+      h *= numt;
+      h= Prem (h, Rstarlist);
+      h /= vcontent (h, Rstar.mvar());
+
+      if (h.level() >= Rstar.level())
       {
-          h=alg_gcd(g,fnew,as);
-        DEBOUTLN(CERR, "  alg_factor: h= ", h);
-        DEBOUTLN(CERR, "  alg_factor: oldord= ", oldord);
-        if ( degree(h) > 0 )
-        { //otherwise it's a constant
-          g= divide(g, h,as);
-          DEBOUTLN(CERR, "alg_factor: g/h= ", g);
-          DEBOUTLN(CERR, "alg_factor: s= ", s);
-          DEBOUTLN(CERR, "alg_factor: substlist= ", substlist);
-          //out_cf("new g:",g,"\n");
-          L.append(CFFactor(h,1));
-        }
-        //else printf("degree <=1\n");
+        g= divide (g, h, Rstarlist);
+        h= Prem (h, as);
+        h *= bCommonDen (h);
+        h /= vcontent (h, as.getFirst().mvar());
+        L.append (CFFactor (h, 1));
       }
     }