Changeset f8735a in git

Timestamp:

Aug 16, 2016, 11:23:03 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

cb0e293d0bd47f97ba6566b4dab0729e6fd02142

Parents:

e54c6ee3701e4ccbb9bbd08384f7599b03ce2d74

Message:

Singular_4_1: some new CoeffString routines

Location:

libpolys/coeffs

Files:

• longrat.cc (modified) (1 diff)
• modulop.cc (modified) (1 diff)
• rintegers.cc (modified) (1 diff)
• rmodulo2m.cc (modified) (1 diff)
• rmodulon.cc (modified) (1 diff)

libpolys/coeffs/longrat.cc

@@ -3149 +3149 @@
 {
   //return omStrDup(nlCoeffName(r));
+#ifdef SINGULAR_4_1
+  if (r->cfDiv==nlDiv) return omStrDup("QQ");
+  else                 return omStrDup("ZZ");
+#else
   if (r->cfDiv==nlDiv) return omStrDup("0");
   else                 return omStrDup("integer");
+#endif
 }
 

libpolys/coeffs/modulop.cc

@@ -470 +470 @@
 static char* npCoeffString(const coeffs r)
 {
+#ifdef SINGULAR_4_1
+  char *s=(char*)omAlloc(14);
+  snprintf(s,14,"ZZ/%d",r->ch);
+#else
   char *s=(char*)omAlloc(11);
   snprintf(s,11,"%d",r->ch);
+#endif  
   return s;
 }

libpolys/coeffs/rintegers.cc

@@ -466 +466 @@
 static char* nrzCoeffString(const coeffs)
 {
+#ifdef SINGULAR_4_1
+  return omStrDup("ZZ");
+#else
   return omStrDup("integer");
+#endif  
 }
 

libpolys/coeffs/rmodulo2m.cc

@@ -107 +107 @@
 static char* nr2mCoeffString(const coeffs r)
 {
+  // r->modExponent <=bitsize(long)
   char* s = (char*) omAlloc(11+11);
+#ifdef SINGULAR_4_1
+  sprintf(s,"ZZ/(2^%lu)",r->modExponent);
+#else
   sprintf(s,"integer,2,%lu",r->modExponent);
+#endif
   return s;
 }

libpolys/coeffs/rmodulon.cc

@@ -96 +96 @@
   char* b = (char*) omAlloc(l);
   b= mpz_get_str (b, 10, r->modBase);
+  #ifdef SINGULAR_4_1
+  char* s = (char*) omAlloc(15+l);
+  if (nCoeff_is_Ring_ModN(r)) sprintf(s,"ZZ/bigint(%s)",b);
+  else /*if (nCoeff_is_Ring_PtoM(r))*/ sprintf(s,"ZZ/(bigint(%s)^%lu)",b,r->modExponent);
+  #else
   char* s = (char*) omAlloc(7+2+10+l);
   if (nCoeff_is_Ring_ModN(r)) sprintf(s,"integer,%s",b);
   else /*if (nCoeff_is_Ring_PtoM(r))*/ sprintf(s,"integer,%s^%lu",b,r->modExponent);
+  #endif
   omFreeSize(b,l);
   return s;