Changeset 0e760d0 in git

Timestamp:

Jul 2, 1999, 6:14:41 PM (25 years ago)

Author:

Moritz Wenk <wenk@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bad4044b17c2db928e269ccf80888ade701dae6c

Parents:

78315991a696a660dd3d43059499d754ccf8c669

Message:

* wenk: did some changes in floatToStr; removed TIMING


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

Location:

Singular

Files:

• LIB/solve.lib (modified) (3 diffs)
• gnumpc.cc (modified) (4 diffs)
• gnumpfl.cc (modified) (4 diffs)
• mpr_complex.cc (modified) (2 diffs)
• mpr_global.h (modified) (2 diffs)

Singular/LIB/solve.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-version="$Id: solve.lib,v 1.6 1999-07-02 14:33:45 wenk Exp $";
+version="$Id: solve.lib,v 1.7 1999-07-02 16:14:41 wenk Exp $";
 info="
 LIBRARY: solve.lib     PROCEDURES TO SOLVE POLYNOMIAL SYSTEMS
@@ -83 +83 @@
   // now with complex coefficient field, precision is 10 digits 
   ring rsc= (real,10,I),(x,y),lp;
-  ideal i = x2 + y2 - 8, x2 + xy + 2y2;
+  ideal i = (2+3*I)*x2 + (0.35+I*45.0e-2)*y2 - 8, x2 + xy + (42.7)*y2;
   ures_solve(i);
   // result is a list of (x,y)-coordinates of complex numbers
@@ -146 +146 @@
   // Now with complex coefficients, precision is 20 digits:
   ring rsc= (real,20,I),x,lp;
-  poly f = (15+I*5)*x^5 + (0.25+I*2)*x^3 + x2 - 10*I;
+  poly f = (15.4+I*5)*x^5 + (25.0e-2+I*2)*x^3 + x2 - 10*I;
   list l = laguerre_solve(f);
   l;

Singular/gnumpc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpc.cc,v 1.4 1999-07-02 14:28:51 Singular Exp $ */
+/* $Id: gnumpc.cc,v 1.5 1999-07-02 16:14:38 wenk Exp $ */
 /*
 * ABSTRACT: computations with GMP complex floating-point numbers
@@ -285 +285 @@
 
 /*2
-* za >= 0 ?
+* za >= 0 ? ( real() > 0 || imag() > 0 )
 */
 BOOLEAN ngcGreaterZero (number a)
 {
-  return TRUE;
+  if ( a == NULL ) return TRUE;
+  return ( ((gmp_complex*)a)->real().sign() > 0 || ((gmp_complex*)a)->imag().sign() > 0 );
 }
 
@@ -330 +331 @@
 {
   if ( a == NULL ) return FALSE;
-  return (((gmp_complex*)a)->real().isOne() && ((gmp_complex*)a)->imag().isZero());
+  //return (((gmp_complex*)a)->real().isOne() && ((gmp_complex*)a)->imag().isZero());
+  return (((gmp_complex*)a)->real().isOne());
 }
 
@@ -339 +341 @@
 {
   if ( a == NULL ) return FALSE;
-  return (((gmp_complex*)a)->real().isMOne() && ((gmp_complex*)a)->imag().isZero());
+  //  return (((gmp_complex*)a)->real().isMOne() && ((gmp_complex*)a)->imag().isZero());
+  return (((gmp_complex*)a)->real().isMOne());
 }
 

Singular/gnumpfl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpfl.cc,v 1.6 1999-07-02 15:01:42 wenk Exp $ */
+/* $Id: gnumpfl.cc,v 1.7 1999-07-02 16:14:39 wenk Exp $ */
 /*
 * ABSTRACT: computations with GMP floating-point numbers
@@ -373 +373 @@
   char *start= s;
 
+  //Print("%s\n",s);
+
   s= ngfEatFloatNExp( s );
 
-  if (*s=='\0')
+  if (*s=='\0')  // 0
   {
     if ( *(gmp_float**)a == NULL ) (*(gmp_float**)a)= new gmp_float();
     (*(gmp_float**)a)->setFromStr(start);
   }
-  else if (s==start)
+  else if (s==start)  // 1
   {
     if ( *(gmp_float**)a != NULL )  delete (*(gmp_float**)a);
@@ -387 +389 @@
   else
   {
+    if ( *s == '/' ) {
+    }
     char c=*s;
     *s='\0';
@@ -393 +397 @@
     *s=c;
   }
+
+ 
+
   return s;
 }

Singular/mpr_complex.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_complex.cc,v 1.10 1999-07-02 15:01:43 wenk Exp $ */
+/* $Id: mpr_complex.cc,v 1.11 1999-07-02 16:14:40 wenk Exp $ */
 
 /*
@@ -508 +508 @@
   {
 
-      in_real=floatToStr( c.real(), oprec );         // get real part
+    in_real=floatToStr( c.real(), oprec );         // get real part
     in_imag=floatToStr( abs(c.imag()), oprec );    // get imaginary part
 
     if (rField_is_long_C())
     {
-      int len=(strlen(in_real)+strlen(in_imag)+5+strlen(currRing->parameter[0]))*sizeof(char);
+      int len=(strlen(in_real)+strlen(in_imag)+7+strlen(currRing->parameter[0]))*sizeof(char);
       out=(char*)AllocL(len);
       memset(out,0,len);
-      if (  !c.real().isZero() ) 
-        sprintf(out,"(%s%s%s*%s)",in_real,c.imag().sign()>=0?"+":"-",currRing->parameter[0],in_imag);
-      else
-        sprintf(out,"(%s%s*%s)",c.imag().sign()>=0?"":"-",currRing->parameter[0],in_imag);
+      if (  !c.real().isZero() )  // (-23-i*5.43) or (15.1+i*5.3)
+        sprintf(out,"%s(%s%s%s*%s)",(c.imag().sign()<0&&c.real().sign()<0)?"+":"",
+                in_real,c.imag().sign()>=0?"+":"-",currRing->parameter[0],in_imag);
+      else // +(-i*43) or +(i*34)
+        sprintf(out,"%s(%s%s*%s)",c.imag().sign()>=0?"":"+",
+                c.imag().sign()>=0?"":"-",currRing->parameter[0],in_imag);
     }
     else
     {
-      int len=(strlen(in_real)+strlen(in_imag)+8) * sizeof(char);
+      int len=(strlen(in_real)+strlen(in_imag)+9) * sizeof(char);
       out=(char*)AllocL( len );
       memset(out,0,len);
       if (  !c.real().isZero() ) 
-        sprintf(out,"(%s%s%s)",in_real,c.imag().sign()>=0?"+I*":"-I*",in_imag);
+        sprintf(out,"%s(%s%s%s)",(c.imag().sign()<0&&c.real().sign()<0)?"+":"",
+                in_real,c.imag().sign()>=0?"+I*":"-I*",in_imag);
       else
-        sprintf(out,"(%s%s)",c.imag().sign()>=0?"I*":"-I*",in_imag);
+        sprintf(out,"%s(%s%s)",c.imag().sign()>=0?"":"+",
+                c.imag().sign()>=0?"I*":"-I*",in_imag);
     }
     FreeL( (ADDRESS) in_real );

Singular/mpr_global.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_global.h,v 1.4 1999-06-28 16:06:27 Singular Exp $ */
+/* $Id: mpr_global.h,v 1.5 1999-07-02 16:14:41 wenk Exp $ */
 
 /*
@@ -12 +12 @@
 
 // to get detailed timigs, define MPR_TIMING
-#define MPR_TIMING
+//#define MPR_TIMING
 
 // Set to double or long double. double is recomended.