Changeset 113a80 in git

Timestamp:

Jul 9, 2018, 2:40:55 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4b5b3658c8e1f3c4b2725057e56be417eb838a72

Parents:

43fa86cc32c42433e618d6c2978915bf8a580e66

Message:

nFindCoeffByName for polys over Z/n (n_Zn and n_Znm)

Files:

• Singular/misc_ip.cc (modified) (2 diffs)
• libpolys/coeffs/rmodulon.cc (modified) (2 diffs)
• libpolys/coeffs/rmodulon.h (modified) (1 diff)

Singular/misc_ip.cc

@@ -31 +31 @@
 #include "coeffs/flintcf_Q.h"
 #include "coeffs/flintcf_Zn.h"
+#include "coeffs/rmodulon.h"
 
 #include "polys/ext_fields/algext.h"
@@ -1409 +1410 @@
     h=enterid("ZZ",0/*level*/, CRING_CMD,&(basePack->idroot),FALSE /*init*/,FALSE /*search*/);
     IDDATA(h)=(char*)nInitChar(n_Z,NULL);
+    nRegisterCfByName(nrnInitCfByName,n_Zn); // and n_Znm
     iiAddCproc("kernel","crossprod",FALSE,iiCrossProd);
     iiAddCproc("kernel","Float",FALSE,iiFloat);

libpolys/coeffs/rmodulon.cc

@@ -55 +55 @@
 }
 
+coeffs nrnInitCfByName(char *s,n_coeffType n)
+{
+  const int start_len=strlen("ZZ/bigint(");
+  if (strncmp(s,"ZZ/bigint(",start_len)==0)
+  {
+    s+=start_len;
+    mpz_t z;
+    mpz_init(z);
+    s=nEatLong(s,z);
+    ZnmInfo info;
+    info.base=z;
+    info.exp= 1;
+    while ((*s!='\0') && (*s!=')')) s++;
+    // expect ")" or ")^exp"
+    if (*s=='\0') { mpz_clear(z); return NULL; }
+    if (((*s)==')') && (*(s+1)=='^'))
+    {
+      s=s+2;
+      s=nEati(s,&(info.exp),0);
+      return nInitChar(n_Znm,(void*) &info);
+    }
+    else
+      return nInitChar(n_Zn,(void*) &info);
+  }
+  else return NULL;
+}
+
 static char* nrnCoeffName_buff=NULL;
 static char* nrnCoeffName(const coeffs r)
@@ -60 +87 @@
   if(nrnCoeffName_buff!=NULL) omFree(nrnCoeffName_buff);
   size_t l = (size_t)mpz_sizeinbase(r->modBase, 10) + 2;
-  nrnCoeffName_buff=(char*)omAlloc(l+6);
+  nrnCoeffName_buff=(char*)omAlloc(l+12);
   char* s = (char*) omAlloc(l);
   s= mpz_get_str (s, 10, r->modBase);
   if (nCoeff_is_Ring_ModN(r))
-    snprintf(nrnCoeffName_buff,l+6,"ZZ/%s",s);
+    snprintf(nrnCoeffName_buff,l+6,"ZZ/bigint(%s)",s);
   else if (nCoeff_is_Ring_PtoM(r))
-    snprintf(nrnCoeffName_buff,l+6,"ZZ/%s^%lu",s,r->modExponent);
+    snprintf(nrnCoeffName_buff,l+6,"ZZ/bigint(%s)^%lu",s,r->modExponent);
   omFreeSize((ADDRESS)s, l);
   return nrnCoeffName_buff;

libpolys/coeffs/rmodulon.h

@@ -16 +16 @@
 #include "coeffs/rintegers.h"
 
-typedef struct { mpz_ptr base;  unsigned long exp; } ZnmInfo;
+typedef struct { mpz_ptr base;  int exp; } ZnmInfo;
 
 BOOLEAN nrnInitChar    (coeffs r, void*);
 number nrnMapGMP(number from, const coeffs /*src*/, const coeffs dst);/*for SAGE*/
 nMapFunc nrnSetMap(const coeffs src, const coeffs dst);/* for SAGE, better: n_setMap*/
-
+coeffs nrnInitCfByName(char *name,n_coeffType n);
 
 #endif