Changeset c7ae4d in git for libpolys

Timestamp:

Aug 31, 2016, 12:30:31 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

e180f5613c396d33aa3316cd450d3a1e80d69129

Parents:

7e2307f3485ab92e550254c1212dafc2940b41ea

Message:

Singular_4_1: parent(..)

Location:

libpolys

Files:

• coeffs/numbers.cc (modified) (5 diffs)
• polys/ext_fields/algext.cc (modified) (4 diffs)

libpolys/coeffs/numbers.cc

@@ -55 +55 @@
 {
   char *s=(char *)omAlloc(11);snprintf(s,11,"Coeffs(%d)",r->type);
+  return s;
+}
+static char* ndCoeffName(const coeffs r)
+{
+  static char s[20];
+  snprintf(s,11,"Coeffs(%d)",r->type);
   return s;
 }
@@ -151 +157 @@
 static number ndGetNumerator(number &a,const coeffs r) { return r->cfCopy(a,r); }
 static int    ndSize(number a, const coeffs r)         { return (int)r->cfIsZero(a,r)==FALSE; }
-static char * ndCoeffName(const coeffs r)              { return r->cfCoeffString(r); }
 
 static void ndClearContent(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs r)
@@ -351 +356 @@
     n->cfAnn = ndAnn;
     n->cfCoeffString = ndCoeffString; // should alway be changed!
+    n->cfCoeffName = ndCoeffName; // should alway be changed!
     n->cfInpMult=ndInpMult;
     n->cfInpAdd=ndInpAdd;
@@ -362 +368 @@
     n->cfMPZ = ndMPZ;
     n->cfPower = ndPower;
-    n->cfCoeffName = ndCoeffName;
 
     n->cfKillChar = ndKillChar; /* dummy */
@@ -419 +424 @@
     assume(n->cfSetChar!=NULL);
     assume(n->cfCoeffString!=ndCoeffString);
+    assume(n->cfCoeffName!=ndCoeffName);
     assume(n->cfMult!=NULL);
     assume(n->cfSub!=NULL);

libpolys/polys/ext_fields/algext.cc

@@ -1361 +1361 @@
 }
 
+char* naCoeffName(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);
+  }
+  static char s[200];
+  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;
+}
+
 number  naChineseRemainder(number *x, number *q,int rl, BOOLEAN /*sym*/,CFArray &inv_cache,const coeffs cf)
 {
@@ -1414 +1437 @@
   #endif
 
-  cf->cfCoeffString = naCoeffString;
+  cf->cfCoeffString  = naCoeffString;
+  cf->cfCoeffName    = naCoeffName;
 
   cf->cfGreaterZero  = naGreaterZero;
@@ -1586 +1610 @@
 }
 
-char* n2pCoeffString(const coeffs r) // currently also for tranext.
-{
-  const char* const* p=n_ParameterNames(r);
+char* n2pCoeffString(const coeffs cf)
+{
+  const char* const* p=n_ParameterNames(cf);
   int l=0;
   int i;
-  for(i=0; i<n_NumberOfParameters(r);i++)
+  for(i=0; i<rVar(n2pRing);i++)
   {
     l+=(strlen(p[i])+1);
   }
-  char *s=(char *)omAlloc(l+10+1);
+  char *cf_s=nCoeffString(n2pRing->cf);
+  char *s=(char *)omAlloc(l+5+strlen(cf_s));
   s[0]='\0';
-  snprintf(s,10+1,"%d",r->ch); /* Fp(a) or Q(a) */
+  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;
+}
+
+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);
+  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';
-  for(i=0; i<n_NumberOfParameters(r);i++)
-  {
-    strcat(s,tt);
+  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;
@@ -1659 +1716 @@
   cf->is_domain=TRUE;
 
-  cf->cfCoeffString = n2pCoeffString;
+  cf->cfCoeffString  = n2pCoeffString;
+  cf->cfCoeffName    = n2pCoeffName;
 
   cf->cfGreaterZero  = naGreaterZero;