Changeset 83a1714 in git for Singular

Timestamp:

Sep 29, 2011, 6:29:37 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

172bbb269fb8ec8ad467f6d62ee5ea9c0151b3ba

Parents:

bebd746739b98e1580e2d7b75cf326c9350f2a7b

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-29 18:29:37+02:00

git-committer:

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

Message:

FIX: started fixing fetch & imap for transcendental/alg. extensions: "longalg missing 2"

File:

• Singular/maps_ip.cc (modified) (5 diffs)

Singular/maps_ip.cc

@@ -32 +32 @@
 
 /* debug output: Tok2Cmdname in maApplyFetch*/
-//#include "ipshell.h"
+#include "ipshell.h"
 
 // define this if you want to use the fast_map routine for mapping ideals
@@ -55 +55 @@
   int i;
   int N = preimage_r->N;
-  //Print("N=%d what=%s ",N,Tok2Cmdname(what));
-  //if (perm!=NULL) for(i=1;i<=N;i++) Print("%d -> %d ",i,perm[i]);
-  //PrintS("\n");
-  //Print("P=%d ",P);
-  //if (par_perm!=NULL) for(i=0;i<P;i++) Print("%d -> %d ",i,par_perm[i]);
-  //PrintS("\n");
+#if 0
+  Print("N=%d what=%s ",N,Tok2Cmdname(what));
+  if (perm!=NULL) for(i=1;i<=N;i++) Print("%d -> %d ",i,perm[i]);
+  PrintS("\n");
+  Print("P=%d ",P);
+  if (par_perm!=NULL) for(i=0;i<P;i++) Print("%d -> %d ",i,par_perm[i]);
+  PrintS("\n");
+#endif
+
   void *data=w->Data();
   res->rtyp = w->rtyp;
@@ -68 +71 @@
       if (P!=0)
       {
-        WerrorS("Sorry 'napPermNumber' was lost in the refactoring process (due to Frank): needs to be fixed");
-        return TRUE;
-#if 0        
-        res->data=(void *)napPermNumber((number)data,par_perm,P, preimage_r);
+//        WerrorS("Sorry 'napPermNumber' was lost in the refactoring process (due to Frank): needs to be fixed");
+//        return TRUE;
+#if 1
+// poly n_PermNumber(const number z, const int *par_perm, const int OldPar, const ring src, const ring dst);
+        res->data= (void *) n_PermNumber((number)data, par_perm, P, preimage_r, currRing);
 #endif
         res->rtyp=POLY_CMD;
@@ -80 +84 @@
       else
       {
-        res->data=(void *)nMap((number)data, preimage_r->cf, currRing->cf);
+        assume( nMap != NULL );
+         
+        number a = nMap((number)data, preimage_r->cf, currRing->cf);
+        
+ 
         if (nCoeff_is_Extension(currRing->cf))
         {
-          number a=(number)res->data;
-          number one=nInit(1);
-          number product = nMult(a,one );
+          n_Normalize(a, currRing->cf); // ???
+/*
+          number a = (number)res->data;
+          number one = nInit(1);
+          number product = nMult(a, one );
           nDelete(&one);
           nDelete(&a);
           res->data=(void *)product;
+ */
         }
         #ifdef LDEBUG
-        nTest((number) res->data);
+        n_Test(a, currRing->cf);
         #endif
+        res->data=(void *)a;
+
       }
       break;
@@ -101 +114 @@
       else
       if ((what==IMAP_CMD) || ((what==FETCH_CMD) /* && (nMap!=nCopy)*/))
-        res->data=(void *)p_PermPoly((poly)data,perm,preimage_r,currRing,
-                        nMap,par_perm,P);
+        res->data=(void *)p_PermPoly((poly)data,perm,preimage_r,currRing, nMap,par_perm,P);
       else /*if (what==MAP_CMD)*/
       {