Changeset 33ca13 in git

Timestamp:

Jul 4, 2018, 3:16:04 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

28a3d22f453ebd3d8e245b645c9a0cd003919d08

Parents:

e256b457c3a40d4718b8c57b06c38ee20fd89f70

Message:

ssiLink: use ssiInfo to write coeffs

Files:

• Singular/links/ssiLink.cc (modified) (2 diffs)
• libpolys/coeffs/coeffs.h (modified) (2 diffs)
• libpolys/coeffs/flintcf_Q.cc (modified) (2 diffs)
• libpolys/coeffs/flintcf_Zn.cc (modified) (1 diff)
• libpolys/coeffs/longrat.cc (modified) (5 diffs)
• libpolys/coeffs/modulop.cc (modified) (1 diff)

Singular/links/ssiLink.cc

@@ -120 +120 @@
 void ssiWriteBigInt(const ssiInfo *d, const number n)
 {
- n_WriteFd(n,d->f_write,coeffs_BIGINT);
+ n_WriteFd(n,d,coeffs_BIGINT);
 }
 
@@ -146 +146 @@
   else if (cf->cfWriteFd!=NULL)
   {
-    n_WriteFd(n,d->f_write,cf);
+    n_WriteFd(n,d,cf);
   }
   else WerrorS("coeff field not implemented");

libpolys/coeffs/coeffs.h

@@ -275 +275 @@
    nMapFunc (*cfSetMap)(const coeffs src, const coeffs dst);
 
-   void    (*cfWriteFd)(number a, FILE *f, const coeffs r);
+   void    (*cfWriteFd)(number a, const ssiInfo *f, const coeffs r);
    number  (*cfReadFd)( s_buff f, const coeffs r);
 
@@ -984 +984 @@
 
 /// io via ssi:
-static FORCE_INLINE void n_WriteFd(number a, FILE *f, const coeffs r)
+static FORCE_INLINE void n_WriteFd(number a, const ssiInfo *f, const coeffs r)
 { STATISTIC(n_WriteFd); assume(r != NULL); assume(r->cfWriteFd != NULL); return r->cfWriteFd(a, f, r); }
 

libpolys/coeffs/flintcf_Q.cc

@@ -486 +486 @@
   return (number)res;
 }
-static void WriteFd(number a, FILE *f, const coeffs)
+static void WriteFd(number a, const ssiInfo *d, const coeffs)
 {
   // format: len a_len(num den) .. a_0
   fmpq_poly_ptr aa=(fmpq_poly_ptr)a;
   int l=fmpq_poly_length(aa);
-  fprintf(f,"%d ",l);
+  fprintf(d->f_write,"%d ",l);
   mpq_t m;
   mpq_init(m);
@@ -502 +502 @@
     mpq_get_num(num,m);
     mpq_get_den(den,m);
-    mpz_out_str (f,SSI_BASE, num);
-    fputc(' ',f);
-    mpz_out_str (f,SSI_BASE, den);
-    fputc(' ',f);
+    mpz_out_str (d->f_write,SSI_BASE, num);
+    fputc(' ',d->f_write);
+    mpz_out_str (d->f_write,SSI_BASE, den);
+    fputc(' ',d->f_write);
   }
   mpz_clear(den);

libpolys/coeffs/flintcf_Zn.cc

@@ -431 +431 @@
   return buf;
 }
-static void WriteFd(number a, FILE *f, const coeffs)
+static void WriteFd(number a, const ssiInfo *d, const coeffs)
 {
   // format: len a_len .. a_0
   nmod_poly_ptr aa=(nmod_poly_ptr)a;
   int l=nmod_poly_length(aa);
-  fprintf(f,"%d ",l);
+  fprintf(d->f_write,"%d ",l);
   for(int i=l; i>=0; i--)
   {
     ulong ul=nmod_poly_get_coeff_ui(aa,i);
-    fprintf(f,"%lu ", ul);
-  }
-}
+    fprintf(d->f_write,"%lu ", ul);
+  }
+}
+
 static number ReadFd(s_buff f, const coeffs r)
 {

libpolys/coeffs/longrat.cc

@@ -3176 +3176 @@
 }
 
-static void nlWriteFd(number n,FILE* f, const coeffs)
+static void nlWriteFd(number n, const ssiInfo* d, const coeffs)
 {
   if(SR_HDL(n) & SR_INT)
@@ -3187 +3187 @@
     {
       int nnn=(int)nn;
-      fprintf(f,"4 %d ",nnn);
+      fprintf(d->f_write,"4 %d ",nnn);
     }
     else
@@ -3193 +3193 @@
       mpz_t tmp;
       mpz_init_set_si(tmp,nn);
-      fputs("8 ",f);
-      mpz_out_str (f,SSI_BASE, tmp);
-      fputc(' ',f);
+      fputs("8 ",d->f_write);
+      mpz_out_str (d->f_write,SSI_BASE, tmp);
+      fputc(' ',d->f_write);
       mpz_clear(tmp);
     }
@@ -3203 +3203 @@
   {
     //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);
+    fprintf(d->f_write,"%d ",n->s+5);
+    mpz_out_str (d->f_write,SSI_BASE, n->z);
+    fputc(' ',d->f_write);
+    mpz_out_str (d->f_write,SSI_BASE, n->n);
+    fputc(' ',d->f_write);
 
     //if (d->f_debug!=NULL) gmp_fprintf(d->f_debug,"number: s=%d gmp/gmp \"%Zd %Zd\" ",n->s,n->z,n->n);
@@ -3214 +3214 @@
   {
     //gmp_fprintf(d->f_write,"3 %Zd ",n->z);
-    fputs("8 ",f);
-    mpz_out_str (f,SSI_BASE, n->z);
-    fputc(' ',f);
+    fputs("8 ",d->f_write);
+    mpz_out_str (d->f_write,SSI_BASE, n->z);
+    fputc(' ',d->f_write);
 
     //if (d->f_debug!=NULL) gmp_fprintf(d->f_debug,"number: gmp \"%Zd\" ",n->z);

libpolys/coeffs/modulop.cc

@@ -372 +372 @@
 }
 
-static void npWriteFd(number n, FILE* f, const coeffs)
-{
-  fprintf(f,"%d ",(int)(long)n);
+static void npWriteFd(number n, const ssiInfo* d, const coeffs)
+{
+  fprintf(d->f_write,"%d ",(int)(long)n);
 }