Changeset da0565 in git

Timestamp:

Mar 16, 2012, 7:01:20 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

cd9796d49b820bd9ecc81b49dc04073e0bbf6012

Parents:

4d94c97313de2ce07f4bfae84308b31c1294a569

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-16 19:01:20+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-16 19:36:36+01:00

Message:

fix "equal coeffs test" in preimage.

Files:

• kernel/preimage.cc (modified) (4 diffs)
• libpolys/polys/ext_fields/algext.cc (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (1 diff)

kernel/preimage.cc

@@ -92 +92 @@
   }
 
-  if (n_SetMap(theImageRing->cf,dst_r->cf) != ndCopyMap)
+  assume(n_SetMap(theImageRing->cf, dst_r->cf) == ndCopyMap);
+
+  if (theImageRing->cf != dst_r->cf)
   {
+    /// TODO: there might be extreme cases where this doesn't hold...
     Werror("Coefficient fields/rings must be equal");
     return NULL;
   }
 
+  const ring save_ring = currRing; if (currRing!=tmpR) rChangeCurrRing(tmpR); // due to kStd
+  
   if (id==NULL)
     j = 0;
@@ -123 +128 @@
     temp1->m[i] = p;
   }
-  idTest(temp1);
+  id_Test(temp1, tmpR);
   for (i=sourcering->N;i<sourcering->N+j0;i++)
   {
@@ -137 +142 @@
   }
   // we ignore here homogenity - may be changed later:
+
   temp2 = kStd(temp1,NULL,isNotHomog,NULL);
+
   id_Delete(&temp1,tmpR);
   for (i=0;i<IDELEMS(temp2);i++)
@@ -167 +174 @@
   id_Delete(&temp2, tmpR);
   idSkipZeroes(temp1);
+
+  if (currRing!=save_ring) rChangeCurrRing(save_ring);
+  
   rDelete(tmpR);
   return temp1;

libpolys/polys/ext_fields/algext.cc

@@ -705 +705 @@
   /* dst is expected to be an algebraic field extension */
   assume(getCoeffType(dst) == ID);
+
+  if( src == dst ) return ndCopyMap;
   
   int h = 0; /* the height of the extension tower given by dst */

libpolys/polys/ext_fields/transext.cc

@@ -1217 +1217 @@
   assume(getCoeffType(dst) == ID);
 
+  if( src == dst ) return ndCopyMap;
+
   int h = 0; /* the height of the extension tower given by dst */
   coeffs bDst = nCoeff_bottom(dst, h); /* the bottom field in the tower dst */