Changeset beef52 in git

Timestamp:

Jun 22, 2010, 3:05:48 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

53f7163fe201cc7e502b3ed7c9ca438af57b001a

Parents:

075c01df3d8723eddf341fd2b5aebb368f0b6768

Message:

pDeleteLm -> pLmDelete

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

Location:

kernel

Files:

• polys.cc (modified) (8 diffs)
• spectrum.cc (modified) (12 diffs)

kernel/polys.cc

@@ -240 +240 @@
       {
         // exponent to large: it is not a monomial
-        p_DeleteLm(&rc,r);
+        p_LmDelete(&rc,r);
         return s_save;
       }
@@ -248 +248 @@
     {
       // 1st char of is not a varname
-      p_DeleteLm(&rc,r);
+      p_LmDelete(&rc,r);
       s--;
       return s;
@@ -254 +254 @@
   }
 done:
-  if (r->cf->nIsZero(pGetCoeff(rc))) p_DeleteLm(&rc,r);
+  if (r->cf->nIsZero(pGetCoeff(rc))) p_LmDelete(&rc,r);
   else
   {
@@ -270 +270 @@
         if( p_GetExp(rc, k, r) > 1 )
         {
-          p_DeleteLm(&rc, r);
+          p_LmDelete(&rc, r);
           goto finish;
         }
@@ -691 +691 @@
   poly q;
 
-  while ((*p!=NULL) && (pGetComp(*p)==k)) pDeleteLm(p);
+  while ((*p!=NULL) && (pGetComp(*p)==k)) pLmDelete(p);
   if (*p==NULL) return;
   q = *p;
@@ -702 +702 @@
   {
     if (pGetComp(pNext(q))==k)
-      pDeleteLm(&(pNext(q)));
+      pLmDelete(&(pNext(q)));
     else
     {
@@ -922 +922 @@
     if (pGetExp(pNext(h),n)!=0)
     {
-      pDeleteLm(&pNext(h));
+      pLmDelete(&pNext(h));
     }
     else
@@ -984 +984 @@
       res=pAdd(res,m);
     }
-    pDeleteLm(&h);
+    pLmDelete(&h);
   }
   omFreeSize((ADDRESS)me,(pVariables+1)*sizeof(int));

kernel/spectrum.cc

@@ -48 +48 @@
     pIter(h);
   }
-  while( h!=(poly)NULL );
+  while( h!=NULL );
 
   return  FALSE;
@@ -106 +106 @@
 int     isMultiple( poly f,poly m )
 {
-  while( f!=(poly)NULL )
+  while( f!=NULL )
   {
     // ---------------------------------------------------
@@ -139 +139 @@
 {
   poly m  = pOne();
-  poly wc = (poly)NULL;
+  poly wc = NULL;
   int  mdegree;
 
@@ -180 +180 @@
   poly    *ptr = &f;
 
-  while( (*ptr)!=(poly)NULL )
+  while( (*ptr)!=NULL )
   {
     if( pLmCmp( *ptr,hc )>=0 )
@@ -204 +204 @@
   poly    *ptr = &f;
 
-  while( (*ptr)!=(poly)NULL )
+  while( (*ptr)!=NULL )
   {
     if( !isMultiple( Z,*ptr ) )
@@ -212 +212 @@
     else
     {
-      pDeleteLm(ptr);
+      pLmDelete(ptr);
     }
   }
@@ -307 +307 @@
   int         carry,k;
   multiCnt    C( pVariables,0 );
-  poly        Z = (poly)NULL;
+  poly        Z = NULL;
 
   int         well = isWell( );
@@ -326 +326 @@
       // ---------------------------
 
-      NF->insert_node( m,(poly)NULL );
+      NF->insert_node( m,NULL );
     }
     else if( isMultiple( Z,m ) )
@@ -361 +361 @@
       nf = normalFormHC( nf,hc );
 
-      if( pNext( nf )==(poly)NULL )
+      if( pNext( nf )==NULL )
       {
         // ----------------------------------
@@ -376 +376 @@
         nf = normalFormZ( nf,Z );
 
-        if( pNext( nf )==(poly)NULL )
+        if( pNext( nf )==NULL )
         {
           // ----------------------------------
@@ -404 +404 @@
             nfhard = normalFormZ ( nfhard,Z );
 
-            if( nfhard==(poly)NULL )
+            if( nfhard==NULL )
             {
               NF->delete_monomial( m );
@@ -435 +435 @@
     while( node!=(spectrumPolyNode*)NULL )
     {
-      if( node->nf!=(poly)NULL && pNext( node->nf )==(poly)NULL )
+      if( node->nf!=NULL && pNext( node->nf )==NULL )
       {
         NF->delete_monomial( node->nf );