Changeset 405ebc in git for libfac/charset/algfactor.cc

Timestamp:

Jun 27, 2001, 3:58:06 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

409020f4846b2e67e3e541d8288ef4e479652c98

Parents:

c7bbf368257aae665cbcd55c9a3d18af43aa3dc0

Message:

*hannes/GP: debug newfactoras, char_series, ...


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

File:

• libfac/charset/algfactor.cc (modified) (7 diffs)

libfac/charset/algfactor.cc

@@ -3 +3 @@
 // emacs edit mode for this file is -*- C++ -*-
 ////////////////////////////////////////////////////////////
-static char * rcsid = "$Id: algfactor.cc,v 1.4 2001-06-21 14:57:04 Singular Exp $";
+static char * rcsid = "$Id: algfactor.cc,v 1.5 2001-06-27 13:58:05 Singular Exp $";
 ////////////////////////////////////////////////////////////
 // FACTORY - Includes
@@ -28 +28 @@
 #include "timing.h"
 TIMING_DEFINE_PRINT(newfactoras_time);
+
+int hasVar(const CanonicalForm &f, const Variable &v);
 
 static CFFList
@@ -146 +148 @@
   // check trivial case:
   if ( degree(f, order.getLast())==0 || degree(g, order.getLast())==0)
+  {
+    DEBOUTLN(cout, "algcd Result= ", 1);
     return CanonicalForm(1);
-
+  }
 
   CFList bs; bs.append(f); bs.append(g);
@@ -163 +167 @@
   {
     result= cs.getLast();
-    result/=result.Lc();
+    CanonicalForm c=vcontent(result,Variable(1));
+    //CanonicalForm c=result.Lc();
+    result/=c;
+    for(CFListIterator i=as;i.hasItem(); i++ )
+    {
+      if(hasVar(result,i.getItem().mvar()))
+      {
+        c=vcontent(result,Variable(i.getItem().level()+1));
+        result/=c;
+      }
+    }
   }
   else result= CanonicalForm(1);
-  DEBOUTLN(cout, "Result= ", result);
+  DEBOUTLN(cout, "algcd Result= ", result);
   return result;
 }
@@ -340 +354 @@
     DEBOUT(cout, ",", fp(substback,vf));
     DEBOUT(cout, ") over K_r wrt ", vf);
-    //cout << "algcd(" << g << "," << fp(substback,vf) << " as:" << as <<endl;
     fp= algcd(g,fp(substback,vf), as, oldord);
-    //cout << "algcd res:" << fp << endl;
     DEBOUTLN(cout, " = ", fp);
     if ( degree(fp,vf) > 0 ){ //otherwise it's a constant
@@ -360 +372 @@
     DEBOUT(cout, ",", fp(substback,vf));
     DEBOUT(cout, ") over K_r wrt ", vf);
-    //cout << "algcd(" << g << "," << fp(substback,vf) << " as:" << as <<endl;
     fp= algcd(g,fp(substback,vf), as, oldord);
-    //cout << "algcd res:" << fp << endl;
     DEBOUTLN(cout, " = ", fp);
     if ( degree(fp,vf) > 0 ){ //otherwise it's a constant
@@ -438 +448 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.4  2001/06/21 14:57:04  Singular
+*hannes/GP: Factorize, newfactoras, ...
+
 Revision 1.3  2001/06/18 08:44:40  pfister
 * hannes/GP/michael: factory debug, Factorize