Changeset 38f8dfc in git

Timestamp:

Jul 29, 2011, 4:49:16 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

2b85f31ccb9b0e9c18d6a04d1701eecb4d30b074

Parents:

7ac612964d7ab2d05f0ce6d464ce76b51757f776

git-author:

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

git-committer:

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

Message:

fix walkProc.cc

Location:

kernel

Files:

• fglm.h (modified) (1 diff)
• walkProc.cc (modified) (2 diffs)
• walkSupport.h (modified) (1 diff)

kernel/fglm.h

@@ -15 +15 @@
 
 #ifdef HAVE_FACTORY
-#include <factory/factoryconf.h>
 
 #include <polys/polys.h>

kernel/walkProc.cc

@@ -88 +88 @@
     int npar = rPar(sring);
     int * pperm;
+    char **snames;
+    char **dnames;
     if ( npar > 0 )
+    {
+        snames=sring->cf->extRing->names;
+        dnames=dring->cf->extRing->names;
         pperm= (int *)omAlloc0( (npar+1)*sizeof( int ) );
+    }
     else
+    {
+        snames=NULL;
+        dnames=NULL;
         pperm= NULL;
-
-    maFindPerm( sring->names, nvar, sring->parameter, npar,
-                dring->names, nvar, dring->parameter, npar, vperm, pperm,
-                dring->ch);
+    }
+
+    maFindPerm( sring->names, nvar, snames, npar,
+                dring->names, nvar, dnames, npar, vperm, pperm,
+                dring->cf->type);
 
     for ( k= nvar; (k > 0) && (state == WalkOk); k-- )
@@ -247 +257 @@
     int npar = rPar(sring);
     int * pperm;
+    char **snames;
+    char **dnames;
 
     if ( npar > 0 )
+    {
+        snames=sring->cf->extRing->names;
+        dnames=dring->cf->extRing->names;
         pperm= (int *)omAlloc0( (npar+1)*sizeof( int ) );
+    }
     else
+    {
         pperm= NULL;
-
-    maFindPerm( sring->names, nvar, sring->extring->names, npar,
-                dring->names, nvar, dring->extring->names, npar, vperm, pperm,
-                dring->ch);
+        snames=NULL;
+        dnames=NULL;
+    }
+
+    maFindPerm( sring->names, nvar, snames, npar,
+                dring->names, nvar, dnames, npar, vperm, pperm,
+                dring->cf->type);
 
     for ( k= nvar; (k > 0) && (state == WalkOk); k-- )

kernel/walkSupport.h

@@ -21 +21 @@
 BOOLEAN currwOnBorder64(ideal I, int64vec* currw64);
 void getTaun64(ideal G,intvec* targm,int pertdeg, int64vec** v64, int64 & i64);
-int64vec* getiv64(lists l);
+//int64vec* getiv64(lists l);
 //int64 getint64(lists l);// not used