Changeset 68d23f8 in git

Timestamp:

Jun 21, 2010, 8:12:09 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5a061b7e354823fc26cf0b955032ab197eaf9010

Parents:

ee3e1aeb5264cc872202ec014e53f63d146423f9

Message:

pDeleteLm ->pLmDelete

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

File:

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

kernel/fglmzero.cc

@@ -295 +295 @@
     borderElem() : monom(NULL), nf() {}
     borderElem( poly p, fglmVector n ) : monom( p ), nf( n ) {}
-    ~borderElem() { pDeleteLm(&monom); }
+    ~borderElem() { if (monom!=NULL) pLmDelete(&monom); }
 #ifndef HAVE_EXPLICIT_CONSTR
     void insertElem( poly p, fglmVector n )
@@ -396 +396 @@
     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]
+        pLmDelete( basis + k );  //. rem: basis runs from basis[1]..basis[basisSize]
     omFreeSize( (ADDRESS)basis, basisMax*sizeof( poly ) );
 #ifndef HAVE_EXPLICIT_CONSTR
@@ -477 +477 @@
     BOOLEAN done = FALSE;
     int state = 0;
-    while ( k >= 1 ) {
+    while ( k >= 1 )
+    {
         newmonom = pCopy( m );
         pIncrExp( newmonom, varpermutation[k] );
         pSetm( newmonom );
         done= FALSE;
-        while ( list.hasItem() && (done == FALSE) ) {
+        while ( list.hasItem() && (!done) )
+        {
             if ( (state= pCmp( list.getItem().monom, newmonom )) < 0 )
                 list++;
             else done= TRUE;
         }
-        if ( done == FALSE ) {
+        if ( !done )
+        {
             nlist.append( fglmSelem( newmonom, varpermutation[k] ) );
             break;
         }
-        if ( state == 0 ) {
+        if ( state == 0 )
+        {
             list.getItem().newDivisor( varpermutation[k] );
-            pDeleteLm(&newmonom);
-        }
-        else {
+            pLmDelete(&newmonom);
+        }
+        else
+        {
             list.insert( fglmSelem( newmonom, varpermutation[k] ) );
         }
         k--;
     }
-    while ( --k >= 1 ) {
+    while ( --k >= 1 )
+    {
         newmonom= pCopy( m ); // HIER
         pIncrExp( newmonom, varpermutation[k] );
@@ -606 +612 @@
         if ( candidate.isBasisOrEdge() == TRUE ) {
             int edge = data.getEdgeNumber( candidate.monom );
-            if ( edge != 0 ) {
+            if ( edge != 0 )
+            {
                 // now candidate is an edge, i.e. we know its normalform:
                 // NF(p) = - ( tail(p)/LC(p) )
                 poly nf = data.getSpanPoly( edge );
                 pNorm( nf );
-                pDeleteLm(&nf);  //. deletes the leadingmonomial
+                pLmDelete(&nf);  //. deletes the leadingmonomial
                 nf= pNeg( nf );
                 fglmVector nfv = data.getVectorRep( nf );
@@ -619 +626 @@
                 STICKYPROT( "+" );
             }
-            else {
+            else
+            {
                 int basis= data.newBasisElem( candidate.monom );
                 data.updateCandidates();
@@ -696 +704 @@
 fglmDelem::cleanup()
 {
-    if ( monom != NULL ) {
-        pDeleteLm(&monom);
+    if ( monom != NULL )
+    {
+        pLmDelete(&monom);
     }
 }
@@ -878 +887 @@
     BOOLEAN done = FALSE;
     int state = 0;
-    while ( k >= 1 ) {
+    while ( k >= 1 )
+    {
         newmonom = pCopy( m );
         pIncrExp( newmonom, varpermutation[k] );
         pSetm( newmonom );
         done= FALSE;
-        while ( list.hasItem() && (done == FALSE) ) {
+        while ( list.hasItem() && (!done) )
+        {
             if ( (state= pCmp( list.getItem().monom, newmonom )) < 0 )
                 list++;
             else done= TRUE;
         }
-        if ( done == FALSE ) {
+        if ( !done )
+        {
             nlist.append( fglmDelem( newmonom, v, k ) );
             break;
         }
-        if ( state == 0 ) {
+        if ( state == 0 )
+        {
             list.getItem().newDivisor();
-            pDeleteLm( & newmonom );
-        }
-        else {
+            pLmDelete( & newmonom );
+        }
+        else
+        {
             list.insert( fglmDelem( newmonom, v, k ) );
         }
         k--;
     }
-    while ( --k >= 1 ) {
+    while ( --k >= 1 )
+    {
         newmonom= pCopy( m );
         pIncrExp( newmonom, varpermutation[k] );
@@ -1112 +1127 @@
         isZero= FALSE;
         v= fglmVector( l.dimen(), 1 );
-        while ( isZero == FALSE ) {
-            if ( (isZero= gauss.reduce( v )) == TRUE ) {
+        while ( !isZero )
+        {
+            if ( (isZero= gauss.reduce( v )))
+            {
                 STICKYPROT( "+" );
                 p= gauss.getDependence();
                 number gcd= p.gcd();
-                if ( ! nIsOne( gcd ) ) {
+                if ( ! nIsOne( gcd ) )
+                {
                     p /= gcd;
                 }