Changeset a507140 in git for libpolys/polys/ext_fields/algext.cc

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

f050a38f7d4a93811fa78a1a7cebd7b3a35fc044fe09a23b169ca576a8128e614973bc79bcfec5d7

Parents:

6dd33c01a9c354dd3b89fe045bffa9b635e23954

Message:

opt: nCoeffWrite/nCoeffString via nCoeffName

File:

• libpolys/polys/ext_fields/algext.cc (modified) (6 diffs)

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;
-}
-
 char* naCoeffName(const coeffs r) // currently also for tranext.
 {
@@ -1426 +1403 @@
   #endif
 
-  cf->cfCoeffString  = naCoeffString;
   cf->cfCoeffName    = naCoeffName;
 
@@ -1593 +1569 @@
 }
 
-char* n2pCoeffString(const coeffs cf)
+char* n2pCoeffName(const coeffs cf)
 {
   const char* const* p=n_ParameterNames(cf);
@@ -1602 +1578 @@
     l+=(strlen(p[i])+1);
   }
-  char *cf_s=nCoeffString(n2pRing->cf);
-  char *s=(char *)omAlloc(l+5+strlen(cf_s));
+  char *cf_s=nCoeffName(n2pRing->cf);
+  STATIC_VAR char s[200];
   s[0]='\0';
   snprintf(s,strlen(cf_s)+2,"%s",cf_s);
-  omFree(cf_s);
   char tt[2];
   tt[0]='[';
@@ -1621 +1596 @@
 }
 
-char* n2pCoeffName(const coeffs cf)
-{
-  const char* const* p=n_ParameterNames(cf);
-  int l=0;
-  int i;
-  for(i=0; i<rVar(n2pRing);i++)
-  {
-    l+=(strlen(p[i])+1);
-  }
-  char *cf_s=nCoeffString(n2pRing->cf);
-  STATIC_VAR char s[200];
-  s[0]='\0';
-  snprintf(s,strlen(cf_s)+2,"%s",cf_s);
-  omFree(cf_s);
-  char tt[2];
-  tt[0]='[';
-  tt[1]='\0';
-  strcat(s,tt);
-  tt[0]=',';
-  for(i=0; i<rVar(n2pRing);i++)
-  {
-    strcat(s,p[i]);
-    if (i+1!=rVar(n2pRing)) strcat(s,tt);
-    else { tt[0]=']'; strcat(s,tt); }
-  }
-  return s;
-}
-
 void n2pCoeffWrite(const coeffs cf, BOOLEAN details)
 {
@@ -1699 +1646 @@
   cf->is_domain=TRUE;
 
-  cf->cfCoeffString  = n2pCoeffString;
   cf->cfCoeffName    = n2pCoeffName;