Changeset 811826 in git

Timestamp:

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

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

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

Location:

Singular

Files:

• LIB/presolve.lib (modified) (2 diffs)
• fglm.cc (modified) (3 diffs)
• fglmhom.cc (modified) (2 diffs)
• fglmzero.cc (modified) (2 diffs)
• ipshell.cc (modified) (2 diffs)
• maps.cc (modified) (4 diffs)
• maps.h (modified) (2 diffs)

Singular/LIB/presolve.lib

@@ -1 @@
-// $Id: presolve.lib,v 1.5 1998-05-14 18:45:12 Singular Exp $
+// $Id: presolve.lib,v 1.6 1999-03-09 12:28:50 obachman Exp $
 //system("random",787422842);
 //(GMG), last modified 97/10/07 by GMG
 ///////////////////////////////////////////////////////////////////////////////
 
-version="$Id: presolve.lib,v 1.5 1998-05-14 18:45:12 Singular Exp $";
+version="$Id: presolve.lib,v 1.6 1999-03-09 12:28:50 obachman Exp $";
 info="
 LIBRARY:  presolve.lib     PROCEDURES FOR PRE-SOLVING POLYNOMIAL EQUATIONS
@@ -70 +70 @@
 "USAGE:   elimlinearpart(i[,n]);  i=ideal, n=integer
 RETURN:  list of of 5 objects:
-         [1]: (interreduced) ideal obtained from i by eliminating (sbstituting)
+         [1]: (interreduced) ideal obtained from i by eliminating (substituting)
               from the first n variables those which appear in a linear part
               of i, by putting this part into triangular form

Singular/fglm.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglm.cc,v 1.16 1999-03-08 18:11:39 Singular Exp $
+// $Id: fglm.cc,v 1.17 1999-03-09 12:28:45 obachman Exp $
 
 /****************************************
@@ -144 +144 @@
     else
         pperm= NULL;
-    maFindPerm( sring->names, nvar, sring->parameter, npar, dring->names, nvar, dring->parameter, npar, vperm, pperm );
+    maFindPerm( sring->names, nvar, sring->parameter, npar, 
+                dring->names, nvar, dring->parameter, npar, vperm, pperm, 
+                dring->ch);
     for ( k= nvar; (k > 0) && (state == FglmOk); k-- )
         if ( vperm[k] <= 0 ) {
@@ -181 +183 @@
         // check if dring->qideal is contained in sring->qideal:
         int * dsvperm = (int *)Alloc0( (nvar+1)*sizeof( int ) );
-        maFindPerm( dring->names, nvar, NULL, 0, sring->names, nvar, NULL, 0, dsvperm, NULL );
-        nSetMap( rInternalChar(dring), dring->parameter, npar, dring->minpoly );
+        maFindPerm( dring->names, nvar, NULL, 0, sring->names, nvar, NULL, 0, 
+                    dsvperm, NULL, sring->ch);
+        nSetMap(rInternalChar(dring), dring->parameter, npar, dring->minpoly);
         ideal dqins = idInit( IDELEMS( dring->qideal ), 1 );
         for ( k= IDELEMS( dring->qideal )-1; k >= 0; k-- )

Singular/fglmhom.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmhom.cc,v 1.11 1998-09-24 09:59:39 Singular Exp $
+// $Id: fglmhom.cc,v 1.12 1999-03-09 12:28:46 obachman Exp $
 
 /****************************************
@@ -326 +326 @@
     // Map the sourceHeads to the destRing
     int * vperm = (int *)Alloc( (sourceRing->N + 1)*sizeof(int) );
-    maFindPerm( sourceRing->names, sourceRing->N, NULL, 0, currRing->names, currRing->N, NULL, 0, vperm, NULL );
+    maFindPerm( sourceRing->names, sourceRing->N, NULL, 0, currRing->names, 
+                currRing->N, NULL, 0, vperm, NULL, currRing->ch);
     nSetMap( sourceRing->ch, sourceRing->parameter, sourceRing->P, sourceRing->minpoly );
     for ( s= IDELEMS( sourceIdeal ) - 1; s >= 0; s-- ) {

Singular/fglmzero.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmzero.cc,v 1.21 1999-03-08 18:11:41 Singular Exp $
+// $Id: fglmzero.cc,v 1.22 1999-03-09 12:28:47 obachman Exp $
 
 /****************************************
@@ -139 +139 @@
 
     int * perm = (int *)Alloc0( (_nfunc+1)*sizeof( int ) );
-    maFindPerm( source->names, source->N, NULL, 0, currRing->names, currRing->N, NULL, 0, perm, NULL );
-    nSetMap( rInternalChar(source), source->parameter,
-       rPar(source), source->minpoly );
+    maFindPerm( source->names, source->N, NULL, 0, currRing->names, 
+                currRing->N, NULL, 0, perm, NULL , currRing->ch);
+    nSetMap( rInternalChar(source), source->parameter, source->P, 
+             source->minpoly );
 
     matHeader ** temp = (matHeader **)Alloc( _nfunc*sizeof( matHeader * ));

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.35 1999-03-08 18:11:46 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.36 1999-03-09 12:28:48 obachman Exp $ */
 /*
 * ABSTRACT:
@@ -574 +574 @@
                  IDRING(r)->minpoly))
     {
-      Werror("map from characteristic %d to %d not implemented",
-        rChar(IDRING(r)),rChar());
+      Werror("can not map from ground field of %s to current ground field", theMap->preimage);
       return NULL;
     }

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));

Singular/maps.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: maps.h,v 1.6 1997-12-15 22:46:31 obachman Exp $ */
+/* $Id: maps.h,v 1.7 1999-03-09 12:28:49 obachman Exp $ */
 /*
 * ABSTRACT - the mapping of polynomials to other rings
@@ -22 +22 @@
 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);
+                int * perm, int *par_perm, int ch);
 #endif