Changeset a2de54 in git for libpolys

Timestamp:

Jun 30, 2017, 2:58:42 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

541b207e61f595e837e6079db54d90568408ee06

Parents:

1744215efa55b9960a2e39b0ace7f4df0011ecee

Message:

use double instead of float, longer output

Location:

libpolys/coeffs

Files:

• gnumpc.cc (modified) (2 diffs)
• gnumpfl.cc (modified) (1 diff)
• numbers.h (modified) (2 diffs)
• shortfl.cc (modified) (2 diffs)

libpolys/coeffs/gnumpc.cc

@@ -383 +383 @@
 
     if ((p==NULL)
-      && (6==r->float_len)
-      && (6==r->float_len2)
+      && (SHORT_REAL_LENGTH==r->float_len)
+      && (SHORT_REAL_LENGTH==r->float_len2)
       && (strcmp("i",n_ParameterNames(r)[0]) == 0)
       )
@@ -430 +430 @@
 static void ngcCoeffWrite  (const coeffs r, BOOLEAN /*details*/)
 {
-  Print("float[%s](complex:%d digits, additional %d digits)/(%s^2+1)",n_ParameterNames(r)[0],
+  Print("real[%s](complex:%d digits, additional %d digits)/(%s^2+1)",n_ParameterNames(r)[0],
         r->float_len, r->float_len2, n_ParameterNames(r)[0]);  /* long C */
 }

libpolys/coeffs/gnumpfl.cc

@@ -503 +503 @@
 static void ngfCoeffWrite  (const coeffs r, BOOLEAN /*details*/)
 {
-  Print("float(real:%d digits, additional %d digits)",
+  Print("real:%d digits, additional %d digits",
                r->float_len,r->float_len2);  /* long R */
 }

libpolys/coeffs/numbers.h

@@ -7 +7 @@
 * ABSTRACT: compatility interface to coeffs
 */
-#include "coeffs/coeffs.h"
+#include "libpolys/coeffs/coeffs.h"
+#include "omalloc/omalloc.h" /* for SIZEOF_DOUBLE, SIZEOF_LONG*/
 
 // the access methods
@@ -52 +53 @@
 // internal to coeffs, but public for all realizations
 
-#define SHORT_REAL_LENGTH 6 // use short reals for real <= 6 digits
+#if SIZEOF_DOUBE == SIZEOF_LONG
+#define SHORT_REAL_LENGTH 16 // use double for real <= 15 digits
+#else
+#define SHORT_REAL_LENGTH 6 // use float for real <= 6 digits
+#endif
 
 /* the dummy routines: */

libpolys/coeffs/shortfl.cc

@@ -83 +83 @@
 {
   assume( getCoeffType(r) == n_R );
-  PrintS("float");  /* R */
+  PrintS("real");  /* R */
 }
 
@@ -282 +282 @@
   assume( getCoeffType(r) == n_R );
 
+  #if SIZEOF_DOUBLE == SIZEOF_LONG
+  char ch[16];
+  int n = sprintf(ch,"%12.6e", nf(a).F());
+  #else
   char ch[11];
   int n = sprintf(ch,"%9.3e", nf(a).F());
+  #endif
   if (ch[0] == '-')
   {