Changeset ac5686 in git

Timestamp:

May 5, 2010, 5:47:52 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

1990de843c36aeaeb40e702d7d4a1ecc8ff753ea

Parents:

3b1a8d2d42c74cbc3f3f8b25288fd7d79934d0d4

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2010-05-05 17:47:52+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:52:53+01:00

Message:

GMP-Complex numbers are done now

Location:

coeffs

Files:

• gnumpc.cc (modified) (2 diffs)
• mpr_complex.cc (modified) (7 diffs)
• mpr_complex.h (modified) (2 diffs)

coeffs/gnumpc.cc

@@ -46 +46 @@
   if ( from != NULL )
   {
-    gmp_complex *res=new gmp_complex(numberFieldToFloat(from,QTOF));
+    gmp_complex *res=new gmp_complex(numberFieldToFloat(from,QTOF,aRing));
     return (number)res;
   }
@@ -463 +463 @@
   {
     char *out;
-    out= complexToStr(*(gmp_complex*)a, gmp_output_digits);
+    out= complexToStr(*(gmp_complex*)a, gmp_output_digits, r);
     StringAppendS(out);
     //    omFreeSize((void *)out, (strlen(out)+1)* sizeof(char) );

coeffs/mpr_complex.cc

@@ -373 +373 @@
 // makes a COPY of num! (Ist das gut?)
 //
-gmp_float numberToFloat( number num )
+gmp_float numberToFloat( number num, const coeffs src)
 {
   gmp_float r;
 
-  if ( rField_is_Q() )
+  if ( nField_is_Q(src) )
   {
     if ( num != NULL )
@@ -389 +389 @@
         if ( num->s == 0 )
         {
-          nlNormalize( num );
+          nlNormalize( num, src );
         }
         if (SR_HDL(num) & SR_INT)
@@ -414 +414 @@
     }
   }
-  else if (rField_is_long_R() || rField_is_long_C())
+  else if (nField_is_long_R(src) || nField_is_long_C(src))
   {
     r= *(gmp_float*)num;
   }
-  else if ( rField_is_R() )
+  else if ( nField_is_R(src) )
   {
     // Add some code here :-)
@@ -431 +431 @@
 }
 
-gmp_float numberFieldToFloat( number num, int k )
+gmp_float numberFieldToFloat( number num, int k, const coeffs src)
 {
   gmp_float r;
@@ -448 +448 @@
         if ( num->s == 0 )
         {
-          nlNormalize( num );
+          nlNormalize( num, src );
         }
         if (SR_HDL(num) & SR_INT)
@@ -702 +702 @@
 // converts a gmp_complex to a string ( <real part> + I * <imaginary part> )
 //
-char *complexToStr( gmp_complex & c, const unsigned int oprec )
+char *complexToStr( gmp_complex & c, const unsigned int oprec, const coeffs src )
 {
   char *out,*in_imag,*in_real;
@@ -713 +713 @@
     in_imag=floatToStr( abs(c.imag()), oprec );    // get imaginary part
 
-    if (rField_is_long_C())
-    {
-      int len=(strlen(in_real)+strlen(in_imag)+7+strlen(currRing->parameter[0]))*sizeof(char);
+    if (nField_is_long_C(src))
+    {
+      int len=(strlen(in_real)+strlen(in_imag)+7+strlen(src->parameter[0]))*sizeof(char);
       out=(char*)omAlloc(len);
       memset(out,0,len);
       if (  !c.real().isZero() )  // (-23-i*5.43) or (15.1+i*5.3)
-        sprintf(out,"(%s%s%s*%s)",in_real,c.imag().sign()>=0?"+":"-",currRing->parameter[0],in_imag);
+        sprintf(out,"(%s%s%s*%s)",in_real,c.imag().sign()>=0?"+":"-",src->parameter[0],in_imag);
       else // (-i*43) or (i*34)
       {
         if (c.imag().isOne())
-          sprintf(out,"%s",currRing->parameter[0]);
+          sprintf(out,"%s",src->parameter[0]);
         else if (c.imag().isMOne())
-          sprintf(out,"-%s",currRing->parameter[0]);
+          sprintf(out,"-%s",src->parameter[0]);
         else
-          sprintf(out,"(%s%s*%s)",c.imag().sign()>=0?"":"-",currRing->parameter[0],in_imag);
+          sprintf(out,"(%s%s*%s)",c.imag().sign()>=0?"":"-",src->parameter[0],in_imag);
       }
     }

coeffs/mpr_complex.h

@@ -159 +159 @@
 gmp_float max( const gmp_float &, const gmp_float & );
 
-gmp_float numberToFloat( number num );
-gmp_float numberFieldToFloat( number num, int k );
+gmp_float numberToFloat( number num, const coeffs src );
+gmp_float numberFieldToFloat( number num, int k, const coeffs src );
 //char *floatToStr( const gmp_float & r, const unsigned int oprec );
 //<-
@@ -308 +308 @@
   else
   {
-    return gmp_complex( numberToFloat(num) );
-  }
-}
-
-char *complexToStr( gmp_complex & c, const  unsigned int oprec );
+    return gmp_complex( numberToFloat(num, r) );
+  }
+}
+
+char *complexToStr( gmp_complex & c, const  unsigned int oprec, const coeffs src );
 //<-