Changeset 45cc512 in git for libpolys

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

0acf3e38387201ff9fd3220d3febd9296fda35dd

Parents:

6cce775fcf124d803afe198a1cae685953241af3

Message:

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

fixes also: charstr for integer,2,3

Location:

libpolys

Files:

• coeffs/coeffs.h (modified) (1 diff)
• coeffs/ffields.cc (modified) (2 diffs)
• coeffs/gnumpc.cc (modified) (2 diffs)
• coeffs/gnumpfl.cc (modified) (2 diffs)
• coeffs/longrat.cc (modified) (2 diffs)
• coeffs/modulop.cc (modified) (2 diffs)
• coeffs/numbers.cc (modified) (4 diffs)
• coeffs/rintegers.cc (modified) (2 diffs)
• coeffs/rmodulo2m.cc (modified) (2 diffs)
• coeffs/rmodulon.cc (modified) (2 diffs)
• coeffs/shortfl.cc (modified) (2 diffs)
• polys/ext_fields/algext.cc (modified) (2 diffs)
• polys/ext_fields/transext.cc (modified) (1 diff)
• polys/monomials/ring.cc (modified) (1 diff)

libpolys/coeffs/coeffs.h

@@ -111 +111 @@
    /// output of coeff description via Print
    void (*cfCoeffWrite)(const coeffs r, BOOLEAN details);
+
+   /// string output of coeff description
+   char* (*cfCoeffString)(const coeffs r);
 
    // ?

libpolys/coeffs/ffields.cc

@@ -819 +819 @@
 }
 
+static char* nfCoeffString(const coeffs r)
+{
+  const char *p=n_ParameterNames(r)[0];
+  char *s=(char*)omAlloc(11+1+strlen(p));
+  sprintf(s,"%d,%s",r->m_nfCharQ,p);
+  return s;
+}
+
 BOOLEAN nfInitChar(coeffs r,  void * parameter)
 {
@@ -824 +832 @@
   r->cfKillChar=nfKillChar;
   r->nCoeffIsEqual=nfCoeffIsEqual;
+  r->cfCoeffString=nfCoeffString;
 
   r->cfMult  = nfMult;

libpolys/coeffs/gnumpc.cc

@@ -458 +458 @@
 }
 
+static char* ngcCoeffString(const coeffs r)
+{
+  const char *p=n_ParameterNames(r)[0];
+  char *s=(char*)omAlloc(21+strlen(p));
+  sprintf(s,"complex,%d,%s",r->float_len,p);
+  return s;
+}
+
 BOOLEAN ngcInitChar(coeffs n, void* parameter)
 {
@@ -464 +472 @@
   n->cfKillChar = ngcKillChar;
   n->ch = 0;
+  n->cfCoeffString=ngcCoeffString;
 
   n->cfDelete  = ngcDelete;

libpolys/coeffs/gnumpfl.cc

@@ -402 +402 @@
 }
 
+static char* ngfCoeffString(const coeffs r)
+{
+  char *s=(char*)omAlloc(27);
+  snprintf(s,27,"real,%d,%d",r->float_len,r->float_len2);
+  return s;
+}
+
 BOOLEAN ngfInitChar(coeffs n, void *parameter)
 {
@@ -410 +417 @@
   n->cfSetChar = ngfSetChar;
   n->ch = 0;
+  n->cfCoeffString=ngfCoeffString;
   
   n->cfDelete  = ngfDelete;

libpolys/coeffs/longrat.cc

@@ -2826 +2826 @@
 }
 
+static char* nlCoeffString(const coeffs r)
+{
+  return omStrDup("0");
+}
+
 BOOLEAN nlInitChar(coeffs r, void*)
 {
@@ -2833 +2838 @@
   r->nCoeffIsEqual=ndCoeffIsEqual;
   r->cfKillChar = ndKillChar; /* dummy */
+  r->cfCoeffString=nlCoeffString;
 
   r->cfInitMPZ = nlInitMPZ;

libpolys/coeffs/modulop.cc

@@ -425 +425 @@
 }
 
+static char* npCoeffString(const coeffs r)
+{
+  char *s=(char*)omAlloc(11);
+  snprintf(s,11,"%d",r->ch);
+  return s;
+}
+
 BOOLEAN npInitChar(coeffs r, void* p)
 {
@@ -440 +447 @@
   r->cfKillChar=npKillChar;
   r->nCoeffIsEqual=npCoeffsEqual;
+  r->cfCoeffString=npCoeffString;
 
   r->cfMult  = npMult;

libpolys/coeffs/numbers.cc

@@ -50 +50 @@
 void   nNew(number* d) { *d=NULL; }
 void   ndDelete(number* d, const coeffs) { *d=NULL; }
+char* ndCoeffString(const coeffs r)
+{
+  char *s=(char *)omAlloc(11);snprintf(s,11,"Coeffs(%d)",r->type);
+  return s;
+}
 void   ndInpMult(number &a, number b, const coeffs r)
 {
@@ -323 +328 @@
     n->cfImPart=ndReturn0;
     n->cfDelete= ndDelete;
+    n->cfCoeffString = ndCoeffString; // should alway be changed!
     n->cfInpMult=ndInpMult;
     n->cfInpAdd=ndInpAdd;
@@ -385 +391 @@
     assume(n->nCoeffIsEqual!=NULL);
     assume(n->cfSetChar!=NULL);
+    assume(n->cfCoeffString!=ndCoeffString);
     assume(n->cfMult!=NULL);
     assume(n->cfSub!=NULL);
@@ -451 +458 @@
     if(n->cfWriteLong==NULL) Warn("cfWrite is NULL for coeff %d",t);
     if(n->cfWriteShort==NULL) Warn("cfWriteShort is NULL for coeff %d",t);
+    if(n->cfCoeffString==ndCoeffString) Warn("cfCoeffString is undefined for coeff %d",t);
 #endif
      

libpolys/coeffs/rintegers.cc

@@ -383 +383 @@
 }
 
+static char* nrzCoeffString(const coeffs r)
+{
+  return omStrDup("integer");
+}
 
 BOOLEAN nrzInitChar(coeffs r,  void *)
@@ -388 +392 @@
   assume( getCoeffType(r) == ID );
   r->nCoeffIsEqual = ndCoeffIsEqual;
+  r->cfCoeffString = nrzCoeffString;
   r->cfKillChar = ndKillChar;
   r->cfMult  = nrzMult;

libpolys/coeffs/rmodulo2m.cc

@@ -46 +46 @@
   return FALSE;
 }
+
+static char* nr2mCoeffString(const coeffs r)
+{
+  char* s = (char*) omAlloc(11+11);
+  sprintf(s,"integer,2,%lu",r->modExponent);
+  return s;
+}
+
 /* for initializing function pointers */
 BOOLEAN nr2mInitChar (coeffs r, void* p)
@@ -53 +61 @@
   r->cfKillChar    = ndKillChar; /* dummy*/
   r->nCoeffIsEqual = nr2mCoeffIsEqual;
+  r->cfCoeffString = nr2mCoeffString;
 
   r->modBase = (int_number) omAllocBin (gmp_nrz_bin);

libpolys/coeffs/rmodulon.cc

@@ -47 +47 @@
 }
 
+static char* nrnCoeffString(const coeffs r)
+{
+  char* s = (char*) omAlloc(7+11+2);
+  sprintf(s,"integer,%lu",r->modExponent);
+  return s;
+}
 
 /* for initializing function pointers */
@@ -60 +66 @@
      is a GMP number */
   r->ch = mpz_get_ui(r->modNumber);
+
+  r->cfCoeffString = nrnCoeffString;
 
   r->cfInit        = nrnInit;

libpolys/coeffs/shortfl.cc

@@ -630 +630 @@
 }
 
+static char* nrCoeffString(const coeffs r)
+{
+  return omStrDup("real");
+}
+
 BOOLEAN nrInitChar(coeffs n, void* p)
 {
@@ -638 +643 @@
   n->cfKillChar = ndKillChar; /* dummy */
   n->ch = 0;
+  n->cfCoeffString = nrCoeffString;
 
   n->cfInit = nrInit;

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)