Changeset 7375424 in git

Timestamp:

Mar 25, 1997, 4:40:20 PM (27 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

20d92caa4109d20c8c2efc03cef380a023380d3b

Parents:

b97e9443c01e49fa114378e8959f26e5069da3b4

Message:

* hannes: maFindPerm needs: number of parameters


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

Location:

Singular

Files:

• fglm.cc (modified) (2 diffs)
• iparith.cc (modified) (2 diffs)
• maps.cc (modified) (4 diffs)
• maps.h (modified) (1 diff)

Singular/fglm.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglm.cc,v 1.2 1997-03-20 16:59:33 obachman Exp $ 
+// $Id: fglm.cc,v 1.3 1997-03-25 15:40:16 Singular Exp $ 
 //=============================================
 //             FGLM - Algorithm 
@@ -1621 +1621 @@
     //. check if rings are compatible:
     if ( currRing->N == destRing->N ) {
-        maFindPerm( currRing->names, pVariables, NULL, destRing->names, pVariables, NULL, 0, perm, NULL );
+        maFindPerm( currRing->names, pVariables, NULL, 0,
+                    destRing->names, pVariables, NULL, 0, perm, NULL );
         for ( int k = 1; state == FglmOk && k <= pVariables; k++ ) 
             if ( perm[k] <= 0 ) state= FglmIncompatibleRings;

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-static char rcsid[] = "$Id: iparith.cc,v 1.6 1997-03-24 14:24:51 Singular Exp $";
+static char rcsid[] = "$Id: iparith.cc,v 1.7 1997-03-25 15:40:18 Singular Exp $";
 /*
 * ABSTRACT: table driven kernel interface, used by interpreter
@@ -1398 +1398 @@
       if (par_perm_size!=0)
         par_perm=(int *)Alloc0(par_perm_size*sizeof(int));
-      maFindPerm(r->names,       r->N,       r->parameter,
+      maFindPerm(r->names,       r->N,       r->parameter,        r->P,
                  currRing->names,currRing->N,currRing->parameter, currRing->P,
                  perm,par_perm);

Singular/maps.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-static char rcsid[] = "$Id: maps.cc,v 1.3 1997-03-24 14:25:18 Singular Exp $";
+static char rcsid[] = "$Id: maps.cc,v 1.4 1997-03-25 15:40:19 Singular Exp $";
 /*
 * ABSTRACT - the mapping of polynomials to other rings
@@ -268 +268 @@
 }
 
-void maFindPerm(char **preim_names, int preim_n, char **preim_par,
-                char **names, int n, char **par, int nop,
+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)
 {
@@ -303 +303 @@
   if (par_perm!=NULL)
   {
-    for (i=0; preim_par[i]!=NULL; i++)
+    for (i=0; i<preim_p; i++)
     {
       for(j=0; j<n; j++)
@@ -343 +343 @@
   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,
+  maFindPerm(r->names,r->N, r->parameter, r->P,
              currRing->names,currRing->N,currRing->parameter, currRing->P,
              perm,NULL/*par_perm*/);

Singular/maps.h

@@ -19 +19 @@
                      int *perm,int N,
                      int *par_perm,int P);
-void maFindPerm(char **preim_names, int preim_n, char **preim_par,
-                 char **names, int n, char ** par, int nop,
-                 int * perm, int *par_perm);
+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);
 #endif