Changeset 811826 in git for Singular/maps.cc

Timestamp:

Mar 9, 1999, 1:28:50 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

d78e6e2c82ab8bd96284f77386c71eff6908b71a

Parents:

41442f095ba5a5301108857c89ac604ccfdcf0f3

Message:

* maFindPerm: no permutation from Fq parameter to other vars/parameter
  (if they have the same name) -- r->ch new argument to maFindPerm.


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

File:

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

Singular/maps.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: maps.cc,v 1.13 1999-03-08 18:11:48 Singular Exp $ */
+/* $Id: maps.cc,v 1.14 1999-03-09 12:28:49 obachman Exp $ */
 /*
 * ABSTRACT - the mapping of polynomials to other rings
@@ -280 +280 @@
 
 void maFindPerm(char **preim_names, int preim_n, char **preim_par, int preim_p,
-                char **names,       int n,       char **par,       int nop,
-                int * perm, int *par_perm)
+                char **names,       int n,       char **par,       int nop, 
+                int * perm, int *par_perm, int ch)
 {
   int i,j;
@@ -298 +298 @@
       }
     }
-    if ((perm[i+1]==0)&&(par!=NULL))
+    if ((perm[i+1]==0)&&(par!=NULL)
+        // do not consider par of Fq
+         && (ch < 2))
     {
       for(j=0; j<nop; j++)
@@ -354 +356 @@
   int *perm=(int *)Alloc0((r->N+1)*sizeof(int));
   //int *par_perm=(int *)Alloc0(rPar(r)*sizeof(int));
-  maFindPerm(r->names,r->N, r->parameter, rPar(r),
-             currRing->names,currRing->N,currRing->parameter, rPar(currRing),
-             perm,NULL/*par_perm*/);
+  maFindPerm(r->names,r->N, r->parameter, r->P,
+             currRing->names,currRing->N,currRing->parameter, currRing->P,
+             perm,NULL, currRing->ch);
   poly res=pPermPoly(p,perm,r/*,par_perm,rPar(r)*/);
   Free((ADDRESS)perm,(r->N+1)*sizeof(int));