Changeset a507140 in git for libpolys/coeffs/rmodulon.cc

Timestamp:

May 10, 2020, 5:39:11 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f050a38f7d4a93811fa78a1a7cebd7b3a35fc044fe09a23b169ca576a8128e614973bc79bcfec5d7

Parents:

6dd33c01a9c354dd3b89fe045bffa9b635e23954

Message:

opt: nCoeffWrite/nCoeffString via nCoeffName

File:

• libpolys/coeffs/rmodulon.cc (modified) (5 diffs)

libpolys/coeffs/rmodulon.cc

@@ -32 +32 @@
 
 EXTERN_VAR omBin gmp_nrz_bin;
-
-static void nrnCoeffWrite  (const coeffs r, BOOLEAN /*details*/)
-{
-  size_t l = (size_t)mpz_sizeinbase(r->modBase, 10) + 2;
-  char* s = (char*) omAlloc(l);
-  s= mpz_get_str (s, 10, r->modBase);
-
-  #ifdef TEST_ZN_AS_ZP
-  if (l<10)
-  {
-    if (nCoeff_is_Zn(r)) Print("ZZ/%s", s);
-    else if (nCoeff_is_Ring_PtoM(r)) Print("ZZ/(%s^%lu)", s, r->modExponent);
-  }
-  else
-  #endif
-  {
-    if (nCoeff_is_Zn(r)) Print("ZZ/bigint(%s)", s);
-    else if (nCoeff_is_Ring_PtoM(r)) Print("ZZ/(bigint(%s)^%lu)", s, r->modExponent);
-  }
-
-  omFreeSize((ADDRESS)s, l);
-}
 
 coeffs nrnInitCfByName(char *s,n_coeffType n)
@@ -89 +67 @@
   size_t l = (size_t)mpz_sizeinbase(r->modBase, 10) + 2;
   char* s = (char*) omAlloc(l);
-  l+=22;
+  l+=24;
   nrnCoeffName_buff=(char*)omAlloc(l);
   s= mpz_get_str (s, 10, r->modBase);
   int ll;
   if (nCoeff_is_Zn(r))
-    ll=snprintf(nrnCoeffName_buff,l,"ZZ/bigint(%s)",s);
+  {
+    if (strlen(s)<10)
+      ll=snprintf(nrnCoeffName_buff,l,"ZZ/(%s)",s);
+    else
+      ll=snprintf(nrnCoeffName_buff,l,"ZZ/bigint(%s)",s);
+  }
   else if (nCoeff_is_Ring_PtoM(r))
-    ll=snprintf(nrnCoeffName_buff,l,"ZZ/bigint(%s)^%lu",s,r->modExponent);
+    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);
@@ -108 +91 @@
   return (n==r->type) && (r->modExponent==info->exp)
   && (mpz_cmp(r->modBase,info->base)==0);
-}
-
-static char* nrnCoeffString(const coeffs r)
-{
-  size_t l = (size_t)mpz_sizeinbase(r->modBase, 10) +2;
-  char* b = (char*) omAlloc(l);
-  b= mpz_get_str (b, 10, r->modBase);
-  char* s = (char*) omAlloc(15+l);
-  if (nCoeff_is_Zn(r)) sprintf(s,"ZZ/%s",b);
-  else /*if (nCoeff_is_Ring_PtoM(r))*/ sprintf(s,"ZZ/(bigint(%s)^%lu)",b,r->modExponent);
-  omFreeSize(b,l);
-  return s;
 }
 
@@ -1014 +985 @@
   r->rep=n_rep_gmp;
 
-
-  r->cfCoeffString = nrnCoeffString;
-
   r->cfInit        = nrnInit;
   r->cfDelete      = nrnDelete;
@@ -1052 +1020 @@
   r->cfQuotRem     = nrnQuotRem;
   r->cfCoeffName   = nrnCoeffName;
-  r->cfCoeffWrite  = nrnCoeffWrite;
   r->nCoeffIsEqual = nrnCoeffIsEqual;
   r->cfKillChar    = nrnKillChar;