Changeset 49698f3 in git for kernel/mpr_numeric.cc

Timestamp:

Aug 26, 2005, 2:33:27 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

695341870a0657f232d330f471725e6277fc18da

Parents:

8cb9f91e38f2b181552eeac6cf64763409e7c918

Message:

*hannes: automatic adjust precision(rootArranger::arrange)


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

File:

• kernel/mpr_numeric.cc (modified) (4 diffs)

kernel/mpr_numeric.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpr_numeric.cc,v 1.5 2005-08-23 09:11:08 Singular Exp $ */
+/* $Id: mpr_numeric.cc,v 1.6 2005-08-26 12:33:27 Singular Exp $ */
 
 /*
@@ -896 +896 @@
   bool found;
   //gmp_complex mprec(1.0/pow(10,gmp_output_digits-5),1.0/pow(10,gmp_output_digits-5));
-  gmp_float mprec(1.0/pow(10.0,(int)(gmp_output_digits/3)));
 
   for ( xkoord= 0; xkoord < anzm; xkoord++ ) {    // für x1,x2, x1,x2,x3, x1,x2,...,xn
+    gmp_float mprec(1.0/pow(10.0,(int)(gmp_output_digits/3)));
     for ( r= 0; r < anzr; r++ ) {                 // für jede Nullstelle
       // (x1-koordinate) * evp[1] + (x2-koordinate) * evp[2] +
@@ -908 +908 @@
       }
       found= false;
-      for ( rtest= r; rtest < anzr; rtest++ ) {   // für jede Nullstelle
-        zwerg = tmp - (*roots[xk])[rtest] * mu[xkoord]->evPointCoord(xk+1); // xk+1, xkoord+2
-        for ( mtest= 0; mtest < anzr; mtest++ )
+      do { // while not found
+        for ( rtest= r; rtest < anzr; rtest++ ) {   // für jede Nullstelle
+           zwerg = tmp - (*roots[xk])[rtest] * mu[xkoord]->evPointCoord(xk+1); // xk+1, xkoord+2
+          for ( mtest= 0; mtest < anzr; mtest++ )
+          {
+            //          if ( tmp == (*mu[xkoord])[mtest] )
+            //          {
+            if ( ((zwerg.real() <= (*mu[xkoord])[mtest].real() + mprec) &&
+                  (zwerg.real() >= (*mu[xkoord])[mtest].real() - mprec)) &&
+                 ((zwerg.imag() <= (*mu[xkoord])[mtest].imag() + mprec) &&
+                  (zwerg.imag() >= (*mu[xkoord])[mtest].imag() - mprec)) )
+            {
+              roots[xk]->swapRoots( r, rtest );
+              found= true;
+              break;
+            }
+          }
+        } // rtest
+        if (!found) 
         {
-          //          if ( tmp == (*mu[xkoord])[mtest] )
-          //          {
-          if ( ((zwerg.real() <= (*mu[xkoord])[mtest].real() + mprec) &&
-                (zwerg.real() >= (*mu[xkoord])[mtest].real() - mprec)) &&
-               ((zwerg.imag() <= (*mu[xkoord])[mtest].imag() + mprec) &&
-                (zwerg.imag() >= (*mu[xkoord])[mtest].imag() - mprec)) )
-           {
-             roots[xk]->swapRoots( r, rtest );
-             found= true;
-             break;
-           }
-        }
-      } // rtest
+          WarnS("rootArranger::arrange: precision lost");
+          mprec*=10;
+        }
+      } while(!found);
+#if 0
       if ( !found )
       {
         Warn("rootArranger::arrange: No match? coord %d, root %d.",xkoord,r);
-#ifdef mprDEBUG_PROT
+//#ifdef mprDEBUG_PROT
         WarnS("One of these ...");
         for ( rtest= r; rtest < anzr; rtest++ )
@@ -945 +953 @@
           Warn("                  %s",complexToStr((*mu[xkoord])[mtest],gmp_output_digits+1));
         }
-#endif
-      }
+//#endif
+      }
+#endif      
     } // r
   } // xkoord