Changeset baa707d in git

Timestamp:

Jul 2, 1999, 5:01:43 PM (24 years ago)

Author:

Moritz Wenk <wenk@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

78315991a696a660dd3d43059499d754ccf8c669

Parents:

1ce62fa5979699f05bc8ccbc453b8bfdafd92c1c

Message:

*wenk: fixed ngfRead and complex number output


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

Location:

Singular

Files:

• gnumpfl.cc (modified) (5 diffs)
• mpr_complex.cc (modified) (9 diffs)

Singular/gnumpfl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpfl.cc,v 1.5 1999-07-02 14:28:52 Singular Exp $ */
+/* $Id: gnumpfl.cc,v 1.6 1999-07-02 15:01:42 wenk Exp $ */
 /*
 * ABSTRACT: computations with GMP floating-point numbers
@@ -242 +242 @@
   if ( exp == 0 )
   { 
-    nNew(u);
-    *(gmp_float*)u= (gmp_float)1.0;
+    gmp_float* n = new gmp_float(1);
+    *u=(number)n; 
     return;
   }
@@ -251 +251 @@
     if ( x == NULL )
     {
-      *(gmp_float*)(*u) = (gmp_float)0.0;
+      gmp_float* n = new gmp_float();
+      *u=(number)n;
     }
     else
     {
-      *(gmp_float*)(*u) = *(gmp_float*)x;
+      gmp_float* n = new gmp_float();
+      *n= *(gmp_float*)x;
+      *u=(number)n; 
     }
     return;
@@ -262 +265 @@
   ngfPower(x,exp-1,u);
 
-  *(gmp_float*)(*u) *= *(gmp_float*)x;
+  gmp_float *n=new gmp_float();
+  *n=*(gmp_float*)x;
+  *(gmp_float*)(*u) *= *(gmp_float*)n;
 
 }
@@ -347 +352 @@
   // eat floats (mantissa) like:
   //   0.394394993, 102.203003008,  .300303032
-  while ((*s >= '0' && *s <= '9')||(*s == '.'))
-  {
-    s++;
-  }
+  while ((*s >= '0' && *s <= '9')||(*s == '.')) s++;
+
   // eat the exponent, starts with 'e' followed by '+', '-'
-  // or no sign and digits, like:
-  //  e1322, e-202, e+393
-  if ( (s != start) && (*s == 'e') )
-  {
-    s++;
-    if ( (*s=='-') || (*s=='+') ) s++;
-    while ((*s >= '0' && *s <= '9'))
-    {
-      s++;
-    }
+  // and digits, like:
+  //   e-202, e+393
+  if ( (s != start) && (*s == 'e') && ((*(s+1) == '+') || (*(s+1) == '-')) )
+  {
+    s=s+2; // eat e and sign
+    while ((*s >= '0' && *s <= '9')) s++;
   }
 

Singular/mpr_complex.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_complex.cc,v 1.9 1999-07-02 14:28:53 Singular Exp $ */
+/* $Id: mpr_complex.cc,v 1.10 1999-07-02 15:01:43 wenk Exp $ */
 
 /*
@@ -278 +278 @@
   if ( strlen(in) == 0 )
   {
-    *size= 2*sizeof(char)+10;
+    *size= 2*sizeof(char);
     out= (char*)AllocL( *size );
     strcpy(out,"0");
@@ -291 +291 @@
       int eexponent= (exponent >= 0) ? 0 : -exponent;
       int eeexponent= (exponent >= 0) ? exponent : 0;
-      *size= (strlen(in)+5+eexponent) * sizeof(char) + 10;
+      *size= (strlen(in)+15+eexponent) * sizeof(char);
       out= (char*)AllocL(*size);
-      memset(out,'\0',*size);
+      memset(out,0,*size);
 
       strcpy(out,csign);
@@ -311 +311 @@
     else if ( exponent+sign > (int)strlen(in) )
     {
-      *size= (strlen(in)+exponent+2)*sizeof(char)+10;
+      *size= (strlen(in)+exponent+12)*sizeof(char);
       out= (char*)AllocL(*size);
+      memset(out,0,*size);
       sprintf(out,"%s%s",csign,in+sign);
       memset(out+strlen(out),'0',exponent-strlen(in)+sign);
@@ -320 +321 @@
       *size= (strlen(in)+2) * sizeof(char) + 10;
       out= (char*)AllocL(*size);
+      memset(out,0,*size);
       sprintf(out,"%s%s",csign,in+sign);
     }
@@ -335 +337 @@
       *size= (strlen(in)+12+c) * sizeof(char) + 10;
       out= (char*)AllocL(*size);
+      memset(out,0,*size);
       sprintf(out,"%s0.%se%d",csign,in+sign,(unsigned int)exponent);
 //      }
@@ -504 +507 @@
   if ( !c.imag().isZero() )
   {
-    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
 
@@ -512 +516 @@
       out=(char*)AllocL(len);
       memset(out,0,len);
-      sprintf(out,"%s%s%s*%s",in_real,c.imag().sign()>=0?"+":"-",currRing->parameter[0],in_imag);
+      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);
     }
     else
@@ -519 +526 @@
       out=(char*)AllocL( len );
       memset(out,0,len);
-      sprintf(out,"%s%s%s",in_real,c.imag().sign()>=0?" + I ":" - I ",in_imag);
+      if (  !c.real().isZero() ) 
+        sprintf(out,"(%s%s%s)",in_real,c.imag().sign()>=0?"+I*":"-I*",in_imag);
+      else
+        sprintf(out,"(%s%s)",c.imag().sign()>=0?"I*":"-I*",in_imag);
     }
     FreeL( (ADDRESS) in_real );
     FreeL( (ADDRESS) in_imag );
   }
-  else
+  else 
   {
     out= floatToStr( c.real(), oprec );
   }
+
   return out;
 }