Changeset 711e26 in git

Timestamp:

Aug 3, 2011, 7:49:45 PM (12 years ago)

Author:

Burcin Erocal <burcin@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

1187538f48f52e8f271d5b5d0ef0c4c672292679

Parents:

1e872a8ed7451934142b28236ec124f6235b5679

git-author:

Burcin Erocal <burcin@erocal.org>2011-08-03 19:49:45+02:00

git-committer:

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

Message:

Fix Singular/fglm.cc.

Location:

Singular

Files:

• fehelp.h (modified) (1 diff)
• fglm.cc (modified) (9 diffs)

Singular/fehelp.h

@@ -2 +2 @@
 #define FEHELP_H
 
+void feHelp(char* str = NULL);
 const char* feHelpBrowser(char* which=NULL, int warn=-1);
 

Singular/fglm.cc

@@ -154 +154 @@
     else
         pperm= NULL;
-    maFindPerm( sring->names, nvar, sring->parameter, npar,
-                dring->names, nvar, dring->parameter, npar, vperm, pperm,
-                dring->ch);
+    maFindPerm( sring->names, nvar, rParameter(sring), npar,
+                dring->names, nvar, rParameter(dring), npar, vperm, pperm,
+                dring->cf->type);
     for ( k= nvar; (k > 0) && (state == FglmOk); k-- )
         if ( vperm[k] <= 0 )
@@ -183 +183 @@
         // check if sring->qideal is contained in dring->qideal:
         rSetHdl( dringHdl );
-        nMapFunc nMap=nSetMap( sring );
+        nMapFunc nMap=n_SetMap(currRing->cf, sring->cf );
         ideal sqind = idInit( IDELEMS( sring->qideal ), 1 );
         for ( k= IDELEMS( sring->qideal )-1; k >= 0; k-- )
-          (sqind->m)[k]= pPermPoly( (sring->qideal->m)[k], vperm, sring, nMap);
+          (sqind->m)[k]= p_PermPoly( (sring->qideal->m)[k], vperm, sring,
+                          currRing, nMap);
         ideal sqindred = kNF( dring->qideal, NULL, sqind );
         if ( ! idIs0( sqindred ) )
@@ -200 +201 @@
         int * dsvperm = (int *)omAlloc0( (nvar+1)*sizeof( int ) );
         maFindPerm( dring->names, nvar, NULL, 0, sring->names, nvar, NULL, 0,
-                    dsvperm, NULL, sring->ch);
-        nMap=nSetMap(dring);
+                    dsvperm, NULL, sring->cf->type);
+        nMap=n_SetMap(currRing->cf, dring->cf);
         ideal dqins = idInit( IDELEMS( dring->qideal ), 1 );
         for ( k= IDELEMS( dring->qideal )-1; k >= 0; k-- )
-          (dqins->m)[k]=pPermPoly( (dring->qideal->m)[k], dsvperm, sring, nMap);
+          (dqins->m)[k]=p_PermPoly( (dring->qideal->m)[k], dsvperm, sring,
+                         currRing, nMap);
         ideal dqinsred = kNF( sring->qideal, NULL, dqins );
         if ( ! idIs0( dqinsred ) )
@@ -241 +243 @@
     int power;
     int k;
-    BOOLEAN * purePowers = (BOOLEAN *)omAlloc0( pVariables*sizeof( BOOLEAN ) );
+    BOOLEAN * purePowers = (BOOLEAN *)omAlloc0( currRing->N*sizeof( BOOLEAN ) );
 
     for ( k= IDELEMS( theIdeal ) - 1; (state == FglmOk) && (k >= 0); k-- )
@@ -251 +253 @@
           else if ( (power= pIsPurePower( p )) > 0 )
           {
-            fglmASSERT( 0 < power && power <= pVariables, "illegal power" );
+            fglmASSERT( 0 < power && power <= currRing->N, "illegal power" );
             if ( purePowers[power-1] == TRUE  ) state= FglmNotReduced;
             else purePowers[power-1]= TRUE;
@@ -262 +264 @@
     if ( state == FglmOk )
     {
-        for ( k= pVariables-1 ; (state == FglmOk) && (k >= 0); k-- )
+        for ( k= currRing->N-1 ; (state == FglmOk) && (k >= 0); k-- )
             if ( purePowers[k] == FALSE ) state= FglmNotZeroDim;
     }
-    omFreeSize( (ADDRESS)purePowers, pVariables*sizeof( BOOLEAN ) );
+    omFreeSize( (ADDRESS)purePowers, currRing->N*sizeof( BOOLEAN ) );
     return state;
 }
@@ -284 +286 @@
     ring sourceRing = currRing;
 
-    int * vperm = (int *)omAlloc0( (pVariables+1)*sizeof( int ) );
+    int * vperm = (int *)omAlloc0( (currRing->N+1)*sizeof( int ) );
     state= fglmConsistency( sourceRingHdl, destRingHdl, vperm );
-    omFreeSize( (ADDRESS)vperm, (pVariables+1)*sizeof(int) );
+    omFreeSize( (ADDRESS)vperm, (currRing->N+1)*sizeof(int) );
 
     if ( state == FglmOk )
@@ -434 +436 @@
       int i,k;
       int count=0;
-      BOOLEAN * purePowers = (BOOLEAN *)omAlloc0( pVariables*sizeof( BOOLEAN ) );
+      BOOLEAN * purePowers = (BOOLEAN *)omAlloc0( currRing->N*sizeof( BOOLEAN ) );
       for ( k= IDELEMS( sourceIdeal ) - 1; k >= 0; k-- )
       {
@@ -443 +445 @@
             purePowers[i-1]=k;
             count++;
-            if (count==pVariables) break;
+            if (count==currRing->N) break;
           }
         }
       }
-      if (count==pVariables)
+      if (count==currRing->N)
       {
-        destIdeal=idInit(pVariables,1);
-        for(k=pVariables-1; k>=0; k--) destIdeal->m[k]=pCopy(sourceIdeal->m[purePowers[k]]);
+        destIdeal=idInit(currRing->N,1);
+        for(k=currRing->N-1; k>=0; k--) destIdeal->m[k]=pCopy(sourceIdeal->m[purePowers[k]]);
       }
-      omFreeSize((ADDRESS)purePowers, pVariables*sizeof( BOOLEAN ) );
+      omFreeSize((ADDRESS)purePowers, currRing->N*sizeof( BOOLEAN ) );
       if (destIdeal!=NULL)
             state = FglmOk;