Changeset 0ea97e in git for Singular/ipshell.cc

Timestamp:

Jul 3, 2007, 3:21:21 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

b7e8384e7eeb626a3997e284bf0432220287d24c

Parents:

f232a78ad1717a2c781b6ae4d83d9ac5600e5323

Message:

*hannes: fast_map can not map 0-ideals


git-svn-id: file:///usr/local/Singular/svn/trunk@10158 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/ipshell.cc (modified) (6 diffs)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.160 2007-06-20 09:41:43 wienand Exp $ */
+/* $Id: ipshell.cc,v 1.161 2007-07-03 13:21:21 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -716 +716 @@
       }
       tmpW.data=IDDATA(w);
-      #ifdef FAST_MAP
-      if ((tmpW.rtyp==IDEAL_CMD) && (nMap==nCopy)
-      #ifdef HAVE_PLURAL
-      && (!rIsPluralRing(currRing))
-      #endif
-      )
-      {
-        v->rtyp=IDEAL_CMD;
-        v->data=fast_map(IDIDEAL(w), IDRING(r), (ideal)theMap, currRing);
+      if (((tmpW.rtyp==IDEAL_CMD)||(tmpW.rtyp==MODUL_CMD)) && idIs0(IDIDEAL(w)))
+      {
+        v->rtyp=tmpW.rtyp;
+        v->data=idInit(IDELEMS(IDIDEAL(w)),IDIDEAL(w)->rank);
       }
       else
-      #endif
-      if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,IDRING(r),NULL,NULL,0,nMap))
-      {
-        Werror("cannot map %s(%d)",Tok2Cmdname(w->typ),w->typ);
-        omFreeBin((ADDRESS)v, sleftv_bin);
-        if (save_r!=NULL) IDMAP(w)->preimage=save_r;
-        return NULL;
+      {
+        #ifdef FAST_MAP
+        if ((tmpW.rtyp==IDEAL_CMD) && (nMap==nCopy)
+        #ifdef HAVE_PLURAL
+        && (!rIsPluralRing(currRing))
+        #endif
+        )
+        {
+          v->rtyp=IDEAL_CMD;
+          v->data=fast_map(IDIDEAL(w), IDRING(r), (ideal)theMap, currRing);
+        }
+        else
+        #endif
+        if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,IDRING(r),NULL,NULL,0,nMap))
+        {
+          Werror("cannot map %s(%d)",Tok2Cmdname(w->typ),w->typ);
+          omFreeBin((ADDRESS)v, sleftv_bin);
+          if (save_r!=NULL) IDMAP(w)->preimage=save_r;
+          return NULL;
+        }
       }
       if (save_r!=NULL)
@@ -2011 +2019 @@
         {
           R->minpoly=naInit(1);
-          lnumber n=(lnumber)R->minpoly;
-          n->z=R->algring->qideal->m[0];
+          lnumber n=(lnumber)R->minpoly;
+          n->z=R->algring->qideal->m[0];
           R->algring->qideal->m[0]=NULL;
           idDelete(&(R->algring->qideal));
@@ -2082 +2090 @@
           par_perm=(int *)omAlloc0(par_perm_size*sizeof(int));
         int i;
-        #if 0
-        // use imap:
+        #if 0
+        // use imap:
         maFindPerm(orig_ring->names,orig_ring->N,orig_ring->parameter,orig_ring->P,
           currRing->names,currRing->N,currRing->parameter, currRing->P,
           perm,par_perm, currRing->ch);
-        #else
-        // use fetch
-        if ((rPar(orig_ring)>0) && (rPar(currRing)==0))
-        {
-          for(i=si_min(rPar(orig_ring),rVar(currRing))-1;i>=0;i--) par_perm[i]=i+1;
-        }
-        else if (par_perm_size!=0)
-          for(i=si_min(rPar(orig_ring),rPar(currRing))-1;i>=0;i--) par_perm[i]=-(i+1);
-        for(i=si_min(orig_ring->N,pVariables);i>0;i--) perm[i]=i;
-        #endif
+        #else
+        // use fetch
+        if ((rPar(orig_ring)>0) && (rPar(currRing)==0))
+        {
+          for(i=si_min(rPar(orig_ring),rVar(currRing))-1;i>=0;i--) par_perm[i]=i+1;
+        }
+        else if (par_perm_size!=0)
+          for(i=si_min(rPar(orig_ring),rPar(currRing))-1;i>=0;i--) par_perm[i]=-(i+1);
+        for(i=si_min(orig_ring->N,pVariables);i>0;i--) perm[i]=i;
+        #endif
         ideal dest_id=idInit(IDELEMS(q),1);
         for(i=IDELEMS(q)-1; i>=0; i--)
@@ -2102 +2110 @@
           dest_id->m[i]=pPermPoly(q->m[i],perm,orig_ring,nMap,
                                   par_perm,par_perm_size);
-          //  PrintS("map:");pWrite(dest_id->m[i]);PrintLn();
+          //  PrintS("map:");pWrite(dest_id->m[i]);PrintLn();
           pTest(dest_id->m[i]);
         }
@@ -4785 +4793 @@
   sleftv u; memset(&u,0,sizeof(u)); u.rtyp=IDHDL; u.data=(char *) h;
             u.name=IDID(h);
-  
-  sleftv res; memset(&res,0,sizeof(res)); 
+
+  sleftv res; memset(&res,0,sizeof(res));
   if(jjPROC(&res,&u,&v))
   {