Changeset 45cc512 in git for libpolys/polys

Timestamp:

Dec 5, 2013, 3:34:22 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0acf3e38387201ff9fd3220d3febd9296fda35dd

Parents:

6cce775fcf124d803afe198a1cae685953241af3

Message:

chg: rCharstr is now a wrapper for r->cf->cfCoeffString

fixes also: charstr for integer,2,3

Location:

libpolys/polys

Files:

• ext_fields/algext.cc (modified) (2 diffs)
• ext_fields/transext.cc (modified) (1 diff)
• monomials/ring.cc (modified) (1 diff)

libpolys/polys/ext_fields/algext.cc

@@ -1327 +1327 @@
 }
 
-
+char* naCoeffString(const coeffs r) // currently also for tranext.
+{
+  const char* const* p=n_ParameterNames(r);
+  int l=0;
+  int i;
+  for(i=0; i<n_NumberOfParameters(r);i++)
+  {
+    l+=(strlen(p[i])+1);
+  }
+  char *s=(char *)omAlloc(l+10+1);
+  s[0]='\0';
+  snprintf(s,10+1,"%d",r->ch); /* Fp(a) or Q(a) */
+  char tt[2];
+  tt[0]=',';
+  tt[1]='\0';
+  for(i=0; i<n_NumberOfParameters(r);i++)
+  {
+    strcat(s,tt);
+    strcat(s,p[i]);
+  }
+  return s;
+}
 
 BOOLEAN naInitChar(coeffs cf, void * infoStruct)
@@ -1358 +1379 @@
   p_Test((poly)naMinpoly, naRing);
   #endif
+
+  cf->cfCoeffString = naCoeffString;
 
   cf->cfGreaterZero  = naGreaterZero;

libpolys/polys/ext_fields/transext.cc

@@ -2365 +2365 @@
   cf->ch = R->cf->ch;
   cf->factoryVarOffset = R->cf->factoryVarOffset + rVar(R);
+  extern char* naCoeffString(const coeffs r);
+  cf->cfCoeffString = naCoeffString;
 
   cf->cfGreaterZero  = ntGreaterZero;

libpolys/polys/monomials/ring.cc

@@ -619 +619 @@
 /// Decompose & Compose, rParameter & rPar
 char * rCharStr(ring r)
-{
-  char *s;
-  int i;
-
-#ifdef HAVE_RINGS
-  if (rField_is_Ring_Z(r))
-  {
-    s=omStrDup("integer");                   // Z
-    return s;
-  }
-  if(rField_is_Ring_2toM(r))
-  {
-    char* s = (char*) omAlloc(7+10+2);
-    sprintf(s,"integer,%lu",r->cf->modExponent);
-    return s;
-  }
-  if(rField_is_Ring_ModN(r))
-  {
-    long l = (long)mpz_sizeinbase(r->cf->modBase, 10) + 2+7;
-    char* s = (char*) omAlloc(l);
-    gmp_sprintf(s,"integer,%Zd",r->cf->modBase);
-    return s;
-  }
-  if(rField_is_Ring_PtoM(r))
-  {
-    long l = (long)mpz_sizeinbase(r->cf->modBase, 10) + 2+7+10;
-    char* s = (char*) omAlloc(l);
-    gmp_sprintf(s,"integer,%Zd^%lu",r->cf->modBase,r->cf->modExponent);
-    return s;
-  }
-#endif
-  if (rField_is_long_R(r))
-  {
-    i = MAX_INT_LEN*2+7; // 2 integers and real,,
-    s=(char *)omAlloc(i);
-    snprintf(s,i,"real,%d,%d",r->cf->float_len,r->cf->float_len2); /* long_R */
-    return s;
-  }
-  if (rField_is_R(r))
-  {
-    return omStrDup("real"); /* short real */
-  }
-  char const * const * const params = rParameter(r);
-  if (params==NULL)
-  {
-    s=(char *)omAlloc(MAX_INT_LEN+1);
-    snprintf(s,MAX_INT_LEN+1,"%d",n_GetChar(r->cf));         /* Q, Z/p */
-    return s;
-  }
-  if (rField_is_long_C(r))
-  {
-    i=strlen(params[0])+21;
-    s=(char *)omAlloc(i);
-    snprintf(s,i,"complex,%d,%s",r->cf->float_len,params[0]);   /* C */
-    return s;
-  }
-  if (nCoeff_is_GF(r->cf))
-  {
-    i=strlen(params[0])+21;
-    s=(char *)omAlloc(i);
-    snprintf(s,i,"%d,%s",r->cf->m_nfCharQ,params[0]); /* GF(q)  */
-    return s;
-  }
-  int l=0;
-  for(i=0; i<rPar(r);i++)
-  {
-    l+=(strlen(params[i])+1);
-  }
-  s=(char *)omAlloc((long)(l+MAX_INT_LEN+1));
-  s[0]='\0';
-  snprintf(s,MAX_INT_LEN+1,"%d",r->cf->ch); /* Fp(a) or Q(a) */
-  char tt[2];
-  tt[0]=',';
-  tt[1]='\0';
-  for(i=0; i<rPar(r);i++)
-  {
-    strcat(s,tt);
-    strcat(s,params[i]);
-  }
-  return s;
-}
+{ return r->cf->cfCoeffString(r->cf); }
 
 char * rParStr(ring r)