Changeset 850277 in git for libpolys

Timestamp:

Mar 20, 2014, 3:27:31 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

82393119769dfceb9f02d05dfaae6504348f93a4

Parents:

fb036e76ce9df79bac9d8b045ed2dee38b69a463

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-03-20 15:27:31+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-03-20 15:28:38+01:00

Message:

chg: moved reading/writing numbers via ssi to coeffs (p.1)

Location:

libpolys

Files:

• coeffs/coeffs.h (modified) (2 diffs)
• coeffs/longrat.cc (modified) (13 diffs)
• coeffs/modulop.cc (modified) (2 diffs)
• reporter/Makefile.am (modified) (1 diff)
• reporter/s_buff.cc (modified) (1 diff)
• reporter/s_buff.h (modified) (1 diff)

libpolys/coeffs/coeffs.h

@@ -11 +11 @@
 /* for assume: */
 #include <reporter/reporter.h>
+#include <reporter/s_buff.h>
 
 #include <coeffs/si_gmp.h>
@@ -179 +180 @@
    void    (*cfDelete)(number * a, const coeffs r);
    nMapFunc (*cfSetMap)(const coeffs src, const coeffs dst);
+
+   /// io via ssi:
+   void    (*cfWriteFd)(number a, FILE *f, const coeffs r);
+   number  (*cfReadFd)( s_buff f, const coeffs r);
 
    /// For extensions (writes into global string buffer)

libpolys/coeffs/longrat.cc

@@ -2651 +2651 @@
     return;
   }
-  
+
   // all coeffs are given by integers!!!
 
@@ -2667 +2667 @@
     nlNormalize(n, cf); ++normalcount;
     cand1 = n;
-    
+
     if (SR_HDL(cand1)&SR_INT) { cand=cand1; break; }
-    assume(cand1->s==3); // all coeffs should be integers // ==0?!! after printing 
+    assume(cand1->s==3); // all coeffs should be integers // ==0?!! after printing
     s1=mpz_size1(cand1->z);
     if (s>s1)
@@ -2684 +2684 @@
 
   numberCollectionEnumerator.Reset();
-  
+
   while (numberCollectionEnumerator.MoveNext() )
   {
@@ -2695 +2695 @@
 
     assume( nlGreaterZero(cand,cf) );
-    
+
     if(nlIsOne(cand,cf))
     {
@@ -2705 +2705 @@
         c = nlNeg(c, cf);
         numberCollectionEnumerator.Reset();
-        
+
         while (numberCollectionEnumerator.MoveNext() )
         {
@@ -2714 +2714 @@
       return;
     }
-  } 
+  }
 
   // part3: all coeffs = all coeffs / cand
   if (!lc_is_pos)
     cand = nlNeg(cand,cf);
-  
+
   c = cand;
   numberCollectionEnumerator.Reset();
@@ -2738 +2738 @@
 
   numberCollectionEnumerator.Reset();
-  
+
   if( !numberCollectionEnumerator.MoveNext() ) // empty zero polynomial?
   {
@@ -2757 +2757 @@
 
   int s=0;
-  
+
   const BOOLEAN lc_is_pos=nlGreaterZero(numberCollectionEnumerator.Current(),cf);
 
@@ -2783 +2783 @@
   }
   while (numberCollectionEnumerator.MoveNext() );
-  
+
 
   if (s==0) // nothing to do, all coeffs are already integers
@@ -2802 +2802 @@
         number& n = numberCollectionEnumerator.Current();
         n = nlNeg(n, cf);
-      } 
+      }
     }
 //    assume( n_GreaterZero(c, cf) );
@@ -2813 +2813 @@
   // make the lead coeff positive
   numberCollectionEnumerator.Reset();
-  
+
   if (!lc_is_pos)
     cand = nlNeg(cand, cf);
-  
+
   c = cand;
-  
+
   while (numberCollectionEnumerator.MoveNext() )
   {
@@ -2830 +2830 @@
 {
   return omStrDup("0");
+}
+
+#define SSI_BASE 16
+
+static void nlWriteFd(number n,FILE* f, const coeffs)
+{
+  if(SR_HDL(n) & SR_INT)
+  {
+    #if SIZEOF_LONG == 4
+    fprintf(f,"4 %ld ",SR_TO_INT(n));
+    #else
+    long nn=SR_TO_INT(n);
+    if ((nn<POW_2_28)||(nn>= -POW_2_28))
+      fprintf(f,"4 %ld ",nn);
+    else
+    {
+      mpz_t tmp;
+      mpz_init_set_si(tmp,nn);
+      fputs("8 ",f);
+      mpz_out_str (f,SSI_BASE, tmp);
+      fputc(' ',f);
+      mpz_clear(tmp);
+    }
+    #endif
+  }
+  else if (n->s<2)
+  {
+    //gmp_fprintf(f,"%d %Zd %Zd ",n->s,n->z,n->n);
+    fprintf(f,"%d ",n->s+5);
+    mpz_out_str (f,SSI_BASE, n->z);
+    fputc(' ',f);
+    mpz_out_str (f,SSI_BASE, n->n);
+    fputc(' ',f);
+
+    //if (d->f_debug!=NULL) gmp_fprintf(d->f_debug,"number: s=%d gmp/gmp \"%Zd %Zd\" ",n->s,n->z,n->n);
+  }
+  else /*n->s==3*/
+  {
+    //gmp_fprintf(d->f_write,"3 %Zd ",n->z);
+    fputs("8 ",f);
+    mpz_out_str (f,SSI_BASE, n->z);
+    fputc(' ',f);
+
+    //if (d->f_debug!=NULL) gmp_fprintf(d->f_debug,"number: gmp \"%Zd\" ",n->z);
+  }
+}
+
+static number nlReadFd(s_buff f, const coeffs)
+{
+  int sub_type=-1;
+  sub_type=s_readint(f);
+  switch(sub_type)
+  {
+     case 0:
+     case 1:
+       {// read mpz_t, mpz_t
+         number n=nlRInit(0);
+         mpz_init(n->n);
+         s_readmpz(f,n->z);
+         s_readmpz(f,n->n);
+         n->s=sub_type;
+         return n;
+       }
+
+     case 3:
+       {// read mpz_t
+         number n=nlRInit(0);
+         s_readmpz(f,n->z);
+         n->s=3; /*sub_type*/
+         return n;
+       }
+     case 4:
+       {
+         LONG dd=s_readlong(f);
+         //#if SIZEOF_LONG == 8
+         return INT_TO_SR(dd);
+         //#else
+         //return nlInit(dd,NULL);
+         //#endif
+       }
+     case 5:
+     case 6:
+       {// read raw mpz_t, mpz_t
+         number n=nlRInit(0);
+         mpz_init(n->n);
+         s_readmpz_base (f,n->z, SSI_BASE);
+         s_readmpz_base (f,n->n, SSI_BASE);
+         n->s=sub_type-5;
+         return n;
+       }
+     case 8:
+       {// read raw mpz_t
+         number n=nlRInit(0);
+         s_readmpz_base (f,n->z, SSI_BASE);
+         n->s=sub_type=3; /*subtype-5*/
+         return n;
+       }
+
+     default: Werror("error in reading number: invalid subtype %d",sub_type);
+              return NULL;
+  }
+  return NULL;
 }
 
@@ -2901 +3003 @@
   r->convFactoryNSingN=nlConvFactoryNSingN;
 
+  // io via ssi
+  r->cfWriteFd=nlWriteFd;
+  r->cfReadFd=nlReadFd;
+
   // the variables: general stuff (required)
   r->nNULL = INT_TO_SR(0);

libpolys/coeffs/modulop.cc

@@ -430 +430 @@
   snprintf(s,11,"%d",r->ch);
   return s;
+}
+
+static void npWriteFd(number n, FILE* f, const coeffs r)
+{
+  fprintf(f,"%d ",(int)(long)n);
+}
+
+static number npReadFd(s_buff f, const coeffs r)
+{
+  // read int
+  int dd;
+  dd=s_readint(f);
+  return (number)(long)dd;
 }
 
@@ -509 +522 @@
   r->convFactoryNSingN=npConvFactoryNSingN;
 
+  // io via ssi
+  r->cfWriteFd=npWriteFd;
+  r->cfReadFd=npReadFd;
+
   // the variables:
   r->nNULL = (number)0;

libpolys/reporter/Makefile.am

@@ -6 +6 @@
 #### libreporterdir = $(libdir)/singular
 
-libreporter_la_SOURCES  = dError.cc reporter.cc
+libreporter_la_SOURCES  = dError.cc reporter.cc s_buff.cc
 ## libreporter_la_LDFLAGS  = -release ${PACKAGE_VERSION}
 ## libreporter_la_LIBADD   = ${top_builddir}/misc/libmisc.la
 
 libreporter_la_includedir  =$(includedir)/singular/reporter
-libreporter_la_include_HEADERS   = reporter.h 
+libreporter_la_include_HEADERS   = reporter.h s_buff.h si_signals.h
 
 

libpolys/reporter/s_buff.cc

@@ -8 +8 @@
 
 #include <kernel/mod2.h>
-#include <coeffs/si_gmp.h>
+#include <gmp.h>
 
 #include <omalloc/omalloc.h>
-#include <Singular/links/s_buff.h>
-#include <Singular/si_signals.h>
+#include <reporter/s_buff.h>
+#include <reporter/si_signals.h>
 
 //struct s_buff_s

libpolys/reporter/s_buff.h

@@ -3 +3 @@
 
 #include<signal.h>
+#include<gmp.h>
 
 struct s_buff_s