Changeset baa707d in git for Singular/mpr_complex.cc

Timestamp:

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

Author:

Moritz Wenk <wenk@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

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

File:

• Singular/mpr_complex.cc (modified) (9 diffs)

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;
 }