Changeset 286859 in git

Timestamp:

Feb 21, 2020, 11:46:33 AM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f9735ce815bfa3b7bc4f740e85c7fd8790d6b548

Parents:

c6b4e50c4010664ea60dd5d8284301d8087dcc0a

Message:

chg: fglmProc: less dep. on currRing, ring hdl

File:

• Singular/fglm.cc (modified) (8 diffs)

Singular/fglm.cc

@@ -105 +105 @@
 }
 
-// Checks if the two rings sringHdl and dringHdl are compatible enough to
+// Checks if the two rings sring and dring are compatible enough to
 // be used for the fglm. This means:
 //  1) Same Characteristic, 2) globalOrderings in both rings,
@@ -115 +115 @@
 // vperm must be a vector of length pVariables+1, initialized by 0.
 // If both rings are compatible, it stores the permutation of the
-// variables if mapped from sringHdl to dringHdl.
+// variables if mapped from sring to dring.
 // if the rings are compatible, it returns FglmOk.
-// Should be called with currRing= IDRING( sringHdl );
+// Should be called with currRing==sring
 FglmState
-fglmConsistency( idhdl sringHdl, idhdl dringHdl, int * vperm )
+fglmConsistency( ring sring, ring dring, int * vperm )
 {
     int k;
     FglmState state= FglmOk;
-    ring dring = IDRING( dringHdl );
-    ring sring = IDRING( sringHdl );
 
     if ( rChar(sring) != rChar(dring) )
@@ -179 +177 @@
         if ( dring->qideal == NULL )
         {
-            Werror( "%s is a qring, current ring not", sringHdl->id );
+            WerrorS( "source ring is a qring, destination ring not" );
             return FglmIncompatibleRings;
         }
         // both rings are qrings, now check if both quotients define the same ideal.
         // check if sring->qideal is contained in dring->qideal:
-        rSetHdl( dringHdl );
-        nMapFunc nMap=n_SetMap(currRing->cf, sring->cf );
+        rChangeCurrRing( dring );
+        nMapFunc nMap=n_SetMap(dring->cf, sring->cf );
         ideal sqind = idInit( IDELEMS( sring->qideal ), 1 );
         for ( k= IDELEMS( sring->qideal )-1; k >= 0; k-- )
           (sqind->m)[k]= p_PermPoly( (sring->qideal->m)[k], vperm, sring,
-                          currRing, nMap);
+                          dring, nMap);
         ideal sqindred = kNF( dring->qideal, NULL, sqind );
         if ( ! idIs0( sqindred ) )
@@ -198 +196 @@
         idDelete( & sqind );
         idDelete( & sqindred );
-        rSetHdl( sringHdl );
+        rChangeCurrRing( sring );
         if ( state != FglmOk ) return state;
         // check if dring->qideal is contained in sring->qideal:
@@ -224 +222 @@
         if ( dring->qideal != NULL )
         {
-            Werror( "current ring is a qring, %s not", sringHdl->id );
+            WerrorS( "source ring is a qring, destination ring not" );
             return FglmIncompatibleRings;
         }
@@ -281 +279 @@
     FglmState state = FglmOk;
 
-    idhdl destRingHdl = currRingHdl;
+    ring destRing = currRing;
     // ring destRing = currRing;
     ideal destIdeal = NULL;
-    idhdl sourceRingHdl = (idhdl)first->data;
-    rSetHdl( sourceRingHdl );
+    ring sourceRing = (ring)first->Data();
+    rChangeCurrRing( sourceRing );
     // ring sourceRing = currRing;
 
-    int * vperm = (int *)omAlloc0( (currRing->N+1)*sizeof( int ) );
-    state= fglmConsistency( sourceRingHdl, destRingHdl, vperm );
-    omFreeSize( (ADDRESS)vperm, (currRing->N+1)*sizeof(int) );
+    int * vperm = (int *)omAlloc0( (sourceRing->N+1)*sizeof( int ) );
+    state= fglmConsistency( sourceRing, destRing, vperm );
+    omFreeSize( (ADDRESS)vperm, (sourceRing->N+1)*sizeof(int) );
 
     if ( state == FglmOk )
     {
-        idhdl ih = currRing->idroot->get( second->Name(), myynest );
+        idhdl ih = sourceRing->idroot->get( second->Name(), myynest );
         if ( (ih != NULL) && (IDTYP(ih)==IDEAL_CMD) )
         {
             ideal sourceIdeal;
-            if ( currRing->qideal != NULL )
+            if ( sourceRing->qideal != NULL )
                 sourceIdeal= fglmUpdatesource( IDIDEAL( ih ) );
             else
@@ -307 +305 @@
                 // Now the settings are compatible with FGLM
                 assumeStdFlag( (leftv)ih );
-                if ( fglmzero( IDRING(sourceRingHdl), sourceIdeal, IDRING(destRingHdl), destIdeal, FALSE, (currRing->qideal != NULL) ) == FALSE )
+                if ( fglmzero( sourceRing, sourceIdeal, destRing, destIdeal, FALSE, (currRing->qideal != NULL) ) == FALSE )
                     state= FglmNotReduced;
             }
         } else state= FglmNoIdeal;
     }
-    if ( currRingHdl != destRingHdl )
-        rSetHdl( destRingHdl );
+    if ( currRing != destRing )
+        rChangeCurrRing( destRing );
     switch (state)
     {
@@ -325 +323 @@
             break;
         case FglmIncompatibleRings:
-            Werror( "ring %s and current ring are incompatible", first->Name() );
+            WerrorS( "source ring and current ring are incompatible" );
             destIdeal= NULL;
             break;
         case FglmNoIdeal:
-            Werror( "Can't find ideal %s in ring %s", second->Name(), first->Name() );
+            Werror( "Can't find ideal %s in source ring", second->Name() );
             destIdeal= NULL;
             break;