Changeset 7ac612 in git

Timestamp:

Jul 29, 2011, 4:40:54 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

38f8dfcfefe32659c95fdaeaba57fc8133c2dca8

Parents:

ad3aa7914b6579de07eda993d2ee2be453525603

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-29 16:40:54+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:01:16+01:00

Message:

cahnged: maFindPerm (uses cf->type instead of cf->ch)

Files:

• kernel/fglm.h (modified) (3 diffs)
• kernel/walkProc.cc (modified) (1 diff)
• libpolys/polys/monomials/maps.cc (modified) (3 diffs)
• libpolys/polys/monomials/maps.h (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (3 diffs)

kernel/fglm.h

@@ -15 +15 @@
 
 #ifdef HAVE_FACTORY
-#include <factory/factory.h>
+#include <factory/factoryconf.h>
 
 #include <polys/polys.h>
@@ -39 +39 @@
     BOOLEAN isBasisOrEdge() const { return ( (divisors[0] == numVars) ? TRUE : FALSE ); }
     void newDivisor( int var ) { divisors[ ++divisors[0] ]= var; }
-#ifndef NOSTREAMIO
-friend OSTREAM & operator <<(OSTREAM &, fglmSelem);
-#endif
+//#ifndef NOSTREAMIO
+//friend OSTREAM & operator <<(OSTREAM &, fglmSelem);
+//#endif
 };
-#ifndef NOSTREAMIO
-inline OSTREAM & operator <<(OSTREAM & os, fglmSelem) { return os;};
-#endif
+//#ifndef NOSTREAMIO
+//inline OSTREAM & operator <<(OSTREAM & os, fglmSelem) { return os;};
+//#endif
 
 class fglmDelem
@@ -59 +59 @@
     BOOLEAN isBasisOrEdge() const { return ( (insertions == 0) ? TRUE : FALSE ); }
     void newDivisor() { insertions--; }
-#ifndef NOSTREAMIO
-friend OSTREAM & operator <<(OSTREAM &, fglmDelem);
-#endif
+//#ifndef NOSTREAMIO
+//friend OSTREAM & operator <<(OSTREAM &, fglmDelem);
+//#endif
 };
-#ifndef NOSTREAMIO
-inline OSTREAM & operator <<(OSTREAM & os, fglmDelem) { return os;};
-#endif
+//#ifndef NOSTREAMIO
+//inline OSTREAM & operator <<(OSTREAM & os, fglmDelem) { return os;};
+//#endif
 
 // fglmzero(...):

kernel/walkProc.cc

@@ -253 +253 @@
         pperm= NULL;
 
-    maFindPerm( sring->names, nvar, sring->parameter, npar,
-                dring->names, nvar, dring->parameter, npar, vperm, pperm,
+    maFindPerm( sring->names, nvar, sring->extring->names, npar,
+                dring->names, nvar, dring->extring->names, npar, vperm, pperm,
                 dring->ch);
 

libpolys/polys/monomials/maps.cc

@@ -195 +195 @@
 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 ch)
+                int * perm, int *par_perm, n_coeffType ch)
 {
   int i,j;
@@ -214 +214 @@
     if ((perm[i+1]==0)&&(par!=NULL)
         // do not consider par of Fq
-         && (ch < 2))
+         && (ch!=n_GF))
     {
       for(j=0; j<nop; j++)
@@ -272 +272 @@
   maFindPerm(r->names, rVar(r), rParameter(r), rPar(r),
              dst_r->names, rVar(dst_r),rParameter(dst_r), rPar(dst_r),
-             perm,NULL, dst_r->cf->ch);
+             perm,NULL, dst_r->cf->type);
   poly res=p_PermPoly(p,perm,r,dst_r, nMap /*,par_perm,rPar(r)*/);
   omFreeSize((ADDRESS)perm,(r->N+1)*sizeof(int));

libpolys/polys/monomials/maps.h

@@ -28 +28 @@
 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 ch);
+                int * perm, int *par_perm, n_coeffType ch);
 poly pSubstPoly(poly p, int var, poly image);
 ideal  idSubstPoly(ideal id, int n, poly e);

libpolys/polys/monomials/ring.cc

@@ -1126 +1126 @@
       maFindPerm(R1->names,  rVar(R1),  rParameter(R1),  rPar(R1),
                  sum->names, rVar(sum), rParameter(sum), rPar(sum),
-                 perm1, par_perm1, sum->cf->ch);
+                 perm1, par_perm1, sum->cf->type);
 
       maFindPerm(R2->names,  rVar(R2),  rParameter(R2),  rPar(R2),
                  sum->names, rVar(sum), rParameter(sum), rPar(sum),
-                 perm2, par_perm2, sum->cf->ch);
+                 perm2, par_perm2, sum->cf->type);
 
 
@@ -1231 +1231 @@
     maFindPerm(r1->names,  rVar(r1),  rParameter(r1),  rPar(r1),
                sum->names, rVar(sum), rParameter(sum), rPar(sum),
-               perm1, par_perm1, sum->cf->ch);
+               perm1, par_perm1, sum->cf->type);
     nMapFunc nMap1 = n_SetMap(r1->cf,sum->cf);
     Q1 = idInit(IDELEMS(r1->qideal),1);
@@ -1254 +1254 @@
     maFindPerm(r2->names,  rVar(r2),  rParameter(r2),  rPar(r2),
                sum->names, rVar(sum), rParameter(sum), rPar(sum),
-               perm2, par_perm2, sum->cf->ch);
+               perm2, par_perm2, sum->cf->type);
     nMapFunc nMap2 = n_SetMap(r2->cf,sum->cf);
     Q2 = idInit(IDELEMS(r2->qideal),1);