Changeset 4b5b36 in git

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

e5ddd4bbb0c30d53b6ebc1f1a4d963405f91c7f6

Parents:

113a802e445da6c564286206f2eb02f93a3167a3

Message:

add: ssi for poly over Z/n

Location:

libpolys/coeffs

Files:

• rintegers.cc (modified) (2 diffs)
• rintegers.h (modified) (1 diff)
• rmodulon.cc (modified) (6 diffs)

libpolys/coeffs/rintegers.cc

@@ -133 +133 @@
 }
 
-static void nrzDelete(number *a, const coeffs)
+void nrzDelete(number *a, const coeffs)
 {
   if (*a != NULL)
@@ -158 +158 @@
 #endif
 
-static int nrzSize(number a, const coeffs)
+int nrzSize(number a, const coeffs)
 {
   mpz_ptr p=(mpz_ptr)a;

libpolys/coeffs/rintegers.h

@@ -26 +26 @@
 
 void    nrzWrite       (number a, const coeffs r); /*for rmodulon.cc*/
+void    nrzDelete      (number *a, const coeffs);  /*for rmodulon.cc*/
+int     nrzSize        (number a, const coeffs);   /*for rmodulon.cc*/
+void nrzWriteFd(number n, const ssiInfo* d, const coeffs); /*for rmodulon.cc*/
+number nrzReadFd(const ssiInfo *d, const coeffs);  /*for rmodulon.cc*/
 
 number  nrzInit        (long i, const coeffs r); /*for SAGE, better: n_Init*/

libpolys/coeffs/rmodulon.cc

@@ -15 +15 @@
 #include "coeffs/coeffs.h"
 #include "coeffs/modulop.h"
+#include "coeffs/rintegers.h"
 #include "coeffs/numbers.h"
 
@@ -87 +88 @@
   if(nrnCoeffName_buff!=NULL) omFree(nrnCoeffName_buff);
   size_t l = (size_t)mpz_sizeinbase(r->modBase, 10) + 2;
-  nrnCoeffName_buff=(char*)omAlloc(l+12);
   char* s = (char*) omAlloc(l);
+  l+=22;
+  nrnCoeffName_buff=(char*)omAlloc(l);
   s= mpz_get_str (s, 10, r->modBase);
+  int ll;
   if (nCoeff_is_Ring_ModN(r))
-    snprintf(nrnCoeffName_buff,l+6,"ZZ/bigint(%s)",s);
+    ll=snprintf(nrnCoeffName_buff,l,"ZZ/bigint(%s)",s);
   else if (nCoeff_is_Ring_PtoM(r))
-    snprintf(nrnCoeffName_buff,l+6,"ZZ/bigint(%s)^%lu",s,r->modExponent);
-  omFreeSize((ADDRESS)s, l);
+    ll=snprintf(nrnCoeffName_buff,l,"ZZ/bigint(%s)^%lu",s,r->modExponent);
+  assume(ll<(int)l); // otherwise nrnCoeffName_buff too small
+  omFreeSize((ADDRESS)s, l-22);
   return nrnCoeffName_buff;
 }
-
 
 static BOOLEAN nrnCoeffIsEqual(const coeffs r, n_coeffType n, void * parameter)
@@ -190 +193 @@
 }
 
+/*
+ * convert a number to int
+ */
+static long nrnInt(number &n, const coeffs)
+{
+  return mpz_get_si((mpz_ptr) n);
+}
+
+#if SI_INTEGER_VARIANT==2
+#define nrnDelete nrzDelete
+#define nrnSize   nrzSize
+#else
 static void nrnDelete(number *a, const coeffs)
 {
@@ -199 +214 @@
   }
 }
-
 static int nrnSize(number a, const coeffs)
 {
@@ -207 +221 @@
   return s;
 }
-
-/*
- * convert a number to int
- */
-static long nrnInt(number &n, const coeffs)
-{
-  return mpz_get_si((mpz_ptr) n);
-}
-
+#endif
 /*
  * Multiply two numbers
@@ -1050 +1056 @@
   r->cfKillChar    = nrnKillChar;
   r->cfQuot1       = nrnQuot1;
+#if SI_INTEGER_VARIANT==2
+  r->cfWriteFd     = nrzWriteFd;
+  r->cfReadFd      = nrzReadFd;
+#endif
+
 #ifdef LDEBUG
   r->cfDBTest      = nrnDBTest;