Changeset 0fc4c8 in git

Timestamp:

Dec 22, 2011, 8:30:07 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

c92097b3d34e4c1be3c6c1f18dc0b7565968a293

Parents:

27637404a579c5be90dfdaadf21dd3a6e892901bf0549c833590080d618d6f7989d1f9c9802da033

Message:

Merge pull request #35 from ederc/spielwiese

fixes Manual tests: fglm and stdfglm

Files:

• Singular/fglm.cc (modified) (1 diff)
• kernel/fglm.h (modified) (1 diff)
• kernel/fglmzero.cc (modified) (7 diffs)

Singular/fglm.cc

@@ -313 +313 @@
                 // Now the settings are compatible with FGLM
                 assumeStdFlag( (leftv)ih );
-                if ( fglmzero( IDRING(sourceRingHdl), sourceIdeal, destRingHdl, destIdeal, FALSE, (currQuotient != NULL) ) == FALSE )
+                if ( fglmzero( IDRING(sourceRingHdl), sourceIdeal, IDRING(destRingHdl), destIdeal, FALSE, (currQuotient != NULL) ) == FALSE )
                     state= FglmNotReduced;
             }

kernel/fglm.h

@@ -82 +82 @@
 // if deleteIdeal==FALSE, then nothing happens to sourceIdeal
 BOOLEAN
-fglmzero( ring sourceRing, ideal & sourceIdeal, idhdl destRingHdl, ideal & destideal, BOOLEAN switchBack = TRUE, BOOLEAN deleteIdeal = FALSE );
+fglmzero( ring sourceRing, ideal & sourceIdeal, ring destRing, ideal & destideal, BOOLEAN switchBack = TRUE, BOOLEAN deleteIdeal = FALSE );
 
 BOOLEAN fglmquot( ideal sourceIdeal, poly quot, ideal & destIdeal );

kernel/fglmzero.cc

@@ -987 +987 @@
     pdenom= nInit( 1 );
     number vdenom = v.clearDenom();
-    if ( ! nIsOne( vdenom ) && ! nIsZero( vdenom ) ) {
+    if ( ! nIsZero( vdenom ) && ! nIsOne( vdenom ) ) {
         p.setelem( p.size(), vdenom );
     }
@@ -994 +994 @@
     }
     number gcd = v.gcd();
-    if ( ! nIsOne( gcd ) && ! nIsZero( gcd ) ) {
+    if ( ! nIsZero( gcd ) && ! nIsOne( gcd ) ) {
         v /= gcd;
         number temp= nMult( pdenom, gcd );
@@ -1020 +1020 @@
             nDelete( & fac2 );
             number gcd = v.gcd();
-            if ( ! nIsOne( gcd ) && ! nIsZero( gcd ) ) {
+            if ( ! nIsZero( gcd ) && ! nIsOne( gcd ) ) {
                 v /= gcd;
                 number temp= nMult( pdenom, gcd );
@@ -1186 +1186 @@
 // for a descritption of the parameters see fglm.h
 BOOLEAN
-fglmzero( ring sourceRing, ideal & sourceIdeal, idhdl destRingHdl, ideal & destIdeal, BOOLEAN switchBack, BOOLEAN deleteIdeal )
-{
-    //idhdl initialRingHdl = currRingHdl;
+fglmzero( ring sourceRing, ideal & sourceIdeal, ring destRing, ideal & destIdeal, BOOLEAN switchBack, BOOLEAN deleteIdeal )
+{
+    ring initialRing = currRing;
     BOOLEAN fglmok;
 
@@ -1194 +1194 @@
     {
         rChangeCurrRing( sourceRing );
-        //currRingHdl=NULL;
     }
     idealFunctionals L( 100, rVar(currRing) );
@@ -1200 +1199 @@
     if ( deleteIdeal == TRUE )
         idDelete( & sourceIdeal );
-    //rSetHdl( destRingHdl );
+    rChangeCurrRing( destRing );
     if ( fglmok == TRUE )
     {
@@ -1206 +1205 @@
         destIdeal= GroebnerViaFunctionals( L );
     }
-    //if ( (switchBack) && (currRingHdl != initialRingHdl) )
-    //    rSetHdl( initialRingHdl );
+    if ( (switchBack) && (currRing != initialRing) )
+      rChangeCurrRing( initialRing );
     return fglmok;
 }