Changeset b7e838 in git

Timestamp:

Jul 3, 2007, 4:45:57 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

a3181c6c6f9d31d0bfc59b709eed83fcecba79c5

Parents:

0ea97ea490acc1915ccaedd3839aadce86cf48e1

Message:

*hannes: test division by 0


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

Location:

kernel

Files:

• ffields.cc (modified) (3 diffs)
• gnumpc.cc (modified) (3 diffs)
• gnumpfl.cc (modified) (3 diffs)
• longalg.cc (modified) (4 diffs)
• longrat.cc (modified) (6 diffs)
• modulop.cc (modified) (4 diffs)
• mpr_complex.h (modified) (5 diffs)
• numbers.cc (modified) (2 diffs)
• numbers.h (modified) (2 diffs)
• shortfl.cc (modified) (3 diffs)

kernel/ffields.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ffields.cc,v 1.3 2005-07-27 15:48:28 Singular Exp $ */
+/* $Id: ffields.cc,v 1.4 2007-07-03 14:45:56 Singular Exp $ */
 /*
 * ABSTRACT: finite fields with a none-prime number of elements (via tables)
@@ -317 +317 @@
   if ((long)b==(long)nfCharQ)
   {
-    WerrorS("div. by 0");
+    WerrorS(nDivBy0);
     return (number)((long)nfCharQ);
   }
@@ -345 +345 @@
   if ((long)c==(long)nfCharQ)
   {
-    WerrorS("div. 1/0");
+    WerrorS(nDivBy0);
     return (number)((long)nfCharQ);
   }

kernel/gnumpc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpc.cc,v 1.3 2005-05-18 15:39:19 Singular Exp $ */
+/* $Id: gnumpc.cc,v 1.4 2007-07-03 14:45:56 Singular Exp $ */
 /*
 * ABSTRACT: computations with GMP complex floating-point numbers
@@ -179 +179 @@
 number ngcInvers(number a)
 {
-  gmp_complex* r= NULL;
-  if ( (a==NULL) /*|| ((gmp_complex*)a)->isZero()*/ )
-  {
-    WerrorS("div. 1/0");
+  gmp_complex* r = NULL;
+  if ( (a==NULL)
+  || (((gmp_complex*)a)->isZero()))
+  {
+    WerrorS(nDivBy0);
   }
   else
@@ -264 +265 @@
 number ngcDiv (number a, number b)
 {
-  if ( b==NULL /*|| ((gmp_float*)b)->isZero()*/ )
+  if ( a==NULL )
+  {
+    // 0/b = 0
+    return NULL;
+  }
+  else if (( b==NULL )
+  || (((gmp_complex*)b)->isZero()))
   {
     // a/0 = error
-    WerrorS("div. 1/0");
-    return NULL;
-  }
-  else if ( a==NULL )
-  {
-    // 0/b = 0
+    WerrorS(nDivBy0);
     return NULL;
   }

kernel/gnumpfl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpfl.cc,v 1.2 2004-07-30 12:18:50 Singular Exp $ */
+/* $Id: gnumpfl.cc,v 1.3 2007-07-03 14:45:56 Singular Exp $ */
 /*
 * ABSTRACT: computations with GMP floating-point numbers
@@ -176 +176 @@
 {
   gmp_float* r= NULL;
-  if ( (a==NULL) /*|| ((gmp_float*)a)->isZero()*/ )
-  {
-    WerrorS("div. 1/0");
+  if ( (a==NULL) || ((gmp_float*)a)->isZero() )
+  {
+    WerrorS(nDivBy0);
   }
   else
@@ -259 +259 @@
 number ngfDiv (number a, number b)
 {
-  if ( b==NULL /*|| ((gmp_float*)b)->isZero()*/ )
+  if ( a==NULL )
+  {
+    // 0/b = 0
+    return NULL;
+  }
+  else if ( b==NULL || ((gmp_float*)b)->isZero() )
   {
     // a/0 = error
-    WerrorS("div. 1/0");
-    return NULL;
-  }
-  else if ( a==NULL )
-  {
-    // 0/b = 0
+    WerrorS(nDivBy0);
     return NULL;
   }

kernel/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.27 2007-05-22 13:29:48 Singular Exp $ */
+/* $Id: longalg.cc,v 1.28 2007-07-03 14:45:56 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -1232 +1232 @@
   if (b==NULL)
   {
-    WerrorS("div. by 0");
+    WerrorS(nDivBy0);
     return NULL;
   }
@@ -1265 +1265 @@
   if ((b==NULL) || (b->z==NULL))
   {
-    WerrorS("div. by 0");
+    WerrorS(nDivBy0);
     return NULL;
   }
@@ -1340 +1340 @@
   if (b==NULL)
   {
-    WerrorS("div. by 0");
+    WerrorS(nDivBy0);
     return NULL;
   }

kernel/longrat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.cc,v 1.17 2007-04-19 14:17:58 Singular Exp $ */
+/* $Id: longrat.cc,v 1.18 2007-07-03 14:45:56 Singular Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
@@ -456 +456 @@
     if (nlIsZero(a))
     {
-      WerrorS("div. 1/0");
+      WerrorS(nDivBy0);
       return INT_TO_SR(0);
     }
@@ -544 +544 @@
   if (b==INT_TO_SR(0))
   {
-    WerrorS("div. by 0");
+    WerrorS(nDivBy0);
     return INT_TO_SR(0);
   }
@@ -610 +610 @@
   if (b==INT_TO_SR(0))
   {
-    WerrorS("div. by 0");
+    WerrorS(nDivBy0);
     return INT_TO_SR(0);
   }
@@ -691 +691 @@
   if (b==INT_TO_SR(0))
   {
-    WerrorS("div. by 0");
+    WerrorS(nDivBy0);
     return INT_TO_SR(0);
   }
@@ -791 +791 @@
   if (nlIsZero(b))
   {
-    WerrorS("div. by 0");
+    WerrorS(nDivBy0);
     return INT_TO_SR(0);
   }

kernel/modulop.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: modulop.cc,v 1.8 2007-01-15 17:12:09 Singular Exp $ */
+/* $Id: modulop.cc,v 1.9 2007-07-03 14:45:56 Singular Exp $ */
 /*
 * ABSTRACT: numbers modulo p (<=32003)
@@ -172 +172 @@
   if ((long)b==0)
   {
-    WerrorS("div by 0");
+    WerrorS(nDivBy0);
     return (number)0;
   }
@@ -564 +564 @@
   else if ((long)b==0)
   {
-    WerrorS("div by 0");
+    WerrorS(nDivBy0);
     return (number)0;
   }
@@ -577 +577 @@
   if ((long)c==0)
   {
-    WerrorS("1/0");
+    WerrorS(nDivBy0);
     return (number)0;
   }

kernel/mpr_complex.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_complex.h,v 1.4 2004-07-30 12:18:50 Singular Exp $ */
+/* $Id: mpr_complex.h,v 1.5 2007-07-03 14:45:57 Singular Exp $ */
 
 /*
@@ -117 +117 @@
   inline int sign()    // t>0:+1, t==0:0, t<0:-1
   { return mpf_sgn( t ); };
-  
+
   bool isZero();  // t == 0 ?
   bool isOne();   // t == 1 ?
@@ -127 +127 @@
   inline const mpf_t *mpfp() const { return &t; };
   inline mpf_t *_mpfp() { return &t; };
-  
+
   inline operator double() { return mpf_get_d( t ); };
   inline operator double() const { return mpf_get_d( t ); };
@@ -140 +140 @@
     return 0;
   };
-#endif  
+#endif
 
 private:
@@ -226 +226 @@
   inline void imag( gmp_float val ) { i = val; }
 
+
+  inline bool isZero() { return (r.isZero() && i.isZero()); }
   void SmallToZero();
 };

kernel/numbers.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: numbers.cc,v 1.10 2007-06-20 09:39:24 wienand Exp $ */
+/* $Id: numbers.cc,v 1.11 2007-07-03 14:45:57 Singular Exp $ */
 
 /*
@@ -72 +72 @@
 /*0 implementation*/
 number nNULL; /* the 0 as constant */
-
 
 n_Procs_s *cf_root=NULL;

kernel/numbers.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: numbers.h,v 1.9 2007-06-20 09:39:24 wienand Exp $ */
+/* $Id: numbers.h,v 1.10 2007-07-03 14:45:57 Singular Exp $ */
 /*
 * ABSTRACT: interface to coefficient aritmetics
@@ -101 +101 @@
 void nSetChar(ring r);
 
+#define nDivBy0 "div by 0"
 #endif

kernel/shortfl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: shortfl.cc,v 1.2 2005-07-27 15:48:29 Singular Exp $ */
+/* $Id: shortfl.cc,v 1.3 2007-07-03 14:45:57 Singular Exp $ */
 
 /*
@@ -152 +152 @@
   if (n == 0.0)
   {
-    WerrorS("a/0");
+    WerrorS(nDivBy0);
     return nf((float)0.0).N();
   }
@@ -164 +164 @@
   if (n == 0.0)
   {
-    WerrorS("1/0");
+    WerrorS(nDivBy0);
     return nf((float)0.0).N();
   }