Changeset e89e56 in git for libfac/charset

Timestamp:

Mar 17, 2008, 6:44:17 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

85194f264939ff85dd7731d524a483b21f35f5ac

Parents:

ca847b0e390392983ef3461c16980b5defee8e0c

Message:

*hannes: fact.tst


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

Location:

libfac/charset

Files:

• alg_factor.cc (modified) (11 diffs)
• algfactor.cc (modified) (2 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.20 2008-02-22 12:16:02 Singular Exp $";
+static char * rcsid = "$Id: alg_factor.cc,v 1.21 2008-03-17 17:44:15 Singular Exp $";
 ////////////////////////////////////////////////////////////
 // FACTORY - Includes
@@ -94 +94 @@
   else { l = 1; }
   d= dr-dv+1;
-  while ( ( dv <= dr  ) && ( !r.isZero()) )
-  {
+  while ( ( dv <= dr  ) && ( r != r.genZero()) ){
     test = power(x,dr-dv)*v*LC(r,x);
     if ( dr == 0 ) { r= CanonicalForm(0); }
@@ -142 +141 @@
 
   h = CanonicalForm(1);
-  while ( !G.isZero() )
-  {
+  while ( G != G.genZero() ) {
      delta= degree(F,v) -degree(G,v);
      beta = power(CanonicalForm(-1), delta+1) * LC(F,v)* power(h, delta);
@@ -196 +194 @@
       temp= gcd(R, R.deriv(vf));
       DEBOUTLN(CERR, "sqrf_norm_sub: temp= ", temp);
-      if (degree(temp,vf) != 0 || temp.isZero() ){ sqfreetest= 0; }
+      if (degree(temp,vf) != 0 || temp == temp.genZero() ){ sqfreetest= 0; }
       else { sqfreetest= 1; }
       DEBOUTLN(CERR, "sqrf_norm_sub: sqfreetest= ", sqfreetest);
     }
     else{
-      DEBOUTMSG(CERR, "Starting isSqrFree(R)!");
-      // Look at isSqrFree!
+      DEBOUTMSG(CERR, "Starting SqrFreeTest(R)!");
+      // Look at SqrFreeTest!
       // (z+a^5+w)^4 with z<w<a should not give sqfreetest=1 !
       // for now we use this workaround with Factorize...
@@ -221 +219 @@
       for ( i=testlist; i.hasItem(); i++)
         if ( i.getItem().exp() > 1 && degree(i.getItem().factor(), R.mvar()) > 0) { sqfreetest=0; break; }
-      DEBOUTLN(CERR, "isSqrFree(R)= ", sqfreetest);
+      DEBOUTLN(CERR, "SqrFreeTest(R)= ", sqfreetest);
     }
     if ( ! sqfreetest ){
@@ -261 +259 @@
       temp= gcd(R, R.deriv(vf));
       DEBOUTLN(CERR, "sqrf_norm_sub: temp= ", temp);
-      if (degree(temp,vf) != 0 || temp.isZero() ){ sqfreetest= 0; }
+      if (degree(temp,vf) != 0 || temp == temp.genZero() ){ sqfreetest= 0; }
       else { sqfreetest= 1; }
       DEBOUTLN(CERR, "sqrf_norm_sub: sqfreetest= ", sqfreetest);
     }
     else{
-      DEBOUTMSG(CERR, "Starting isSqrFree(R)!");
-      // Look at isSqrFree!
+      DEBOUTMSG(CERR, "Starting SqrFreeTest(R)!");
+      // Look at SqrFreeTest!
       // (z+a^5+w)^4 with z<w<a should not give sqfreetest=1 !
       // for now we use this workaround with Factorize...
@@ -286 +284 @@
       for ( i=testlist; i.hasItem(); i++)
         if ( i.getItem().exp() > 1 && degree(i.getItem().factor(), R.mvar()) > 0) { sqfreetest=0; break; }
-      DEBOUTLN(CERR, "isSqrFree(R)= ", sqfreetest);
+      DEBOUTLN(CERR, "SqrFreeTest(R)= ", sqfreetest);
     }
     if ( ! sqfreetest ){
@@ -357 +355 @@
 
   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().isZero() ) return Counter;
+    if ( elem.deriv() == elem.genZero() ) return Counter;
     else Counter += 1;
   }
@@ -757 +754 @@
     Fgcd= pp(Fgcd); Ggcd= pp(Ggcd);
     DEBDECLEVEL(CERR,"newfactoras");
-    return UnionCFFL(newfactoras(Fgcd,as,success) , newfactoras(Ggcd,as,success));
+    return myUnion(newfactoras(Fgcd,as,success) , newfactoras(Ggcd,as,success));
   }
   if ( getCharacteristic() > 0 ){
@@ -826 +823 @@
     output=newfactoras(i.getItem().factor(),as, success);
     for ( CFFListIterator j=output; j.hasItem(); j++)
-      Output = appendCFFL(Output,CFFactor(j.getItem().factor(),j.getItem().exp()*i.getItem().exp()));
+      Output = myappend(Output,CFFactor(j.getItem().factor(),j.getItem().exp()*i.getItem().exp()));
   }
   return Output;
@@ -833 +830 @@
 /*
 $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
-
 Revision 1.17  2007/05/15 14:46:48  Singular
 *hannes: factorize in Zp(a)[x...]

libfac/charset/algfactor.cc

@@ -3 +3 @@
 // emacs edit mode for this file is -*- C++ -*-
 ////////////////////////////////////////////////////////////
-static char * rcsid = "$Id: algfactor.cc,v 1.9 2008-01-22 09:51:37 Singular Exp $";
+static char * rcsid = "$Id: algfactor.cc,v 1.10 2008-03-17 17:44:16 Singular Exp $";
 ////////////////////////////////////////////////////////////
 // FACTORY - Includes
@@ -429 +429 @@
     success= min(success,csuccess);
     for ( CFFListIterator j=CERR; j.hasItem(); j++)
-      Output = appendCFFL(Output,CFFactor(j.getItem().factor(),j.getItem().exp()*i.getItem().exp()));
+      Output = myappend(Output,CFFactor(j.getItem().factor(),j.getItem().exp()*i.getItem().exp()));
   }
   return Output;