Changeset 3a143d in git

Timestamp:

Jul 2, 1999, 4:28:53 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

1ce62fa5979699f05bc8ccbc453b8bfdafd92c1c

Parents:

5ec0264649e3318cb84ecd5ffd7c5a2296539b5a

Message:

*hannes/wenk: nPower for complex


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

Location:

Singular

Files:

• gnumpc.cc (modified) (3 diffs)
• gnumpfl.cc (modified) (3 diffs)
• mpr_complex.cc (modified) (2 diffs)

Singular/gnumpc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpc.cc,v 1.3 1999-06-29 09:03:42 wenk Exp $ */
+/* $Id: gnumpc.cc,v 1.4 1999-07-02 14:28:51 Singular Exp $ */
 /*
 * ABSTRACT: computations with GMP complex floating-point numbers
@@ -74 +74 @@
 void ngcNew (number * r)
 {
-  *r= NULL;
+  gmp_complex* n= new gmp_complex( );
+  *r=(number)n;
 }
 
@@ -250 +251 @@
   if ( exp == 0 )
   {
-    *(gmp_complex*)u= (gmp_complex)1.0;
+    gmp_complex* n = new gmp_complex(1);
+    *u=(number)n; 
     return;
   }
   if ( exp == 1 )
   {
+    nNew(u);
     if ( x == NULL )
     {
-      *(gmp_complex*)u= (gmp_complex)0.0;
+      gmp_complex* n = new gmp_complex();
+      *u=(number)n; 
     }
     else
     {
-      *(gmp_complex*)u= *(gmp_complex*)x;
+      gmp_complex* n = new gmp_complex();
+      *n= *(gmp_complex*)x;
+      *u=(number)n; 
     }
     return;
   }
   ngcPower(x,exp-1,u);
-  *(gmp_complex*)u*= *(gmp_complex*)x;
+  gmp_complex *n=new gmp_complex();
+  *n=*(gmp_complex*)x;
+  *(gmp_complex*)(*u) *= *(gmp_complex*)n;
+  delete n;
 }
 

Singular/gnumpfl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpfl.cc,v 1.4 1999-06-23 08:26:43 wenk Exp $ */
+/* $Id: gnumpfl.cc,v 1.5 1999-07-02 14:28:52 Singular Exp $ */
 /*
 * ABSTRACT: computations with GMP floating-point numbers
@@ -241 +241 @@
 {
   if ( exp == 0 )
-  {
+  { 
+    nNew(u);
     *(gmp_float*)u= (gmp_float)1.0;
     return;
@@ -247 +248 @@
   if ( exp == 1 )
   {
+    nNew(u);
     if ( x == NULL )
     {

Singular/mpr_complex.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_complex.cc,v 1.8 1999-06-28 16:06:26 Singular Exp $ */
+/* $Id: mpr_complex.cc,v 1.9 1999-07-02 14:28:53 Singular Exp $ */
 
 /*
@@ -509 +509 @@
     if (rField_is_long_C())
     {
-      out=(char*)AllocL((strlen(in_real)+strlen(in_imag)+5+strlen(currRing->parameter[0]))*sizeof(char));
+      int len=(strlen(in_real)+strlen(in_imag)+5+strlen(currRing->parameter[0]))*sizeof(char);
+      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);
     }
     else
     {
-      out=(char*)AllocL( (strlen(in_real)+strlen(in_imag)+8) * sizeof(char));
+      int len=(strlen(in_real)+strlen(in_imag)+8) * sizeof(char);
+      out=(char*)AllocL( len );
+      memset(out,0,len);
       sprintf(out,"%s%s%s",in_real,c.imag().sign()>=0?" + I ":" - I ",in_imag);
     }