Changeset 8476c2 in git for libpolys/polys/monomials/ring.cc

Timestamp:

Sep 30, 2011, 3:19:52 PM (13 years ago)

Author:

Burcin Erocal <burcin@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

a06b989486851e55685f4102903f531916e6773a

Parents:

5d5d7966c8304cc858a123c944ed894289e9facf

git-author:

Burcin Erocal <burcin@erocal.org>2011-09-30 15:19:52+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:52+01:00

Message:

Adapt charstr to the new ring data structure.

File:

• libpolys/polys/monomials/ring.cc (modified) (2 diffs)

libpolys/polys/monomials/ring.cc

@@ -609 +609 @@
   }
 #endif
-  if (rParameter(r)==NULL)
-  {
-    i=r->cf->ch;
-    if(i==-1)
-      s=omStrDup("real");                    /* R */
-    else
-    {
-      s=(char *)omAlloc(MAX_INT_LEN+1);
-      sprintf(s,"%d",i);                   /* Q, Z/p */
-    }
+  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 **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))
   {
-    s=(char *)omAlloc(21+strlen(rParameter(r)[0]));
-    sprintf(s,"complex,%d,%s",r->float_len,rParameter(r)[0]);   /* C */
+    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;
   }
@@ -634 +648 @@
   s=(char *)omAlloc((long)(l+MAX_INT_LEN+1));
   s[0]='\0';
-  if (r->cf->ch<0)       sprintf(s,"%d",-r->cf->ch); /* Fp(a) */
-  else if (r->cf->ch==1) sprintf(s,"0");         /* Q(a)  */
-  else
-  {
-    sprintf(s,"%d,%s",r->cf->ch,rParameter(r)[0]); /* GF(q)  */
-    return s;
-  }
+  snprintf(s,MAX_INT_LEN+1,"%d",r->cf->ch); /* Fp(a) or Q(a) */
   char tt[2];
   tt[0]=',';