Changeset 239c77 in git

Timestamp:

Apr 1, 2003, 2:48:31 PM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

87d26115a86e30ac46b6a98bcf3476387cd6dac3

Parents:

bc91a65484e480a5becfb1d7732d074f37e61ac4

Message:

*hannes/wichmann: fglm fix for unusual orderings


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

File:

• Singular/fglmzero.cc (modified) (15 diffs)

Singular/fglmzero.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmzero.cc,v 1.34 2001-10-09 16:36:00 Singular Exp $
+// $Id: fglmzero.cc,v 1.35 2003-04-01 12:48:31 Singular Exp $
 
 /****************************************
@@ -32 +32 @@
 #include "omalloc.h"
 #include "kstd1.h" // for kNF (see fglmquot)
+#include "intvec.h" 
 #include "fglm.h"
 #include "fglmvec.h"
@@ -331 +332 @@
     ideal theIdeal;
     int idelems;
+    int* varpermutation;
 
     int basisBS;
@@ -367 +369 @@
     theIdeal= thisIdeal;
     idelems= IDELEMS( theIdeal );
+    varpermutation = (int*)omAlloc( (pVariables+1)*sizeof(int) );
+    // Sort ring variables by increasing values (because of weighted orderings)
+    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;
 
     basisBS= 100;
@@ -387 +396 @@
 fglmSdata::~fglmSdata()
 {
+    omFreeSize( (ADDRESS)varpermutation, (pVariables+1)*sizeof(int) );
     for ( int k = basisSize; k > 0; k-- )
         pDeleteLm( basis + k );  //. rem: basis runs from basis[1]..basis[basisSize]
@@ -458 +468 @@
 //      into the list of candidates, according to the given order. If a monomial already
 //      exists, then "insertions" and "divisors" are updated.
-//     Assumes that ringvar(k) < ringvar(l) for k > l
+//     Assumes that ringvar(varperm[k]) < ringvar(varperm[l]) for k > l
 void
 fglmSdata::updateCandidates()
@@ -471 +481 @@
     while ( k >= 1 ) {
         newmonom = pCopy( m );
-        pIncrExp( newmonom, k );
+        pIncrExp( newmonom, varpermutation[k] );
         pSetm( newmonom );
         done= FALSE;
@@ -494 +504 @@
     while ( --k >= 1 ) {
         newmonom= pCopy( m ); // HIER
-        pIncrExp( newmonom, k );
+        pIncrExp( newmonom, varpermutation[k] );
         pSetm( newmonom );
         nlist.append( fglmSelem( newmonom, k ) );
@@ -661 +671 @@
     //    STICKYPROT("Calculating vector rep\n");
     v = data.getVectorRep( p );
-    // if ( v.isZero() )
+    // if ( v.isZero() ) 
     //   STICKYPROT("vectorrep is 0\n");
     return ( data.state() );
@@ -739 +749 @@
     int basisSize;  //. the CURRENT basisSize, i.e. basisSize <= dimen
     polyset basis;  // [1]..[dimen]. The monoms of the new Vectorspace-basis
+
+    int* varpermutation;
 
     int groebnerBS;
@@ -778 +790 @@
     perm= (int *)omAlloc( (dimen+1)*sizeof( int ) );
     basis= (polyset)omAlloc( (dimen+1)*sizeof( poly ) );
+    varpermutation = (int*)omAlloc( (pVariables+1)*sizeof(int) );
+    // Sort ring variables by increasing values (because of weighted orderings)
+    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;
+
     groebnerBS= 16;
     groebnerSize= 0;
@@ -804 +824 @@
         pLmDelete( basis[k]);
     omFreeSize( (ADDRESS)basis, (dimen+1)*sizeof( poly ) );
+    omFreeSize( (ADDRESS)varpermutation, (pVariables+1)*sizeof(int) );
 }
 
@@ -861 +882 @@
     while ( k >= 1 ) {
         newmonom = pCopy( m );
-        pIncrExp( newmonom, k );
+        pIncrExp( newmonom, varpermutation[k] );
         pSetm( newmonom );
         done= FALSE;
@@ -884 +905 @@
     while ( --k >= 1 ) {
         newmonom= pCopy( m );
-        pIncrExp( newmonom, k );
+        pIncrExp( newmonom, varpermutation[k] );
         pSetm( newmonom );
         nlist.append( fglmDelem( newmonom, v, k ) );
@@ -1020 +1041 @@
       initv = iv;
     }
-
+      
     poly one = pOne();
     data.updateCandidates( one, initv );