Changeset 16c769 in git for kernel/fglmzero.cc

Timestamp:

Jun 23, 2004, 5:12:24 PM (20 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7a7952db978cc749fc63ac71b9eeab35dcba28ac

Parents:

cb2544e8c6fd4afb29e2f8c56b0717fb411424fb

Message:

*wichmann: finduni


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

File:

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

kernel/fglmzero.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmzero.cc,v 1.1.1.1 2003-10-06 12:15:53 Singular Exp $
+// $Id: fglmzero.cc,v 1.2 2004-06-23 15:12:24 Singular Exp $
 
 /****************************************
@@ -77 +77 @@
     ~idealFunctionals();
 
-    int dimen() const { fglmASSERT( _size>0, "called to early"); return _size; }
+    int dimen() const { fglmASSERT( _size>0, "called too early"); return _size; }
     void endofConstruction();
     void map( ring source );
@@ -95 +95 @@
     _nfunc= numFuncs;
 
-    currentSize= (int *)omAlloc( _nfunc*sizeof( int ) );
-    for ( k= _nfunc-1; k >= 0; k-- )
-        currentSize[k]= 0;
+    currentSize= (int *)omAlloc0( _nfunc*sizeof( int ) );
+    //for ( k= _nfunc-1; k >= 0; k-- )
+    //    currentSize[k]= 0;
 
     func= (matHeader **)omAlloc( _nfunc*sizeof( matHeader * ) );
@@ -488 +488 @@
         }
         if ( done == FALSE ) {
-            nlist.append( fglmSelem( newmonom, k ) );
+            nlist.append( fglmSelem( newmonom, varpermutation[k] ) );
             break;
         }
         if ( state == 0 ) {
-            list.getItem().newDivisor( k );
+            list.getItem().newDivisor( varpermutation[k] );
             pDeleteLm(&newmonom);
         }
         else {
-            list.insert( fglmSelem( newmonom, k ) );
+            list.insert( fglmSelem( newmonom, varpermutation[k] ) );
         }
         k--;
@@ -504 +504 @@
         pIncrExp( newmonom, varpermutation[k] );
         pSetm( newmonom );
-        nlist.append( fglmSelem( newmonom, k ) );
+        nlist.append( fglmSelem( newmonom, varpermutation[k] ) );
     }
 }
@@ -1098 +1098 @@
     int i;
     BOOLEAN isZero;
+    int *varpermutation = (int*)omAlloc( (pVariables+1)*sizeof(int) );
+    ideal perm = idMaxIdeal(1);
+    intvec *iv = idSort(perm,TRUE);
+    idDelete(&perm);
+    for(int i = pVariables; i > 0; i--) varpermutation[pVariables+1-i] = (*iv)[i-1];
+    delete iv;
+     
     for ( i= 1; i <= pVariables; i++ ) {
         // main loop
-        STICKYPROT2( "(%i)", i );
+        STICKYPROT2( "(%i)", i /*varpermutation[i]*/);
         gaussReducer gauss( l.dimen() );
         isZero= FALSE;
@@ -1128 +1135 @@
                         }
                         pSetCoeff( temp, n );
-                        pSetExp( temp, i, k-1 );
+                        pSetExp( temp, i /*varpermutation[i]*/, k-1 );
                         pSetm( temp );
                     }
@@ -1138 +1145 @@
                 STICKYPROT( "." );
                 gauss.store();
-                v= l.multiply( v, i );
+                v= l.multiply( v, i /*varpermutation[i]*/ );
             }
         }
     }
     STICKYPROT( "\n" );
+    omFreeSize( (ADDRESS)varpermutation, (pVariables+1)*sizeof(int) );
     return destIdeal;
 }