Changeset 9b87a3 in git for libfac/factor

Timestamp:

Apr 8, 2008, 6:19:10 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

f307021ad1ffaabeac4f3f688f2140c724143680

Parents:

6ad5ce630be2eb27e4e1453cd679e97bca10deaa

Message:

*hannes: removed rcsid


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

Location:

libfac/factor

Files:

• Factor.cc (modified) (9 diffs)
• SqrFree.cc (modified) (5 diffs)
• homogfactor.cc (modified) (6 diffs)

libfac/factor/Factor.cc

@@ -1 +1 @@
 /* Copyright 1996 Michael Messollen. All rights reserved. */
 ///////////////////////////////////////////////////////////////////////////////
-/* $Id: Factor.cc,v 1.44 2008-03-18 17:46:15 Singular Exp $ */
+/* $Id: Factor.cc,v 1.45 2008-04-08 16:19:10 Singular Exp $ */
 static const char * errmsg = "\nYou found a bug!\nPlease inform singular@mathematik.uni-kl.de\nPlease include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -300 +300 @@
 #ifndef NOSTREAMIO
             CERR << "libfac: ERROR: not_monic1: case lt is a sum.\n"
-                 << rcsid << errmsg << "\n";
+                 << errmsg << "\n";
 #endif
 #endif
@@ -320 +320 @@
 #ifndef NOSTREAMIO
           CERR << "libfac: ERROR: not_monic2: case lt is a sum.\n"
-               << rcsid << errmsg << "\n";
+               << errmsg << "\n";
 #endif
 #endif
@@ -524 +524 @@
 #ifndef NOSTREAMIO
       CERR << "libfac: spezializePoly ERROR: Working over given extension-field not yet implemented!\n"
-           << rcsid << errmsg << "\n";
+           << errmsg << "\n";
 #endif
 #endif
@@ -774 +774 @@
 #ifndef NOSTREAMIO
       CERR << "libfac: Factorize: ERROR: Not able to find a valid specialization!\n"
-           << rcsid << errmsg << "\n";
+           << errmsg << "\n";
 #else
        ;
@@ -892 +892 @@
 
   DEBINCLEVEL(CERR, "Factorize");
-  DEBOUTMSG(CERR, rcsid);
   DEBOUTLN(CERR, "Called with F= ", F);
   if ( getCharacteristic() == 0 )
@@ -911 +910 @@
   // search an "optimal" main variavble
   int mv=F.level();
-  if (mv != LEVELBASE && ! F.isUnivariate() )
+  if ((mv != LEVELBASE) && (! F.isUnivariate()) )
   {
      mv=find_mvar(F);
@@ -1151 +1150 @@
 
   DEBINCLEVEL(CERR, "Factorize");
-  DEBOUTMSG(CERR, rcsid);
   DEBOUTLN(CERR, "Called with F= ", F);
   if ( getCharacteristic() == 0 )
@@ -1335 +1333 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.44  2008/03/18 17:46:15  Singular
+*hannes: gcc 4.2
+
 Revision 1.43  2008/03/18 10:12:21  Singular
 *hannes: format

libfac/factor/SqrFree.cc

@@ -2 +2 @@
 ///////////////////////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-/* $Id: SqrFree.cc,v 1.17 2008-03-18 17:46:15 Singular Exp $ */
+/* $Id: SqrFree.cc,v 1.18 2008-04-08 16:19:10 Singular Exp $ */
 static const char * errmsg = "\nYou found a bug!\nPlease inform singular@mathematik.uni-kl.de\n Please include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -200 +200 @@
 #ifndef NOSTREAMIO
   CERR << "\nlibfac: ERROR: SqrFreeTest: we should never fall trough here!\n"
-       << rcsid << errmsg << "\n";
+       << errmsg << "\n";
 #endif
 #endif
@@ -352 +352 @@
 #ifndef NOSTREAMIO
   CERR << "\nlibfac: ERROR: SqrFreed: we should never fall trough here!\n"
-       << rcsid << errmsg << "\n";
+       << errmsg << "\n";
 #endif
 #endif
@@ -370 +370 @@
 
   DEBINCLEVEL(CERR, "SqrFreeMV");
-  DEBOUTMSG(CERR, rcsid);
   DEBOUTLN(CERR,"Called with f= ", f);
 
@@ -440 +439 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.17  2008/03/18 17:46:15  Singular
+*hannes: gcc 4.2
+
 Revision 1.16  2008/03/18 10:12:59  Singular
 *hannes: typo

libfac/factor/homogfactor.cc

@@ -1 +1 @@
 /* Copyright 1997 Michael Messollen. All rights reserved. */
 ////////////////////////////////////////////////////////////
-// $Id: homogfactor.cc,v 1.9 2008-03-18 17:46:16 Singular Exp $ 
+// $Id: homogfactor.cc,v 1.10 2008-04-08 16:19:10 Singular Exp $ 
 ////////////////////////////////////////////////////////////
 // FACTORY - Includes
@@ -142 +142 @@
   DEBINCLEVEL(CERR, "HomogFactor");
   Variable xn = get_max_degree_Variable(g);
+  out_cf("HomogFactor:",g,"\n");
   int d_xn = degree(g,xn);
   CanonicalForm F = g(1,xn);
@@ -148 +149 @@
   DEBOUTLN(CERR, "d_xn=   ", d_xn);
   DEBOUTLN(CERR, "F= ", F);  
+  out_cf("HomogFactor:subst ",F,"\n");
 
   // should we do this for low degree polys g ? e.g. quadratic?
@@ -157 +159 @@
   {
      CFMap n;
-     Intermediatelist = Factorized(compress(F,n), minpoly, Mainvar);
+     if (minpoly.isZero())
+       Intermediatelist = Factorize(compress(F,n), 1);
+     else
+       Intermediatelist = Factorized(compress(F,n), minpoly, Mainvar);
      for ( j=Intermediatelist; j.hasItem(); j++ )
        Homoglist.append(CFFactor( n(j.getItem().factor()), j.getItem().exp()) );
   }
   else
-     Homoglist = Factorize2(F, minpoly);
+  {
+     if (minpoly.isZero())
+       Homoglist = factorize(F);
+     else
+       Homoglist = Factorize2(F,minpoly);
+  }
   // Now we have uncompressed factors in Homoglist
   DEBOUTLN(CERR, "F factors as: ", Homoglist);
   CFFList Unhomoglist;
   CanonicalForm unhomogelem;
-  if ((!minpoly.isZero()) &&(getCharacteristic() == 0) )
+  if ((!(minpoly.isZero())) &&(getCharacteristic() == 0) )
   {
     for ( j=Homoglist; j.hasItem(); j++ )
@@ -187 +197 @@
       unhomogelem= homogenize(j.getItem().factor(),xn);
       DEBOUTLN(CERR, "      that is ", unhomogelem);
+      out_cf("unhomogelem:",unhomogelem,"\n");
       Unhomoglist.append(CFFactor(unhomogelem,j.getItem().exp()));
       d_xn -= degree(unhomogelem,xn)*j.getItem().exp();
@@ -201 +212 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.9  2008/03/18 17:46:16  Singular
+*hannes: gcc 4.2
+
 Revision 1.8  2007/10/25 14:45:41  Singular
 *hannes: homgfactor for alg.ext of Q