Changeset 8c42949 in git

Timestamp:

Jun 23, 1999, 10:26:04 AM (24 years ago)

Author:

Moritz Wenk <wenk@…>

Branches:

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

Children:

6c4df47b1b5423a0f53e3966bbe7a5e8d3465e59

Parents:

b812717056c5c464010194aa51d1f90376dfa977

Message:

* fixed error in ngcPower


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

File:

• Singular/gnumpc.cc (modified) (25 diffs)

Singular/gnumpc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpc.cc,v 1.1 1999-05-11 15:42:38 Singular Exp $ */
+/* $Id: gnumpc.cc,v 1.2 1999-06-23 08:26:04 wenk Exp $ */
 /*
 * ABSTRACT: computations with GMP complex floating-point numbers
@@ -68 +68 @@
 number   ngcPar(int i)
 {
-  complex* n= new complex( (long)0, (long)1 );
+  gmp_complex* n= new gmp_complex( (long)0, (long)1 );
   return (number)n;
 }
@@ -82 +82 @@
 number ngcInit (int i)
 {
-  complex* n= NULL;
+  gmp_complex* n= NULL;
   if ( i != 0 )
   {
-    n= new complex( (long)i, (long)0 );
+    n= new gmp_complex( (long)i, (long)0 );
   }
   return (number)n;
@@ -96 +96 @@
 {
   if ( i == NULL ) return 0;
-  return (int)((complex*)i)->real();
+  return (int)((gmp_complex*)i)->real();
 }
 
@@ -109 +109 @@
 {
   if ( *a != NULL ) {
-    delete *(complex**)a;
+    delete *(gmp_complex**)a;
     *a=NULL;
   }
@@ -119 +119 @@
 number ngcCopy(number a)
 {
-  complex* b= NULL;
+  gmp_complex* b= NULL;
   if ( a !=  NULL )
   {
-    b= new complex( *(complex*)a );
+    b= new gmp_complex( *(gmp_complex*)a );
   }
   return (number)b;
@@ -143 +143 @@
 number ngcInvers(number a)
 {
-  complex* r= NULL;
-  if ( (a==NULL) /*|| ((complex*)a)->isZero()*/ )
+  gmp_complex* r= NULL;
+  if ( (a==NULL) /*|| ((gmp_complex*)a)->isZero()*/ )
   {
     WerrorS("div. 1/0");
@@ -150 +150 @@
   else
   {
-    r= new complex( (complex)1 / (*(complex*)a) );
+    r= new gmp_complex( (gmp_complex)1 / (*(gmp_complex*)a) );
   }
   return (number)r;
@@ -160 +160 @@
 number ngcAdd (number a, number b)
 {
-  complex* r= NULL;
+  gmp_complex* r= NULL;
   if ( a==NULL && b==NULL )
   {
@@ -167 +167 @@
   else if ( a == NULL )
   {
-    r= new complex( *(complex*)b );
+    r= new gmp_complex( *(gmp_complex*)b );
   }
   else if ( b == NULL )
   {
-    r= new complex( *(complex*)a );
-  }
-  else
-  {
-    r= new complex( (*(complex*)a) + (*(complex*)b) );
+    r= new gmp_complex( *(gmp_complex*)a );
+  }
+  else
+  {
+    r= new gmp_complex( (*(gmp_complex*)a) + (*(gmp_complex*)b) );
   }
   return (number)r;
@@ -185 +185 @@
 number ngcSub (number a, number b)
 {
-  complex* r= NULL;
+  gmp_complex* r= NULL;
   if ( a==NULL && b==NULL )
   {
@@ -192 +192 @@
   else if ( a == NULL )
   {
-    r= new complex( (*(complex*)b) );
-    r= (complex *)ngcNeg((number)r);
+    r= new gmp_complex( (*(gmp_complex*)b) );
+    r= (gmp_complex *)ngcNeg((number)r);
   }
   else if ( b == NULL )
   {
-    r= new complex( *(complex*)a );
-  }
-  else
-  {
-    r= new complex( (*(complex*)a) - (*(complex*)b) );
+    r= new gmp_complex( *(gmp_complex*)a );
+  }
+  else
+  {
+    r= new gmp_complex( (*(gmp_complex*)a) - (*(gmp_complex*)b) );
   }
   return (number)r;
@@ -211 +211 @@
 number ngcMult (number a, number b)
 {
-  complex* r= NULL;
+  gmp_complex* r= NULL;
   if ( a==NULL || b==NULL )
   {
@@ -218 +218 @@
   else
   {
-    r= new complex( (*(complex*)a) * (*(complex*)b) );
+    r= new gmp_complex( (*(gmp_complex*)a) * (*(gmp_complex*)b) );
   }
   return (number)r;
@@ -239 +239 @@
     return NULL;
   }
-  complex* r= new complex( (*(complex*)a) / (*(complex*)b) );
+  gmp_complex* r= new gmp_complex( (*(gmp_complex*)a) / (*(gmp_complex*)b) );
   return (number)r;
 }
@@ -250 +250 @@
   if ( exp == 0 )
   {
-    *(complex*)u= 1.0;
+    *(gmp_complex*)u= (gmp_complex)1.0;
     return;
   }
@@ -257 +257 @@
     if ( x == NULL )
     {
-      *(complex*)u= 0.0;
+      *(gmp_complex*)u= (gmp_complex)0.0;
     }
     else
     {
-      *(complex*)u= *(complex*)x;
+      *(gmp_complex*)u= *(gmp_complex*)x;
     }
     return;
   }
   ngcPower(x,exp-1,u);
-  *(complex*)u*= *(complex*)x;
+  *(gmp_complex*)u*= *(gmp_complex*)x;
 }
 
@@ -272 +272 @@
 {
   if ( a == NULL ) return TRUE;
-  return ( ((complex*)a)->real().isZero() && ((complex*)a)->imag().isZero());
+  return ( ((gmp_complex*)a)->real().isZero() && ((gmp_complex*)a)->imag().isZero());
 }
 
@@ -290 +290 @@
   if ( a==NULL )
   {
-    return (((complex*)b)->real().sign() < 0);
+    return (((gmp_complex*)b)->real().sign() < 0);
   }
   if ( b==NULL )
   {
-    return (((complex*)a)->real().sign() < 0);
+    return (((gmp_complex*)a)->real().sign() < 0);
   }
   return FALSE;
@@ -312 +312 @@
     return FALSE;
   }
-  return ( (*(complex*)a) == (*(complex*)b) );
+  return ( (*(gmp_complex*)a) == (*(gmp_complex*)b) );
 }
 
@@ -321 +321 @@
 {
   if ( a == NULL ) return FALSE;
-  return (((complex*)a)->real().isOne() && ((complex*)a)->imag().isZero());
+  return (((gmp_complex*)a)->real().isOne() && ((gmp_complex*)a)->imag().isZero());
 }
 
@@ -330 +330 @@
 {
   if ( a == NULL ) return FALSE;
-  return (((complex*)a)->real().isMOne() && ((complex*)a)->imag().isZero());
+  return (((gmp_complex*)a)->real().isMOne() && ((gmp_complex*)a)->imag().isZero());
 }
 
@@ -343 +343 @@
     gmp_float *re=NULL;
     s=ngfRead(s,(number *)&re);
-    complex *aa=new complex(*re);
+    gmp_complex *aa=new gmp_complex(*re);
     *a=(number)aa;
     delete re;
@@ -350 +350 @@
   {
     s+=strlen(currRing->parameter[0]);
-    complex *aa=new complex((long)0,(long)1);
+    gmp_complex *aa=new gmp_complex((long)0,(long)1);
     *a=(number)aa;
   }
@@ -366 +366 @@
   {
     char *out;
-    out= complexToStr(*(complex*)a,gmp_output_digits);
+    out= complexToStr(*(gmp_complex*)a,gmp_output_digits);
     StringAppend(out);
-    Free((ADDRESS)out, (strlen(out)+1)* sizeof(char) );
+    //    Free((ADDRESS)out, (strlen(out)+1)* sizeof(char) );
+    FreeL( (ADDRESS)out );
   }
 }