Changeset 07f2e1c in git

Timestamp:

Apr 8, 2011, 1:23:08 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

0b301eb684d2361d4bbb42f05cd0cca8ee0ea520

Parents:

387e4ad0de2bde1bd0f45d858db7cfac490e8600

Message:

enabled preimage over (same) ground rings (fix for ticket #326)

git-svn-id: file:///usr/local/Singular/svn/trunk@14121 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• maps.cc (modified) (1 diff)
• numbers.cc (modified) (2 diffs)
• ring.cc (modified) (5 diffs)
• rmodulo2m.cc (modified) (2 diffs)
• rmodulo2m.h (modified) (1 diff)
• rmodulon.cc (modified) (1 diff)

kernel/maps.cc

@@ -231 +231 @@
   if (nSetMap(theImageRing) != nCopy)
   {
-    Werror("Coefficient fields must be equal");
+    Werror("Coefficient fields/rings must be equal");
     return NULL;
   }

kernel/numbers.cc

@@ -160 +160 @@
     nInit_bigint=nr2mMapQ;
   }
-  /*----------------------ring Z / 2^m----------------*/
+  /*----------------------ring Z ----------------*/
   else if (rField_is_Ring_Z(r))
   {
@@ -364 +364 @@
      nr2mInitExp(c,r);
      n->cfInit = nr2mInit;
-     n->nCopy  = ndCopy;
+     n->nCopy  = nr2mCopy;
      n->n_Int  = nr2mInt;
      n->nAdd   = nr2mAdd;

kernel/ring.cc

@@ -923 +923 @@
           if (i!=len)
           {
-            tmpR.parameter=(char**)omReallocSize(tmpR.parameter,len*sizeof(char_ptr),i*sizeof(char_ptr));
+            tmpR.parameter=(char**)omReallocSize(tmpR.parameter,
+                                                 len*sizeof(char_ptr),
+                                                 i*sizeof(char_ptr));
           }
           tmpR.P=i;
@@ -932 +934 @@
     else if (rField_is_Ring(r1)||rField_is_Ring(r2))
     {
-      Werror("rSumInternal for rings coeffs");
-      return -1;
+      if (r1->ringtype != r2->ringtype)
+      {
+        Werror("rSumInternal not yet implemented for %s",
+               "different coefficient rings");
+        return -1;
+      }
+      else
+      {
+        tmpR.ch        = rInternalChar(r1);
+        tmpR.ringtype  = r1->ringtype;
+        if (r1->ringflaga != NULL)
+        {
+          omBin tmpBin = omGetSpecBin(sizeof(mpz_t));
+          tmpR.ringflaga = (int_number)omAllocBin(tmpBin);
+          mpz_init_set(tmpR.ringflaga, (int_number)r1->ringflaga);
+        }
+        tmpR.ringflagb = r1->ringflagb;
+        tmpR.nr2mModul = r1->nr2mModul;
+        if (r1->nrnModul != NULL)
+        {
+          omBin tmpBin = omGetSpecBin(sizeof(mpz_t));
+          tmpR.nrnModul = (int_number)omAllocBin(tmpBin);
+          mpz_init_set(tmpR.nrnModul, (int_number)r1->nrnModul);
+        }
+      }
     }
     #endif
@@ -1279 +1304 @@
       }
     }
-    else if ((k==rVar(r1)) && (k==rVar(r2))) /* r1 and r2 are "quite" the same ring */
+    else if ((k==rVar(r1)) && (k==rVar(r2))) /* r1 and r2 are "quite"
+                                                the same ring */
       /* copy r1, because we have the variables from r1 */
     {
@@ -1390 +1416 @@
       idTest((ideal)C);
 
-      nMapFunc nMap1 = nSetMap(R1); // can change something global: not usable after the next nSetMap call :(
+      nMapFunc nMap1 = nSetMap(R1); /* can change something global: not usable
+                                       after the next nSetMap call :( */
       // Create blocked C and D matrices:
       for (i=1; i<= rVar(R1); i++)
@@ -1406 +1433 @@
 
 
-      nMapFunc nMap2 = nSetMap(R2); // can change something global: not usable after the next nSetMap call :(
+      nMapFunc nMap2 = nSetMap(R2); /* can change something global: not usable
+                                       after the next nSetMap call :( */
       for (i=1; i<= rVar(R2); i++)
         for (j=i+1; j<=rVar(R2); j++)

kernel/rmodulo2m.cc

@@ -460 +460 @@
 }
 
+number nr2mCopy(number a)
+{
+  return a;
+}
+
 number nr2mMapMachineInt(number from)
 {
@@ -515 +520 @@
      && (src->ringflagb >= dst->ringflagb))
   {
-    return nr2mMapMachineInt;
+    return nr2mCopy;
   }
   if (rField_is_Ring_Z(src))

kernel/rmodulo2m.h

@@ -15 +15 @@
                                bit pattern '11..1' of length m */
 
+number  nr2mCopy        (number a);
 BOOLEAN nr2mGreaterZero (number k);
 number  nr2mMult        (number a, number b);

kernel/rmodulon.cc

@@ -428 +428 @@
     if (   (src->ringtype > 0)
         && (mpz_cmp(src->ringflaga, dst->ringflaga) == 0)
-        && (src->ringflagb == dst->ringflagb)) return nrnMapGMP;
+        && (src->ringflagb == dst->ringflagb)) return nrnCopy;
     else
     {