Changeset bf36c4 in git

Timestamp:

May 27, 2015, 8:09:51 PM (8 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

49b7480ebc6b89c61ea6555f8f339873abbac069

Parents:

794d7ba210aeabf2fc6caef7b75934cab4be8acf

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-05-27 20:09:51+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-05-27 21:24:40+02:00

Message:

Fixing dirty hacks (map -> ideal) for fast_map

Files:

• Singular/ipshell.cc (modified) (2 diffs)
• Singular/maps_ip.cc (modified) (2 diffs)
• libpolys/polys/monomials/maps.h (modified) (2 diffs)
• libpolys/polys/simpleideals.h (modified) (1 diff)

Singular/ipshell.cc

@@ -68 +68 @@
 #include <math.h>
 #include <ctype.h>
+#include <algorithm>
 
 // define this if you want to use the fast_map routine for mapping ideals
@@ -781 +782 @@
         {
           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

Singular/maps_ip.cc

@@ -44 +44 @@
 #endif
 
+#include <algorithm>
 
 /*2
@@ -391 +392 @@
     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);

libpolys/polys/monomials/maps.h

@@ -9 +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);
@@ -30 +29 @@
 int maMaxDeg_P(poly p,ring preimage_r);
 int maMaxDeg_Ma(ideal a,ring preimage_r);
+
 #endif

libpolys/polys/simpleideals.h

@@ -42 +42 @@
   int ncols;
 };
+
+typedef struct sip_smap *         map;
 
 struct sideal_list;