Changeset fd0060 in git

Timestamp:

Apr 4, 2000, 1:20:05 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

81eeb6c60f1b1a89355bcf927c7864de32b1dacb

Parents:

e53604737a862d2d5ca1e9122fa151e45148811a

Message:

*hannes: do not use Werror unless you will report an error


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

Location:

Singular

Files:

• mpr_numeric.cc (modified) (15 diffs)
• ring.h (modified) (2 diffs)

Singular/mpr_numeric.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpr_numeric.cc,v 1.7 1999-12-02 23:03:51 wenk Exp $ */
+/* $Id: mpr_numeric.cc,v 1.8 2000-04-04 11:20:04 Singular Exp $ */
 
 /*
@@ -388 +388 @@
 //    }
 //    // warning
-//    Werror("rootContainer::getRoot: Wrong index %d, found_roots %s",i,found_roots?"true":"false");
+//    Warn("rootContainer::getRoot: Wrong index %d, found_roots %s",i,found_roots?"true":"false");
 //    gmp_complex *tmp= new gmp_complex();
 //    return *tmp;
@@ -398 +398 @@
 {
   if (! ((i >= 0) && (i < anz+2) ) )
-    WerrorS("rootContainer::evPointCoord: index out of range");
+    WarnS("rootContainer::evPointCoord: index out of range");
   if (ievpoint == NULL)
-    WerrorS("rootContainer::evPointCoord: ievpoint == NULL");
+    WarnS("rootContainer::evPointCoord: ievpoint == NULL");
 
   if ( (rt == cspecialmu) && found_roots ) {  // FIX ME
@@ -411 +411 @@
     else
     {
-      Werror("rootContainer::evPointCoord: NULL index %d",i);
+      Warn("rootContainer::evPointCoord: NULL index %d",i);
     }
   }
 
   // warning
-  Werror("rootContainer::evPointCoord: Wrong index %d, found_roots %s",i,found_roots?"true":"false");
+  Warn("rootContainer::evPointCoord: Wrong index %d, found_roots %s",i,found_roots?"true":"false");
   gmp_complex *tmp= new gmp_complex();
   return *tmp;
@@ -437 +437 @@
 
   // warning
-  Werror(" rootContainer::changeRoots: Wrong index %d, %d",from,to);
+  Warn(" rootContainer::changeRoots: Wrong index %d, %d",from,to);
   return false;
 }
@@ -467 +467 @@
     if (!found_roots)
     {
-      WerrorS("rootContainer::solver: No roots found!");
+      WarnS("rootContainer::solver: No roots found!");
       goto solverend;
     }
@@ -480 +480 @@
     if (!found_roots)
     {
-      WerrorS("rootContainer::solver: No roots found!");
+      WarnS("rootContainer::solver: No roots found!");
       goto solverend;
     }
     break;
   default:
-    Werror("rootContainer::solver: Unsupported polish mode %d! Valid are [0,1,2].",polishmode);
+    Warn("rootContainer::solver: Unsupported polish mode %d! Valid are [0,1,2].",polishmode);
     found_roots= false;
   } // switch
@@ -517 +517 @@
     mprSTICKYPROT(ST_ROOTS_LGSTEP);
     if ( its > MAXIT ) {  // error
-      WerrorS("rootContainer::laguer_driver: To many iterations!");
+      WarnS("rootContainer::laguer_driver: To many iterations!");
       ret= false;
       goto theend;
@@ -548 +548 @@
       if ( its > MAXIT )
       {  // error
-        WerrorS("rootContainer::laguer_driver: To many iterations!");
+        WarnS("rootContainer::laguer_driver: To many iterations!");
         ret= false;
         goto theend;
@@ -718 +718 @@
       if ( !found )
       {
-        Werror("rootArranger::arrange: No match? coord %d, root %d.",xkoord,r);
+        Warn("rootArranger::arrange: No match? coord %d, root %d.",xkoord,r);
 #ifdef mprDEBUG_PROT
-        WerrorS("One of these ...");
+        WarnS("One of these ...");
         for ( rtest= r; rtest < anzr; rtest++ )
         {
@@ -729 +729 @@
           }
           tmp-= (*roots[xk])[rtest] * mu[xkoord]->evPointCoord(xk+1); // xkoord+2
-          Werror("  %s",complexToStr(tmp,gmp_output_digits+1),rtest);
+          Warn("  %s",complexToStr(tmp,gmp_output_digits+1),rtest);
         }
-        WerrorS(" ... must match to one of these:");
+        WarnS(" ... must match to one of these:");
         for ( mtest= 0; mtest < anzr; mtest++ )
         {
-          Werror("                  %s",complexToStr((*mu[xkoord])[mtest],gmp_output_digits+1));
+          Warn("                  %s",complexToStr((*mu[xkoord])[mtest],gmp_output_digits+1));
         }
 #endif
@@ -850 +850 @@
   int i,j;
 //    if ( MATROWS( m ) > LiPM_rows ||  MATCOLS( m ) > LiPM_cols ) {
-//      WerrorS("");
+//      WarnS("");
 //      return FALSE;
 //    }
@@ -879 +879 @@
   int i,j;
 //    if ( MATROWS( m ) < LiPM_rows-3 ||  MATCOLS( m ) < LiPM_cols-2 ) {
-//      WerrorS("");
+//      WarnS("");
 //      return NULL;
 //    }
@@ -939 +939 @@
   {
     // error: bad input
-    error(WerrorS("simplex::compute: Bad input constraint counts!");)
+    error(WarnS("simplex::compute: Bad input constraint counts!");)
     icase=-2;
     return;
@@ -956 +956 @@
     {
       // error: bad input
-      error(WerrorS("simplex::compute: Bad input tableau!");)
-      error(Werror("simplex::compute: in input Matrix row %d, column 1, value %f",i+1,LiPM[i+1][1]);)
+      error(WarnS("simplex::compute: Bad input tableau!");)
+      error(Warn("simplex::compute: in input Matrix row %d, column 1, value %f",i+1,LiPM[i+1][1]);)
       icase=-2;
       // free mem l1,l2,l3;

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.46 2000-01-26 18:10:54 Singular Exp $ */
+/* $Id: ring.h,v 1.47 2000-04-04 11:20:05 Singular Exp $ */
 
 /* includes */
@@ -121 +121 @@
 
 inline BOOLEAN rField_has_simple_inverse(ring r=currRing)
-{ return (r->ch>1) || (r->ch== -1); } /* Z/p, GF(p,n), R, long_R, long_C*/
+/* { return (r->ch>1) || (r->ch== -1); } /* Z/p, GF(p,n), R, long_R, long_C*/
+{ return (r->ch>1) || ((r->ch== -1) && (r->ch_flags < 10)); } /* Z/p, GF(p,n), R, long_R, long_C*/
 
 inline BOOLEAN rField_has_simple_Alloc(ring r=currRing)