Changeset 670ad3 in git

Timestamp:

Jan 27, 2010, 2:16:19 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

a4875334edd65075db8edd5f072597fac0983b5f

Parents:

998298c25fb590befaae6849197e879ab70df0b7

Message:

idhdl -> ring in fglmhomog

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

File:

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

kernel/fglmhom.cc

@@ -338 +338 @@
 
 BOOLEAN
-fglmhomog( idhdl sourceRingHdl, ideal sourceIdeal, idhdl destRingHdl, ideal & destIdeal )
+fglmhomog( ring sourceRing, ideal sourceIdeal, ring destRing, ideal & destIdeal )
 {
 #define groebnerBS 16
@@ -347 +347 @@
 
     // get the hilbert series and the leading monomials of the sourceIdeal:
-    rSetHdl( sourceRingHdl, TRUE );
-    ring sourceRing = currRing;
+    rChangeCurrRing( sourceRing );
 
     intvec * hilb = hHstdSeries( sourceIdeal, NULL, currQuotient );
@@ -354 +353 @@
     dat.sourceIdeal= sourceIdeal;
     dat.sourceHeads= (doublepoly *)omAlloc( IDELEMS( sourceIdeal ) * sizeof( doublepoly ) );
-    for ( s= IDELEMS( sourceIdeal ) - 1; s >= 0; s-- ) {
+    for ( s= IDELEMS( sourceIdeal ) - 1; s >= 0; s-- )
+    {
         dat.sourceHeads[s].sm= pHead( (sourceIdeal->m)[s] );
     }
     dat.numSourceHeads= IDELEMS( sourceIdeal );
-    rSetHdl( destRingHdl, TRUE );
-    ring destRing = currRing;
+    rChangeCurrRing( destRing );
 
     // Map the sourceHeads to the destRing
@@ -367 +366 @@
     //nSetMap( sourceRing->ch, sourceRing->parameter, sourceRing->P, sourceRing->minpoly );
     nSetMap( sourceRing );
-    for ( s= IDELEMS( sourceIdeal ) - 1; s >= 0; s-- ) {
+    for ( s= IDELEMS( sourceIdeal ) - 1; s >= 0; s-- )
+    {
         dat.sourceHeads[s].dm= pPermPoly( dat.sourceHeads[s].sm, vperm, sourceRing, NULL, 0 );
     }
@@ -374 +374 @@
     dat.numDestPolys= 0;
 
-    while ( (numGBelems= hfglmNextdegree( hilb, dat.destIdeal, deg )) != 0 ) {
+    while ( (numGBelems= hfglmNextdegree( hilb, dat.destIdeal, deg )) != 0 )
+    {
         int num = 0;  // the number of monoms of degree deg
         PROT2( "deg= %i ", deg );
@@ -399 +400 @@
         PROT2( "%i)\nvec>", dat.overall );
         // switch to sourceRing and map monoms
-        rSetHdl( sourceRingHdl, TRUE );
+        rChangeCurrRing( sourceRing );
         mapMonoms( destRing, dat );
         getVectorRep( dat );
 
         // switch to destination Ring and remap the vectors
-        rSetHdl( destRingHdl, TRUE );
+        rChangeCurrRing( destRing );
         remapVectors( sourceRing, dat );
 
@@ -436 +437 @@
 
     ideal i= IDIDEAL(ih);
-    fglmhomog( (idhdl)first->data, i, dest, result );
+    fglmhomog( IDRING((idhdl)first->data), i, IDRING(dest), result );
 
     return( result );