Changeset 115a9a in git for factory/libfac/charset/alg_factor.cc

Timestamp:

Mar 12, 2014, 2:03:17 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

574650d154909eac6bd00ddec8f7f5ff0828b7a7

Parents:

9565355ff47c1ec84ca7a3ba989ea81f752de054

git-author:

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

git-committer:

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

Message:

chg: use factory's factorization

File:

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

factory/libfac/charset/alg_factor.cc

@@ -800 +800 @@
   {
     // factorize R over alg.extension with X
-//CERR << "alg: "<< X << " mipo=" << getMipo(X,Variable('X')) <<"\n";
-    if (R.isUnivariate())
-    {
-      DEBOUTLN(CERR, "alg_factor: factorize( ", R);
-      Factorlist =  factorize( R, X );
-    }
-    else
-    {
-      #if 1
-      Variable XX;
-      CanonicalForm mipo=getMipo(X,XX);
-      CFList as(mipo);
-      DEBOUTLN(CERR, "alg_factor: newfactoras( ", R);
-      int success=1;
-      Factorlist = newfactoras(R, as , success);
-      #else
-      // factor R over k
-      DEBOUTLN(CERR, "alg_factor: Factorize( ", R);
-      Factorlist = Factorize(R);
-      #endif
-    }
+    //CERR << "alg: "<< X << " mipo=" << getMipo(X,Variable('X')) <<"\n";
+    DEBOUTLN(CERR, "alg_factor: factorize( ", R);
+    Factorlist =  factorize( R, X );
   }
   else
@@ -826 +808 @@
     // factor R over k
     DEBOUTLN(CERR, "alg_factor: Factorize( ", R);
-    Factorlist = Factorize(R);
-  }
+    Factorlist = factorize(R);
+  }
+
   On(SW_RATIONAL);
   DEBOUTLN(CERR, "alg_factor: Factorize(R)= ", Factorlist);