Changeset fc94e12 in git

Timestamp:

Jul 29, 2011, 5:32:50 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

f625fe2dcd54b36842ce99b5160bfe10d0073f83

Parents:

2b85f31ccb9b0e9c18d6a04d1701eecb4d30b074

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-29 17:32:50+02:00

git-committer:

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

Message:

fix fglmzero.cc

File:

• kernel/fglmzero.cc (modified) (7 diffs)

kernel/fglmzero.cc

@@ -20 +20 @@
 
 #include <kernel/mod2.h>
-
 #ifdef HAVE_FACTORY
+// assumes, that NOSTREAMIO is set in factoryconf.h, which is included
+// by templates/list.h.
+#include <factory/factory.h>
+#include <factory/templates/ftmpl_list.h>
+
 #include <misc/options.h>
 #include <polys/polys.h>
@@ -34 +38 @@
 #include <kernel/fglmvec.h>
 #include <kernel/fglmgauss.h>
-// assumes, that NOSTREAMIO is set in factoryconf.h, which is included
-// by templates/list.h.
-#include <factory/templates/ftmpl_list.h>
 #define PROT(msg)
 #define STICKYPROT(msg) if (BTEST1(OPT_PROT)) Print(msg)
@@ -142 +143 @@
     int * perm = (int *)omAlloc0( (_nfunc+1)*sizeof( int ) );
     maFindPerm( source->names, source->N, NULL, 0, currRing->names,
-                currRing->N, NULL, 0, perm, NULL , currRing->ch);
-    nMapFunc nMap=nSetMap( source);
+                currRing->N, NULL, 0, perm, NULL , currRing->cf->type);
+    nMapFunc nMap=n_SetMap( source, currRing);
 
     matHeader ** temp = (matHeader **)omAlloc( _nfunc*sizeof( matHeader * ));
@@ -152 +153 @@
                   row--, elemp++ )
                 {
-                    newelem= nMap( elemp->elem );
+                    newelem= nMap( elemp->elem, source->cf, currRing->cf );
                     nDelete( & elemp->elem );
                     elemp->elem= newelem;
@@ -1177 +1178 @@
 fglmzero( ring sourceRing, ideal & sourceIdeal, idhdl destRingHdl, ideal & destIdeal, BOOLEAN switchBack, BOOLEAN deleteIdeal )
 {
-    idhdl initialRingHdl = currRingHdl;
+    //idhdl initialRingHdl = currRingHdl;
     BOOLEAN fglmok;
 
@@ -1183 +1184 @@
     {
         rChangeCurrRing( sourceRing );
-        currRingHdl=NULL;
-    }
-    idealFunctionals L( 100, (currRing->N) );
+        //currRingHdl=NULL;
+    }
+    idealFunctionals L( 100, rVar(currRing) );
     fglmok = CalculateFunctionals( sourceIdeal, L );
     if ( deleteIdeal == TRUE )
         idDelete( & sourceIdeal );
-    rSetHdl( destRingHdl );
+    //rSetHdl( destRingHdl );
     if ( fglmok == TRUE )
     {
@@ -1195 +1196 @@
         destIdeal= GroebnerViaFunctionals( L );
     }
-    if ( (switchBack == TRUE) && (currRingHdl != initialRingHdl) )
-        rSetHdl( initialRingHdl );
+    //if ( (switchBack) && (currRingHdl != initialRingHdl) )
+    //    rSetHdl( initialRingHdl );
     return fglmok;
 }