Changeset e1375d in git for kernel/rmodulo2m.cc

Timestamp:

Apr 11, 2011, 12:23:48 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

526e40d402c852186bd63157812aa8c82bb611f6

Parents:

0f93f5f4a65af4c121349d23f99a0869a0a9be2d

Message:

changed mapping behaviour from Z/2^m*Z to Z/2^n*Z

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

File:

• kernel/rmodulo2m.cc (modified) (2 diffs)

kernel/rmodulo2m.cc

@@ -468 +468 @@
 number nr2mCopy(number a)
 {
-  /* This method is obviously redundant. But in /kernel/maps.cc a check
-     is performed whether nSetMap(some ring) and nCopy are identical
-     function pointers. For that check to work correctly, we need to
-     implement a version of nCopy for rings of the form Z/2^m*Z, i.e.
-     this method. */
-  return nr2mMapMachineInt(a);
+  return a;
 }
 
@@ -523 +518 @@
 {
   if (rField_is_Ring_2toM(src)
-     && (src->ringflagb >= dst->ringflagb))
+     && (src->ringflagb <= dst->ringflagb))
   {
     return nr2mCopy;
+  }
+  if (rField_is_Ring_2toM(src)
+     && (src->ringflagb > dst->ringflagb))
+  {
+    return nr2mMapMachineInt;
   }
   if (rField_is_Ring_Z(src))