Changeset 3c6379 in git

Timestamp:

Jul 30, 2004, 2:18:50 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

9995418f9a692786b393990b5d8ec6afc065e936

Parents:

f12d4f65e05f0c6728f1743580a54e40d44c0f21

Message:

*hannes; again long real rounding


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

Location:

kernel

Files:

• gnumpfl.cc (modified) (2 diffs)
• mpr_complex.h (modified) (4 diffs)

kernel/gnumpfl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpfl.cc,v 1.1.1.1 2003-10-06 12:15:53 Singular Exp $ */
+/* $Id: gnumpfl.cc,v 1.2 2004-07-30 12:18:50 Singular Exp $ */
 /*
 * ABSTRACT: computations with GMP floating-point numbers
@@ -118 +118 @@
 {
   if ( i == NULL ) return 0;
-  return (int)*(gmp_float*)i;
+  double d=(double)*(gmp_float*)i;
+  if (d<0.0)
+    return (int)(d-0.5);
+  else
+    return (int)(d+0.5);
 }
 

kernel/mpr_complex.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_complex.h,v 1.3 2004-07-29 18:13:28 Singular Exp $ */
+/* $Id: mpr_complex.h,v 1.4 2004-07-30 12:18:50 Singular Exp $ */
 
 /*
@@ -31 +31 @@
  * @short wrapper class for GNU Multi Precision Floats
  */
+class gmp_float;
+char *floatToStr( const gmp_float & r, const unsigned int oprec );
 class gmp_float
 {
@@ -132 +134 @@
   inline operator int() { return (int)mpf_get_d( t ); };
   inline operator int() const { return (int)mpf_get_d( t ); };
-#else
+//#else
   inline operator int() const
   { if (mpf_fits_sint_p(t))
-    {
-      gmp_float tmp(*this); 
-      tmp+=gmp_float(0.5); 
-      return (int)mpf_get_si( tmp.t );
-    }
+    { return (int)mpf_get_si( t ); }
     return 0;
   };
@@ -165 +163 @@
 gmp_float numberToFloat( number num );
 gmp_float numberFieldToFloat( number num, int k );
-char *floatToStr( const gmp_float & r, const unsigned int oprec );
+//char *floatToStr( const gmp_float & r, const unsigned int oprec );
 //<-