Changeset 8e0cdf in git

Timestamp:

Mar 18, 2008, 11:12:21 AM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

632ebaadeab150457fe8f05a66d352685c6506af

Parents:

f12cd236d42ce7c576d7f5b8ea25484f5875c740

Message:

*hannes: format


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

File:

• libfac/factor/Factor.cc (modified) (9 diffs)

libfac/factor/Factor.cc

@@ -1 +1 @@
 /* Copyright 1996 Michael Messollen. All rights reserved. */
 ///////////////////////////////////////////////////////////////////////////////
-static char * rcsid = "$Id: Factor.cc,v 1.42 2008-03-17 17:44:16 Singular Exp $ ";
+static char * rcsid = "$Id: Factor.cc,v 1.43 2008-03-18 10:12:21 Singular Exp $ ";
 static char * errmsg = "\nYou found a bug!\nPlease inform (Michael Messollen) michael@math.uni-sb.de \nPlease include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -733 +733 @@
   for ( int i=1; i<=level(F); i++)
   {
-    if ( degree(f,Variable(i) ) == 1 ) 
+    if ( degree(f,Variable(i) ) == 1 )
     //test trivial case; only true iff F is primitiv w.r.t every variable; else check (if F=ax+b) gcd(a,b)=1 ?
     {
@@ -1035 +1035 @@
 static bool fdivides2(const CanonicalForm &F, const CanonicalForm &G, const CanonicalForm &minpoly)
 {
-  if (minpoly!=0)
+  if (!minpoly.isZero())
   {
   #if 0
@@ -1161 +1161 @@
     Outputlist= factorize(F);
     #else
-    if (minpoly!=0)
+    if (!minpoly.isZero())
     {
       if ( F.isHomogeneous() )
@@ -1174 +1174 @@
       {
         CFList as(minpoly);
-        CFFList sqF=sqrFree(F); // sqrFreeZ
+        //CFFList sqF=sqrFree(F); // sqrFreeZ
+        CFFList sqF=SqrFreeMV(F,minpoly);
+        if (sqF.isEmpty()) sqF=sqrFree(F);
         CFFList G,H;
         CanonicalForm fac;
@@ -1195 +1197 @@
       }
     }
-    else
+    else // minpoly==0
       Outputlist=factorize(F);
     #endif
@@ -1288 +1290 @@
   DEBOUTLN(CERR, "Outputlist is ", Outputlist);
   for ( i=Outputlist; i.hasItem(); i++ )
-    if ( level(i.getItem().factor()) > 0 ){
+    if ( level(i.getItem().factor()) > 0 )
+    {
       unit = lc(i.getItem().factor());
       if ( getNumVars(unit) == 0 ){ // a constant; possibly 1
@@ -1294 +1297 @@
         g *=power(i.getItem().factor()/unit,i.getItem().exp());
       }
-      else{
+      else
+      {
         Outputlist2.append(i.getItem());
         g *=power(i.getItem().factor(),i.getItem().exp());
@@ -1331 +1335 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.42  2008/03/17 17:44:16  Singular
+*hannes: fact.tst
+
 Revision 1.38  2008/01/07 13:34:56  Singular
 *hannes: omse optiomzations(isOne)