Fixing dirty hacks (map -> ideal) for fast_map

Singular · May 27, 2015 · bf36c43 · bf36c43
1 parent 794d7ba
commit bf36c43
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/Singular/ipshell.cc b/Singular/ipshell.cc
@@ -67,6 +67,7 @@
 
 #include <math.h>
 #include <ctype.h>
+#include <algorithm>
 
 // define this if you want to use the fast_map routine for mapping ideals
 #define FAST_MAP
@@ -780,7 +781,13 @@ leftv iiMap(map theMap, const char * what)
         )
         {
           v->rtyp=IDEAL_CMD;
-          v->data=fast_map(IDIDEAL(w), src_ring, (ideal)theMap, currRing);
+
+          char *tmp = (char*)1;
+          std::swap(tmp, theMap->preimage); // map gets 1 as its rank (as an ideal)
+          v->data=fast_map(IDIDEAL(w), src_ring, (ideal)theMap, currRing); // FIXME: this dirty hack from original Singular!
+          std::swap(tmp, theMap->preimage); // map gets its preimage back
+          assume( tmp == (char*)1 );
+
         }
         else
 #endif

diff --git a/Singular/maps_ip.cc b/Singular/maps_ip.cc
@@ -43,6 +43,7 @@
 #include <polys/monomials/maps.h>
 #endif
 
+#include <algorithm>
 
 /*2
 * maps the expression w to res,
@@ -390,7 +391,13 @@ poly pSubstPoly(poly p, int var, poly image)
   {
     ideal src_id=idInit(1,1);
     src_id->m[0]=p;
-    ideal res_id=fast_map(src_id,currRing,(ideal)theMap,currRing);
+
+    char *tmp = (char*)1;
+    std::swap(tmp, theMap->preimage); // map gets 1 as its rank (as an ideal)
+    ideal res_id=fast_map(src_id,currRing,(ideal)theMap,currRing); // FIXME: this dirty hack from original Singular!
+    std::swap(tmp, theMap->preimage); // map gets its preimage back
+    assume( tmp == (char*)1 );
+
     res=res_id->m[0];
     res_id->m[0]=NULL; idDelete(&res_id);
     src_id->m[0]=NULL; idDelete(&src_id);

diff --git a/libpolys/polys/monomials/maps.h b/libpolys/polys/monomials/maps.h
@@ -8,10 +8,9 @@
 */
 #include <coeffs/coeffs.h>
 #include <polys/monomials/ring.h>
-//#include <kernel/ideals.h>
+//#include <polys/simpleideals.h>
 
-struct sip_smap;
-typedef struct sip_smap *         map;
+struct sip_smap; typedef struct sip_smap *         map;
 
 // poly maEval(map theMap, poly p, ring dst_ring, nMapFunc nMap, ideal s=NULL);
 poly maEval(map theMap, poly p,ring preimage_r,nMapFunc nMap, ideal s, const ring dst_r);
@@ -29,4 +28,5 @@ ideal  idSubstPoly(ideal id, int n, poly e);
 poly p_MinPolyNormalize(poly p, const ring r);
 int maMaxDeg_P(poly p,ring preimage_r);
 int maMaxDeg_Ma(ideal a,ring preimage_r);
+
 #endif
diff --git a/libpolys/polys/simpleideals.h b/libpolys/polys/simpleideals.h
@@ -42,6 +42,8 @@ struct sip_smap
   int ncols;
 };
 
+typedef struct sip_smap *         map;
+
 struct sideal_list;
 typedef struct sideal_list *      ideal_list;