Changeset 7e1643 in git for Singular/ipshell.cc

Timestamp:

Jan 16, 2007, 3:03:36 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

fe62d07e5844478d6a97ee30f1771e0a7cdcb93d

Parents:

a1c150d15d4fbd15f9b39483ca90c58c5985995a

Message:

*hannes: rCompose with q-ideal and diff. fields


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

File:

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

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.147 2007-01-15 18:19:13 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.148 2007-01-16 14:03:36 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -2034 +2034 @@
       || (R->P!=currRing->P))
       {
-      #if 1
+      #if 0
             WerrorS("coefficient fields must be equal if q-ideal !=0");
             goto rCompose_err;
@@ -2074 +2074 @@
           }
         }
-        if ((orig_ring->N!=pVariables) || (rPar(orig_ring)!=rPar(currRing)))
+        perm=(int *)omAlloc0((orig_ring->N+1)*sizeof(int));
+        if (par_perm_size!=0)
+          par_perm=(int *)omAlloc0(par_perm_size*sizeof(int));
+        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);
+        ideal dest_id=idInit(IDELEMS(q),1);
+        int i;
+        for(i=IDELEMS(q)-1; i>=0; i--)
         {
-          perm=(int *)omAlloc0((orig_ring->N+1)*sizeof(int));
-          if (par_perm_size!=0)
-            par_perm=(int *)omAlloc0(par_perm_size*sizeof(int));
-          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);
+          dest_id->m[i]=pPermPoly(q->m[i],perm,orig_ring,nMap,
+                                  par_perm,par_perm_size);
+          pTest(dest_id-m[i]);
         }
-        sleftv tmpW,tmpR;
-        memset(&tmpW,0,sizeof(sleftv));
-        tmpW.rtyp=IDEAL_CMD;
-        tmpW.data=q;
-        if ((bo=maApplyFetch(IMAP_CMD,NULL,&tmpR,&tmpW, orig_ring,
-                         perm,par_perm,par_perm_size,nMap)))
-        {
-          WerrorS("cannot map q-ideal");
-        }
+        R->qideal=dest_id;
         if (perm!=NULL)
           omFreeSize((ADDRESS)perm,(orig_ring->N+1)*sizeof(int));
@@ -2097 +2094 @@
           omFreeSize((ADDRESS)par_perm,par_perm_size*sizeof(int));
         rChangeCurrRing(orig_ring);
-        if (bo) goto rCompose_err;
-        R->qideal=(ideal)tmpR.data;
       #endif
       }