Changeset 5c71ae1 in git

Timestamp:

Sep 9, 2011, 1:07:41 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

9d5ba2ee7540ee4eb709cfef410629f44c00e75b

Parents:

f9dc437c7c53a9f0de7781af406334375bb16f36

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-09 13:07:41+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:38+01:00

Message:

FIX: maEval takes the destination ring
CHG: minor cleanup

Files:

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

Singular/maps_ip.cc

@@ -8 +8 @@
 
 #include <kernel/mod2.h>
+#include <omalloc/omalloc.h>
+
+#include <coeffs/numbers.h>
+#include <coeffs/coeffs.h>
+
+#include <polys/monomials/ring.h>
+#include <polys/monomials/maps.h>
+#include <polys/matpol.h>
+#include <polys/prCopy.h>
+
+//#include <libpolys/polys/ext_fields/longtrans.h>
+// #include <kernel/longalg.h>
+
+#include <kernel/febase.h>
+#include <kernel/kstd1.h>
 
 #include "maps_ip.h"
 #include "ipid.h"
 
-#include <omalloc/omalloc.h>
-
-#include <coeffs/numbers.h>
-#include <polys/monomials/ring.h>
-// #include <polys/monomials/maps.h>
-#include <polys/matpol.h>
-#include <polys/prCopy.h>
-//#include <libpolys/polys/ext_fields/longtrans.h>
-#include <libpolys/polys/monomials/maps.h>
-#include <libpolys/coeffs/coeffs.h>
-
-// #include <kernel/longalg.h>
-
-#include <kernel/febase.h>
-#include <kernel/kstd1.h>
 
 #include "lists.h"
 #include "tok.h"
+
+/* debug output: Tok2Cmdname in maApplyFetch*/
+//#include "ipshell.h"
 
 // define this if you want to use the fast_map routine for mapping ideals
@@ -103 +106 @@
       {
         matrix s=mpNew(N,maMaxDeg_P((poly)data, preimage_r));
-        res->data=(void *)maEval(theMap,(poly)data,preimage_r,nMap,(ideal)s);
+        res->data=(void *)maEval(theMap, (poly)data, preimage_r, nMap, (ideal)s, currRing);
         idDelete((ideal *)&s);
       }
@@ -149 +152 @@
         for (i=R*C-1;i>=0;i--)
         {
-          m->m[i]=maEval(theMap,((ideal)data)->m[i],preimage_r,nMap,(ideal)s);
+          m->m[i]=maEval(theMap, ((ideal)data)->m[i], preimage_r, nMap, (ideal)s, currRing);
           pTest(m->m[i]);
         }

libpolys/polys/monomials/maps.cc

@@ -26 +26 @@
 // This is a very dirty way to "normalize" numbers w.r.t. a
 // MinPoly
-
-/* debug output: Tok2Cmdname in maApplyFetch*/
-//#include "ipshell.h"
 
 #define MAX_MAP_DEG 128

libpolys/polys/monomials/maps.h

@@ -16 +16 @@
 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 dst_ring, nMapFunc nMap, ideal s=NULL);
+poly maEval(map theMap, poly p,ring preimage_r,nMapFunc nMap, ideal s, const ring dst_r);
+
 map maCopy(map theMap, const ring dst_ring);
 
 poly maIMap(ring src_ring, ring dst_ring, poly p);
 
-/*
-BOOLEAN maApplyFetch(int what,map theMap,leftv res, leftv w,
-                     ring preimage_r, int *perm,
-                     int *par_perm,int P, nMapFunc nMap);
-*/
 void maFindPerm(char **preim_names, int preim_n, char **preim_par, int preim_p,
                 char **names,       int n,       char **par,       int nop,