Changeset bf5bec1 in git for libpolys

Timestamp:

Jul 5, 2017, 1:53:50 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

32c5f947e5ea873df3119173b8d179ad7fb4197767f9e8e1fc9856b995aae2d27c9a3848419e3d138226f6e95990941b4d0fb1d572d060df2c38db62

Parents:

e93b00355896c3f6635d8c010d17067b1f821ea7

Message:

introduce crossprod(.....) for coeffs

- Float(..) for n_R, n_long_R to construct coeffs
- ntupel.*: implementation for n_nTupel

Location:

libpolys/coeffs

Files:

• Makefile.am (modified) (2 diffs)
• coeffs.h (modified) (1 diff)
• gnumpfl.cc (modified) (3 diffs)
• ntupel.cc (added)
• ntupel.h (added)
• numbers.cc (modified) (2 diffs)
• shortfl.cc (modified) (3 diffs)

libpolys/coeffs/Makefile.am

@@ -16 +16 @@
   numbers.cc rintegers.cc rmodulo2m.cc rmodulon.cc shortfl.cc \
   gnumpc.cc gnumpfl.cc longrat.cc longrat0.cc ffields.cc \
-  modulop.cc mpr_complex.cc \
+  modulop.cc mpr_complex.cc ntupel.cc \
   bigintmat.cc  AE.cc OPAE.cc AEp.cc OPAEp.cc AEQ.cc OPAEQ.cc \
   flintcf_Q.cc flintcf_Zn.cc
@@ -25 +25 @@
 libcoeffs_la_include_HEADERS = \
   coeffs.h numbers.h si_gmp.h gnumpc.h gnumpfl.h longrat.h modulop.h ffields.h rintegers.h rmodulo2m.h rmodulon.h \
-  shortfl.h mpr_complex.h mpr_global.h numstats.h \
+  shortfl.h mpr_complex.h mpr_global.h numstats.h ntupel.h \
   bigintmat.h Enumerator.h AE.h OPAE.h AEp.h OPAEp.h AEQ.h OPAEQ.h \
   flintcf_Q.h flintcf_Zn.h

libpolys/coeffs/coeffs.h

@@ -41 +41 @@
                   is transcendental */
   n_long_C, /**< complex floating point (GMP) numbers */
+  n_nTupel, /**< n-tupel of cf: ZZ/p1,... ZZ/pn, R, long_R */
   n_Z, /**< only used if HAVE_RINGS is defined  */
   n_Zn, /**< only used if HAVE_RINGS is defined */

libpolys/coeffs/gnumpfl.cc

@@ -403 +403 @@
 static char* ngfCoeffString(const coeffs r)
 {
-  char *s=(char*)omAlloc(27);
-  snprintf(s,27,"real,%d,%d",r->float_len,r->float_len2);
+  char *s=(char*)omAlloc(30);
+  snprintf(s,30,"Float(%d,%d)",r->float_len,r->float_len2);
   return s;
 }
@@ -410 +410 @@
 static char* ngfCoeffName(const coeffs r)
 {
-  static char ngfCoeffName_buf[27];
-  snprintf(ngfCoeffName_buf,27,"RR(%d,%d)",r->float_len,r->float_len2);
+  static char ngfCoeffName_buf[30];
+  snprintf(ngfCoeffName_buf,30,"Float(%d,%d)",r->float_len,r->float_len2);
   return ngfCoeffName_buf;
 }
@@ -503 +503 @@
 static void ngfCoeffWrite  (const coeffs r, BOOLEAN /*details*/)
 {
-  Print("real:%d digits, additional %d digits",
-               r->float_len,r->float_len2);  /* long R */
+  Print("Float(%d,%d)", r->float_len,r->float_len2);  /* long R */
 }
 

libpolys/coeffs/numbers.cc

@@ -25 +25 @@
 #include "coeffs/ffields.h"
 #include "coeffs/shortfl.h"
+#include "coeffs/ntupel.h"
 
 #ifdef HAVE_RINGS
@@ -322 +323 @@
  #endif
  ngcInitChar,  /* n_long_C */
+ nnInitChar,   /* n_nTupel */
  #ifdef HAVE_RINGS
  nrzInitChar,  /* n_Z */

libpolys/coeffs/shortfl.cc

@@ -64 +64 @@
 {
   assume( getCoeffType(r) == n_R );
-  PrintS("real");  /* R */
+  PrintS("Float()");  /* R */
 }
 
@@ -263 +263 @@
   assume( getCoeffType(r) == n_R );
 
-  #if SIZEOF_DOUBLE == SIZEOF_LONG
-  char ch[16];
-  int n = sprintf(ch,"%12.6e", nf(a).F());
-  #else
+  //#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
+  //#endif
   if (ch[0] == '-')
   {
@@ -712 +712 @@
 static char* nrCoeffString(const coeffs r)
 {
-  return omStrDup("real");
+  return omStrDup("Float()");
 }
 
 static char* nrCoeffName(const coeffs r)
 {
-  return (char*)"real";
+  return (char*)"Float()";
 }