Changeset c2ff58d in git

Timestamp:

Jan 23, 2007, 4:19:46 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'd1ba061a762c62d3a25159d8da8b6e17332291fa')

Children:

b788ab439857884880c28825ed58ad95b56e2587

Parents:

a2c203153a35ac48102771cb18fc358aab446969

Message:

*hannes: rCompose with minpoly


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

File:

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

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.152 2007-01-19 17:31:42 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.153 2007-01-23 15:19:46 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -2080 +2080 @@
           par_perm=(int *)omAlloc0(par_perm_size*sizeof(int));
         int i;
-        //#if 0
+        #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
+        #else
         // use fetch
-        if (par_perm_size!=0)
+        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
+        #endif
         ideal dest_id=idInit(IDELEMS(q),1);
         for(i=IDELEMS(q)-1; i>=0; i--)