Changeset 9b25e7e in git for libfac/charset/alg_factor.cc

Timestamp:

Oct 24, 2002, 7:22:22 PM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

616214197b0dbd8973606076355c2d6ccde48f2f

Parents:

e44bd88b22a2439b301aba30f2adc6bb930bbefc

Message:

* hannes: factoring in alg.ext., alg_gcd, NTL stuff


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

File:

• libfac/charset/alg_factor.cc (modified) (10 diffs)

libfac/charset/alg_factor.cc

@@ -3 +3 @@
 // emacs edit mode for this file is -*- C++ -*-
 ////////////////////////////////////////////////////////////
-static char * rcsid = "$Id: alg_factor.cc,v 1.10 2002-08-19 11:11:29 Singular Exp $";
+static char * rcsid = "$Id: alg_factor.cc,v 1.11 2002-10-24 17:22:21 Singular Exp $";
 ////////////////////////////////////////////////////////////
 // FACTORY - Includes
@@ -20 +20 @@
 #include "alg_factor.h"
 
-//void out_cf(char *s1,const CanonicalForm &f,char *s2);
+void out_cf(char *s1,const CanonicalForm &f,char *s2);
 
 #ifdef ALGFACTORDEBUG
@@ -198 +198 @@
       Variable X;
       if (getAlgVar(R,X))
-      { 
+      {
         if (R.isUnivariate())
-          testlist=factorize( R, X );
-        else  
+          testlist=factorize( R, X );
+        else
           testlist= Factorize(R, X, 0);
       }
-      else 
+      else
         testlist= Factorize(R);
       DEBOUTLN(cout, "testlist= ", testlist);
@@ -369 +369 @@
     return alg_lc(f.LC());
   }
-}  
+}
 
 // the heart of the algorithm: the one from Trager
@@ -400 +400 @@
 //cout << "alg: "<< X << " mipo=" << getMipo(X,Variable('X')) <<endl;
     if (R.isUnivariate())
+    {
+      DEBOUTLN(cout, "alg_factor: factorize( ", R);
       Factorlist =  factorize( R, X );
+    }
     else
     {
@@ -407 +410 @@
       CanonicalForm mipo=getMipo(X,XX);
       CFList as(mipo);
+      DEBOUTLN(cout, "alg_factor: newfactoras( ", R);
       Factorlist = newfactoras(R, as , 1);
       #else
       // factor R over k
+      DEBOUTLN(cout, "alg_factor: Factorize( ", R);
       Factorlist = Factorize(R);
       #endif
@@ -417 +422 @@
   {
     // factor R over k
+    DEBOUTLN(cout, "alg_factor: Factorize( ", R);
     Factorlist = Factorize(R);
   }
@@ -444 +450 @@
         // undo linear transformation!!!! and then gcd!
         //cout << "algcd(" << g << "," << fnew << ",as" << as << ")" << endl;
-        //out_cf("algcd g=",g,"\n");
-        //out_cf("algcd fnew=",fnew,"\n");
+        //out_cf("algcd g=",g,"\n");
+        //out_cf("algcd fnew=",fnew,"\n");
         //h= algcd(g,fnew, as, oldord);
-        //if (as.length() >1)
+        //if (as.length() >1)
         //  h= algcd(g,fnew, as, oldord);
-        //else
-          h=alg_gcd(g,fnew,as);
-        //out_cf(" -> algcd=",algcd(g,fnew, as, oldord),"\n");
-        //out_cf(" -> alg_gcd=",alg_gcd(g,fnew,as),"\n");
+        //else
+          h=alg_gcd(g,fnew,as);
+        //out_cf(" -> algcd=",algcd(g,fnew, as, oldord),"\n");
+        //out_cf(" -> alg_gcd=",alg_gcd(g,fnew,as),"\n");
         //cout << "algcd result:" << h << endl;
         DEBOUTLN(cout, "  alg_factor: h= ", h);
@@ -647 +653 @@
   //CanonicalForm Fgcd= algcd(f,f.deriv(),Astar,gcdord);
   CanonicalForm Fgcd;
-        //if (Astar.length() >1)
+        //if (Astar.length() >1)
         //  Fgcd= algcd(f,f.deriv(),Astar,gcdord);
-        //else
-          Fgcd= alg_gcd(f,f.deriv(),Astar);
-        //out_cf("algcd:",algcd(f,f.deriv(),Astar,gcdord),"\n");
-        //out_cf("alg_gcd:",alg_gcd(f,f.deriv(),Astar),"\n");
+        //else
+          Fgcd= alg_gcd(f,f.deriv(),Astar);
+        //out_cf("algcd:",algcd(f,f.deriv(),Astar,gcdord),"\n");
+        //out_cf("alg_gcd:",alg_gcd(f,f.deriv(),Astar),"\n");
  // cout << "algcd result:"  << Fgcd << endl;
   if ( Fgcd == 0 ) DEBOUTMSG(cerr, "WARNING: p'th root ?");
@@ -738 +744 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.10  2002/08/19 11:11:29  Singular
+* hannes/pfister: alg_gcd etc.
+
 Revision 1.9  2002/07/30 15:16:19  Singular
 *hannes: fix for alg. extension