Changeset 28a3d2 in git

Timestamp:

Jul 5, 2018, 3:45:35 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

7c8188b8f91cdb0c85b5db214f0baa451bb5186afec0e698195c1310cb8930215e910b220b8ad5ce

Parents:

33ca139a30b77f4102096eb5d3ec15ce75f4aa77

Message:

ssiLink: use ssiInfo to read coeffs

Files:

• Singular/links/ssiLink.cc (modified) (1 diff)
• 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) (6 diffs)
• libpolys/coeffs/modulop.cc (modified) (1 diff)

Singular/links/ssiLink.cc

@@ -403 +403 @@
   if (cf->cfReadFd!=NULL)
   {
-     return n_ReadFd(d->f_read,cf);
+     return n_ReadFd(d,cf);
   }
   else if (getCoeffType(cf) == n_transExt)

libpolys/coeffs/coeffs.h

@@ -276 +276 @@
 
    void    (*cfWriteFd)(number a, const ssiInfo *f, const coeffs r);
-   number  (*cfReadFd)( s_buff f, const coeffs r);
+   number  (*cfReadFd)( const ssiInfo *f, const coeffs r);
 
    /// Inplace: a *= b
@@ -988 +988 @@
 
 /// io via ssi:
-static FORCE_INLINE number n_ReadFd( s_buff f, const coeffs r)
+static FORCE_INLINE number n_ReadFd( const ssiInfo *f, const coeffs r)
 { STATISTIC(n_ReadFd); assume(r != NULL); assume(r->cfReadFd != NULL); return r->cfReadFd(f, r); }
 

libpolys/coeffs/flintcf_Q.cc

@@ -511 +511 @@
   mpq_clear(m);
 }
-static number ReadFd(s_buff f, const coeffs)
+static number ReadFd(const ssiInfo *d, const coeffs)
 {
   // format: len a_len .. a_0
   fmpq_poly_ptr aa=(fmpq_poly_ptr)omAlloc(sizeof(fmpq_poly_t));
   fmpq_poly_init(aa);
-  int l=s_readint(f);
+  int l=s_readint(d->f_read);
   mpz_t nm;
   mpz_init(nm);
@@ -524 +524 @@
   {
 
-    s_readmpz_base (f,nm, SSI_BASE);
+    s_readmpz_base (d->f_read,nm, SSI_BASE);
     mpq_set_num(m,nm);
-    s_readmpz_base (f,nm, SSI_BASE);
+    s_readmpz_base (d->f_read,nm, SSI_BASE);
     mpq_set_den(m,nm);
     fmpq_poly_set_coeff_mpq(aa,i,m);

libpolys/coeffs/flintcf_Zn.cc

@@ -444 +444 @@
 }
 
-static number ReadFd(s_buff f, const coeffs r)
+static number ReadFd(const ssiInfo *d, const coeffs r)
 {
   // format: len a_len .. a_0
   nmod_poly_ptr aa=(nmod_poly_ptr)omAlloc(sizeof(nmod_poly_t));
   nmod_poly_init(aa,r->ch);
-  int l=s_readint(f);
+  int l=s_readint(d->f_read);
   unsigned long ul;
   for (int i=l;i>=0;i--)
   {
-    unsigned long ul=s_readlong(f);
+    unsigned long ul=s_readlong(d->f_read);
     nmod_poly_set_coeff_ui(aa,i,ul);
   }

libpolys/coeffs/longrat.cc

@@ -3222 +3222 @@
 }
 
-static number nlReadFd(s_buff f, const coeffs)
+static number nlReadFd(const ssiInfo *d, const coeffs)
 {
   int sub_type=-1;
-  sub_type=s_readint(f);
+  sub_type=s_readint(d->f_read);
   switch(sub_type)
   {
@@ -3233 +3233 @@
          number n=nlRInit(0);
          mpz_init(n->n);
-         s_readmpz(f,n->z);
-         s_readmpz(f,n->n);
+         s_readmpz(d->f_read,n->z);
+         s_readmpz(d->f_read,n->n);
          n->s=sub_type;
          return n;
@@ -3242 +3242 @@
        {// read mpz_t
          number n=nlRInit(0);
-         s_readmpz(f,n->z);
+         s_readmpz(d->f_read,n->z);
          n->s=3; /*sub_type*/
          #if SIZEOF_LONG == 8
@@ -3251 +3251 @@
      case 4:
        {
-         LONG dd=s_readlong(f);
+         LONG dd=s_readlong(d->f_read);
          //#if SIZEOF_LONG == 8
          return INT_TO_SR(dd);
@@ -3263 +3263 @@
          number n=nlRInit(0);
          mpz_init(n->n);
-         s_readmpz_base (f,n->z, SSI_BASE);
-         s_readmpz_base (f,n->n, SSI_BASE);
+         s_readmpz_base (d->f_read,n->z, SSI_BASE);
+         s_readmpz_base (d->f_read,n->n, SSI_BASE);
          n->s=sub_type-5;
          return n;
@@ -3271 +3271 @@
        {// read raw mpz_t
          number n=nlRInit(0);
-         s_readmpz_base (f,n->z, SSI_BASE);
+         s_readmpz_base (d->f_read,n->z, SSI_BASE);
          n->s=sub_type=3; /*subtype-5*/
          #if SIZEOF_LONG == 8

libpolys/coeffs/modulop.cc

@@ -377 +377 @@
 }
 
-static number npReadFd(s_buff f, const coeffs)
+static number npReadFd(const ssiInfo *d, const coeffs)
 {
   // read int
   int dd;
-  dd=s_readint(f);
+  dd=s_readint(d->f_read);
   return (number)(long)dd;
 }