Changeset 2e85a1 in git

Timestamp:

Dec 14, 2012, 4:50:23 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'cdfcdb8287f66bc6070028082cbbc6eff10e609b')

Children:

6bb9d98190052a76f6d3e74e821b63ea531d8124

Parents:

0486a3f557b13057ce2046dfee2f6fabc0dad2ac

Message:

fix: rInit due to fixed Z/n^m init

File:

• Singular/ipshell.cc (modified) (3 diffs)

Singular/ipshell.cc

@@ -57 +57 @@
 #include <coeffs/mpr_complex.h>
 #include <coeffs/longrat.h>
+#include <coeffs/rmodulon.h>
 
 #include <numeric/mpr_base.h>
@@ -5216 +5217 @@
         //ringtype = 1;       // Use Z/2^ch
         cf=nInitChar(n_Z2m,(void*)(long)modExponent);
+        //TODO free modBase -> will be set inside nInitChar
       }
       else
       {
         //ringtype = 3;
-        cf=nInitChar(n_Zpn,(void*)(long)modBase);
+        ZnmInfo info;
+        info.base= modBase;
+        info.exp= modExponent;
+        cf=nInitChar(n_Znm,(void*) &info); //exponent is missing
+        //TODO free modBase -> will be set inside nInitChar
       }
     }
@@ -5227 +5233 @@
     {
       //ringtype = 2;
-      const int ch = mpz_get_ui(modBase);
-      cf=nInitChar(n_Zn,(void*)(long)ch);
+      ZnmInfo info;
+      info.base= modBase;
+      info.exp= modExponent;
+      cf=nInitChar(n_Zn,(void*) &info);
+        //TODO free modBase -> will be set inside nInitChar
     }
     assume( cf != NULL );