Changeset a2da9e in git

Timestamp:

Nov 9, 2012, 4:10:10 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6ad7e617261f153fdb030cff36bad4f1639b95e9

Parents:

6ac003ed46c225e8782cb5a59e16ba27d4502496

Message:

fix: init of coeffs in rings

Files:

• Singular/ipshell.cc (modified) (4 diffs)
• libpolys/coeffs/rmodulon.cc (modified) (1 diff)

Singular/ipshell.cc

@@ -5044 +5044 @@
 {
 #ifdef HAVE_RINGS
-  unsigned int ringtype = 0;
+  //unsigned int ringtype = 0;
   int_number modBase = NULL;
   unsigned int modExponent = 1;
@@ -5212 +5212 @@
         /* this branch should be active for modExponent = 2..32 resp. 2..64,
            depending on the size of a long on the respective platform */
-        ringtype = 1;       // Use Z/2^ch
+        //ringtype = 1;       // Use Z/2^ch
         cf=nInitChar(n_Z2m,(void*)(long)modExponent);
       }
       else
       {
-        ringtype = 3;
-        cf=nInitChar(n_Zn,(void*)(long)modBase);
+        //ringtype = 3;
+        cf=nInitChar(n_Zpn,(void*)(long)modBase);
       }
     }
@@ -5224 +5224 @@
     else if (cf == NULL)
     {
-      ringtype = 2;
+      //ringtype = 2;
       const int ch = mpz_get_ui(modBase);
       cf=nInitChar(n_Zn,(void*)(long)ch);
@@ -5287 +5287 @@
   R->cf = cf;
 
-#ifdef HAVE_RINGS
-  // the following should have beed set already into cf, right?!
-//  R->cf->ringtype = ringtype;
-//  R->cf->modBase = modBase;
-//  R->cf->modExponent = modExponent;
-#endif
-
   /* names and number of variables-------------------------------------*/
   {

libpolys/coeffs/rmodulon.cc

@@ -40 +40 @@
 {
   /* test, if r is an instance of nInitCoeffs(n,parameter) */
-  return (n==n_Zn) && (mpz_cmp(r->modNumber,(mpz_ptr)parameter)==0);
+  return (n==n_Zn) && (mpz_cmp_ui(r->modNumber,(long)parameter)==0);
 }