Changeset 6f801b in git for libfac/charset/alg_factor.cc

Timestamp:

Feb 22, 2008, 1:16:03 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

9667879f6c3f848cdfbb5c6c0e9a14ea6e130e81

Parents:

8078c8a05a777673a09af83fb19f5f3e9c1f24ff

Message:

hannes: genZero ->isZero


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

File:

• libfac/charset/alg_factor.cc (modified) (7 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.19 2008-01-25 14:19:39 Singular Exp $";
+static char * rcsid = "$Id: alg_factor.cc,v 1.20 2008-02-22 12:16:02 Singular Exp $";
 ////////////////////////////////////////////////////////////
 // FACTORY - Includes
@@ -94 +94 @@
   else { l = 1; }
   d= dr-dv+1;
-  while ( ( dv <= dr  ) && ( r != r.genZero()) ){
+  while ( ( dv <= dr  ) && ( !r.isZero()) )
+  {
     test = power(x,dr-dv)*v*LC(r,x);
     if ( dr == 0 ) { r= CanonicalForm(0); }
@@ -141 +142 @@
 
   h = CanonicalForm(1);
-  while ( G != G.genZero() ) {
+  while ( !G.isZero() )
+  {
      delta= degree(F,v) -degree(G,v);
      beta = power(CanonicalForm(-1), delta+1) * LC(F,v)* power(h, delta);
@@ -194 +196 @@
       temp= gcd(R, R.deriv(vf));
       DEBOUTLN(CERR, "sqrf_norm_sub: temp= ", temp);
-      if (degree(temp,vf) != 0 || temp == temp.genZero() ){ sqfreetest= 0; }
+      if (degree(temp,vf) != 0 || temp.isZero() ){ sqfreetest= 0; }
       else { sqfreetest= 1; }
       DEBOUTLN(CERR, "sqrf_norm_sub: sqfreetest= ", sqfreetest);
@@ -259 +261 @@
       temp= gcd(R, R.deriv(vf));
       DEBOUTLN(CERR, "sqrf_norm_sub: temp= ", temp);
-      if (degree(temp,vf) != 0 || temp == temp.genZero() ){ sqfreetest= 0; }
+      if (degree(temp,vf) != 0 || temp.isZero() ){ sqfreetest= 0; }
       else { sqfreetest= 1; }
       DEBOUTLN(CERR, "sqrf_norm_sub: sqfreetest= ", sqfreetest);
@@ -355 +357 @@
 
   if ( Astar.length() == 0 ) return 0;
-  for ( CFListIterator i=Astar; i.hasItem(); i++){
+  for ( CFListIterator i=Astar; i.hasItem(); i++)
+  {
     elem= i.getItem();
-    if ( elem.deriv() == elem.genZero() ) return Counter;
+    if ( elem.deriv().isZero() ) return Counter;
     else Counter += 1;
   }
@@ -830 +833 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.19  2008/01/25 14:19:39  Singular
+*hannes: SqrFreeTest -> isSqrFree
+
 Revision 1.18  2008/01/22 09:51:36  Singular
 *hannes: sqrFree/InternalSqrFree -> factory