Changeset fb82895 in git


Ignore:
Timestamp:
Jun 22, 2010, 6:29:47 PM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
0398e1a2da70828a8f9d960d4942585db16f2a73
Parents:
963057da7a809bc812a86897df7ddc609e67a449
Message:
pDeleteLm ->pLmDelete

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

Legend:

Unmodified
Added
Removed

  • Singular/iparith.cc

    r963057 rfb82895  
    15731573      if (o!=NULL)
    15741574      {
    1575         pDeleteLm(&pNext(o));
     1575        if (pNext(o)!=NULL) pLmDelete(&pNext(o));
    15761576        p=pNext(o);
    15771577      }
    15781578      else
    1579         pDeleteLm(&p);
     1579        pLmDelete(&p);
    15801580    }
    15811581    else
    … …  
    16161616      if (i==iv->length())
    16171617      {
    1618         pDeleteLm(&p);
     1618        pLmDelete(&p);
    16191619        if (p==NULL) break;
    16201620      }
    16211621    }
    1622     pDeleteLm(&r);
     1622    pLmDelete(&r);
    16231623    res->data=(char *)r;
    16241624  }

  • Singular/pcv.cc

    r963057 rfb82895  
    244244  else
    245245  {
    246     pDeleteLm(&m);
     246    pLmDelete(&m);
    247247    return NULL;
    248248  }
    … …  
    438438  for(int d=d0,i=0;d<d1;d++)
    439439    i=pcvBasis(b,i,m,d,1);
    440   pDeleteLm(&m);
     440  pLmDelete(&m);
    441441  return b;
    442442}

  • kernel/fglmcomb.cc

    r963057 rfb82895  
    9696
    9797        poly m = pOne();
    98         for ( i= pVariables; i > 0; i-- ) {
     98        for ( i= pVariables; i > 0; i-- )
     99        {
    99100            diff= pGetExp( *pptr, i ) - pGetExp( p2, i );
    100101            pSetExp( m, i, diff );
    … …  
    105106
    106107        p2= pCopy( p2 );
    107         pDeleteLm(pptr);
    108         pDeleteLm( & p2 );
     108        pLmDelete(pptr);
     109        pLmDelete( & p2 );
    109110        p2= pMult( m, p2 );
    110111

  • kernel/gring.cc

    r963057 rfb82895  
    432432    sum += v;
    433433
    434     p_DeleteLm(&p,r);
     434    p_LmDelete(&p,r);
    435435  }
    436436  freeT(P,rN);
    … …  
    653653     c[cnt]=n_Mult(c[cnt-1],p_GetCoeff(w,r),r);
    654654     D = pNext(w);  /* getting coef and rest D */
    655      p_DeleteLm(&w,r);
     655     p_LmDelete(&w,r);
    656656     w=NULL;
    657657
    … …  
    897897     c[cnt]=n_Copy(p_GetCoeff(w,r),r);
    898898     D = pNext(w);  /* getting coef and rest D */
    899      p_DeleteLm(&w,r);
     899     p_LmDelete(&w,r);
    900900     w=NULL;
    901901

  • kernel/hdegree.cc

    r963057 rfb82895  
    13531353  omFreeSize((ADDRESS)act, (pVariables + 1) * sizeof(int));
    13541354  hKill(stcmem, pVariables - 1);
    1355   pDeleteLm(&p);
     1355  pLmDelete(&p);
    13561356  if (p == NULL)
    13571357    return idInit(1,s->rank);

  • kernel/ideals.cc

    r963057 rfb82895  
    971971      {
    972972        pIter(*p);
    973         pDeleteLm(&qp2);
     973        pLmDelete(&qp2);
    974974        qp2 = *p;
    975975        qp1 = *p;
    … …  
    978978      {
    979979        qp2->next = qp1->next;
    980         pDeleteLm(&qp1);
     980        if (qp1!=NULL) pLmDelete(&qp1);
    981981        qp1 = qp2->next;
    982982      }

  • kernel/kbuckets.cc

    r963057 rfb82895  
    11051105  if(a1==NULL)
    11061106  {
    1107     p_DeleteLm(&lm, bucket->bucket_ring);
     1107    p_LmDelete(&lm, bucket->bucket_ring);
    11081108    return nInit(1);
    11091109  }
    … …  
    11661166  if (backuped)
    11671167    p_SetCoeff0(a1,coef,bucket->bucket_ring);
    1168   p_DeleteLm(&lm, bucket->bucket_ring);
     1168  p_LmDelete(&lm, bucket->bucket_ring);
    11691169  if (reset_vec) p_SetCompP(a1, 0, bucket->bucket_ring);
    11701170  kbTest(bucket);

  • kernel/maps.cc

    r963057 rfb82895  
    477477    if (product == NULL)
    478478    {
    479       pDeleteLm(&p);
     479      pLmDelete(&p);
    480480    }
    481481    else

  • kernel/matpol.cc

    r963057 rfb82895  
    15981598    else
    15991599    {
    1600       pDeleteLm(&a2);
     1600      pLmDelete(&a2);
    16011601      a = pNext(a) = a1;
    16021602      pIter(a1);
    … …  
    16131613    }
    16141614  }
    1615   pDeleteLm(&p);
     1615  pLmDelete(&p);
    16161616  return p;
    16171617}

  • kernel/pInline2.h

    r963057 rfb82895  
    347347}
    348348
    349 PINLINE2 void p_DeleteLm(poly *p, ring r)
    350 {
    351   pIfThen2(*p != NULL, p_LmCheckPolyRing2(*p, r));
    352   poly h = *p;
    353   if (h != NULL)
    354   {
    355     n_Delete(&_pGetCoeff(h), r);
    356     *p = _pNext(h);
    357     omFreeBinAddr(h);
    358   }
    359 }
    360 PINLINE2 void p_DeleteLm(poly p, ring r)
    361 {
    362   pIfThen2(p != NULL, p_LmCheckPolyRing2(p, r));
    363   if (p != NULL)
    364   {
    365     n_Delete(&_pGetCoeff(p), r);
    366     omFreeBinAddr(p);
    367   }
    368 }
    369349PINLINE2 void p_LmFree(poly p, ring r)
    370350{

  • kernel/p_Mult_nn__T.cc

    r963057 rfb82895  
    4949      {
    5050        pIter(p);
    51         p_DeleteLm(&q, r);
     51        p_LmDelete(&q, r);
    5252      }
    5353      else
    5454      {
    55         p_DeleteLm(&p, r);
     55        p_LmDelete(&p, r);
    5656        pNext(old) = p;
    5757      }

  • kernel/p_polys.cc

    r963057 rfb82895  
    11151115    pSetCoeff0(rc,n_Init(i,r));
    11161116    if (r->cf->nIsZero(p_GetCoeff(rc,r)))
    1117       p_DeleteLm(&rc,r);
     1117      p_LmDelete(&rc,r);
    11181118  }
    11191119  return rc;

  • kernel/p_polys.h

    r963057 rfb82895  
    9393 *
    9494 * Allocation/Initalization/Deletion
    95  * except for pDeleteLm and pHead, all polys must be != NULL
     95 * except for pHead, all polys must be != NULL
    9696 *
    9797 ***************************************************************/
    … …  
    104104PINLINE1 poly p_LmInit(poly s_p, ring s_r, ring d_p, omBin d_bin);
    105105PINLINE1 poly p_Head(poly p, ring r);
    106 PINLINE2 void p_DeleteLm(poly *p, ring r);
    107 PINLINE2 void p_DeleteLm(poly p, ring r);
    108106PINLINE2 void p_LmFree(poly p, ring r);
    109107PINLINE2 void p_LmFree(poly *p, ring r);

  • kernel/polys.cc

    r963057 rfb82895  
    164164      if (prev==NULL)
    165165      {
    166         pDeleteLm(&result);
     166        pLmDelete(&result);
    167167        a=result;
    168168      }
    169169      else
    170170      {
    171         pDeleteLm(&pNext(prev));
     171        pLmDelete(&pNext(prev));
    172172        a=pNext(prev);
    173173      }

  • kernel/polys.h

    r963057 rfb82895  
    8484 *
    8585 * Allocation/Initalization/Deletion
    86  * except for pDeleteLm and pHead, all polys must be != NULL
     86 * except for pHead, all polys must be != NULL
    8787 *
    8888 ***************************************************************/
    … …  
    9797// p might be NULL
    9898#define pHead(p)        p_Head(p, currRing)
    99 // if *p_ptr != NULL, delete p_ptr->coef, *p_ptr, and set *p_ptr to
    100 // pNext(*p_ptr)
    101 static inline void pDeleteLm(poly *p) {p_DeleteLm(p, currRing);}
    102 // if (p!=NULL) delete p-coef and p
    103 static inline void pDeleteLm(poly p)  {p_DeleteLm(p, currRing);}
    10499// frees the space of the monomial m, assumes m != NULL
    105100// coef is not freed, m is not advanced

  • kernel/polys1.cc

    r963057 rfb82895  
    239239    p_MonMult(b,tail,r);
    240240  }
    241   p_DeleteLm(&tail,r);
     241  p_LmDelete(&tail,r);
    242242  pNext(res) = b;
    243243  pNext(b) = NULL;

  • kernel/sparsmat.cc

    r963057 rfb82895  
    22562256      {
    22572257        x = nAdd(pGetCoeff(pb), pGetCoeff(r));
    2258         pDeleteLm(&r);
     2258        pLmDelete(&r);
    22592259        if (nIsZero(x))
    22602260        {
    2261           pDeleteLm(&pb);
     2261          pLmDelete(&pb);
    22622262          pNext(pa) = pAdd(pb,r);
    22632263        }
    … …  
    23052305      {
    23062306        x = nAdd(pGetCoeff(pa), pGetCoeff(r));
    2307         pDeleteLm(&r);
     2307        pLmDelete(&r);
    23082308        if (nIsZero(x))
    23092309        {
    2310           pDeleteLm(&pa);
     2310          pLmDelete(&pa);
    23112311          if (pp!=NULL)
    23122312            pNext(pp) = pAdd(pa,r);
Note: See TracChangeset for help on using the changeset viewer.