Changeset 098f98f in git for kernel/fglmzero.cc

Timestamp:

Jan 6, 2010, 3:55:03 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

eaf66fe9969d8b8c2cf369ea94e7616f379a3229

Parents:

b46774f2ffde4294abff59d9fdb51d1914924c72

Message:

IDTYP etc -> ipid.h

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

File:

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

kernel/fglmzero.cc

@@ -30 +30 @@
 #include "omalloc.h"
 #include "kstd1.h" // for kNF (see fglmquot)
-#include "intvec.h" 
+#include "intvec.h"
 #include "fglm.h"
 #include "fglmvec.h"
@@ -593 +593 @@
 void
 internalCalculateFunctionals( const ideal & theIdeal, idealFunctionals & l,
-                              fglmSdata & data )
+                              fglmSdata & data )
 {
 
@@ -663 +663 @@
 static BOOLEAN
 CalculateFunctionals( const ideal & theIdeal, idealFunctionals & l,
-                      poly & p, fglmVector & v )
+                      poly & p, fglmVector & v )
 {
     fglmSdata data( theIdeal );
@@ -669 +669 @@
     //    STICKYPROT("Calculating vector rep\n");
     v = data.getVectorRep( p );
-    // if ( v.isZero() ) 
+    // if ( v.isZero() )
     //   STICKYPROT("vectorrep is 0\n");
     return ( data.state() );
@@ -1019 +1019 @@
 static ideal
 GroebnerViaFunctionals( const idealFunctionals & l,
-                        fglmVector iv = fglmVector() )
+                        fglmVector iv = fglmVector() )
 // If iv is zero, calculates the groebnerBasis for the ideal which is
 // defined by l.
@@ -1039 +1039 @@
       initv = iv;
     }
-      
+
     poly one = pOne();
     data.updateCandidates( one, initv );
@@ -1104 +1104 @@
     for(i = pVariables; i > 0; i--) varpermutation[pVariables+1-i] = (*iv)[i-1];
     delete iv;
-     
+
     for (i= 1; i <= pVariables; i++ )
     {
@@ -1157 +1157 @@
 // for a descritption of the parameters see fglm.h
 BOOLEAN
-fglmzero( idhdl sourceRingHdl, ideal & sourceIdeal, idhdl destRingHdl, ideal & destIdeal, BOOLEAN switchBack, BOOLEAN deleteIdeal )
+fglmzero( ring sourceRing, ideal & sourceIdeal, idhdl destRingHdl, ideal & destIdeal, BOOLEAN switchBack, BOOLEAN deleteIdeal )
 {
     idhdl initialRingHdl = currRingHdl;
     BOOLEAN fglmok;
 
-    if ( currRingHdl != sourceRingHdl )
-        rSetHdl( sourceRingHdl );
+    if ( currRing != sourceRing )
+    {
+        rChangeCurrRing( sourceRing );
+        currRingHdl=NULL;
+    }
     idealFunctionals L( 100, pVariables );
     fglmok = CalculateFunctionals( sourceIdeal, L );
@@ -1169 +1172 @@
         idDelete( & sourceIdeal );
     rSetHdl( destRingHdl );
-    if ( fglmok == TRUE ) {
-        L.map( IDRING( sourceRingHdl ) );
+    if ( fglmok == TRUE )
+    {
+        L.map( sourceRing );
         destIdeal= GroebnerViaFunctionals( L );
     }