Changeset 20722e4 in git

Timestamp:

Apr 28, 2006, 3:46:29 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

a285490a201ea1e883f387408479c5758aaff48f

Parents:

f45bfb991cabced656e450cbed9e85720c469e54

Message:

*hannes: better tests for 0, 1


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

Location:

libfac

Files:

• charset/csutil.cc (modified) (4 diffs)
• factor/Factor.cc (modified) (3 diffs)
• factor/SqrFree.cc (modified) (3 diffs)

libfac/charset/csutil.cc

@@ -2 +2 @@
 ////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-static char * rcsid = "$Id: csutil.cc,v 1.9 2003-05-28 11:52:52 Singular Exp $";
+static char * rcsid = "$Id: csutil.cc,v 1.10 2006-04-28 13:45:29 Singular Exp $";
 /////////////////////////////////////////////////////////////
 // FACTORY - Includes
@@ -227 +227 @@
  CanonicalForm rem=f;
 
- if ( rem!=0 ){
+ if ( !(rem.isZero()) ){
    if ( getCharacteristic() > 0 )
      return num((rem/lc(rem)));
@@ -312 +312 @@
 
   for ( CFIterator j=init; j.hasTerms(); j++ )
-    if (j.coeff() != 1 ) count += 1;
+    if (!(j.coeff().isOne()) ) count += 1;
   //  if ( init != 1 ){
   //  cout << "nopower: f is " << init << endl;
@@ -873 +873 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.9  2003/05/28 11:52:52  Singular
+*pfister/hannes: newfactoras, alg_gcd, divide (see bug_33)
+
 Revision 1.8  2002/10/24 17:22:22  Singular
 * hannes: factoring in alg.ext., alg_gcd, NTL stuff

libfac/factor/Factor.cc

@@ -1 +1 @@
 /* Copyright 1996 Michael Messollen. All rights reserved. */
 ///////////////////////////////////////////////////////////////////////////////
-static char * rcsid = "$Id: Factor.cc,v 1.21 2005-12-12 18:02:03 Singular Exp $ ";
+static char * rcsid = "$Id: Factor.cc,v 1.22 2006-04-28 13:46:29 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.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -652 +652 @@
     ffuni = mygcd(f,ff);
     TIMING_END(discr_time);
-    if ( ffuni != 1 ){ //discriminante nonzero: split poly
+    if ( !(ffuni.isOne()) ){ //discriminante nonzero: split poly
       DEBOUTLN(cout,"Nontrivial GCD of f= ", f);
       DEBOUTLN(cout,"             and @f= ", ff);
@@ -1124 +1124 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.21  2005/12/12 18:02:03  Singular
+*hannes: use sorting option in Factorize
+
 Revision 1.20  2005/12/05 15:47:32  Singular
 *hannes: is_homogeneous -> factory: isHomogeneous

libfac/factor/SqrFree.cc

@@ -2 +2 @@
 ///////////////////////////////////////////////////////////////////////////////
 // emacs edit mode for this file is -*- C++ -*-
-static char * rcsid = "$Id: SqrFree.cc,v 1.8 2002-08-19 11:11:33 Singular Exp $";
+static char * rcsid = "$Id: SqrFree.cc,v 1.9 2006-04-28 13:46:29 Singular Exp $";
 static char * errmsg = "\nYou found a bug!\nPlease inform (Michael Messollen) michael@math.uni-sb.de .\n Please include above information and your input (the ideal/polynomial and characteristic) in your bug-report.\nThank you.";
 ///////////////////////////////////////////////////////////////////////////////
@@ -387 +387 @@
       if ( i.getItem().exp() == j ) elem *= i.getItem().factor();
     }
-    if ( elem != 1 ) outputlist.append(CFFactor(elem,j));
+    if ( !(elem.isOne()) ) outputlist.append(CFFactor(elem,j));
   }
   elem=1;
@@ -403 +403 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.8  2002/08/19 11:11:33  Singular
+* hannes/pfister: alg_gcd etc.
+
 Revision 1.7  2001/08/08 14:27:38  Singular
 *hannes: Dan's HAVE_SINGULAR_ERROR