Changeset f0d4069 in git


Ignore:
Timestamp:
Jun 12, 2006, 2:35:13 AM (18 years ago)
Author:
Oliver Wienand <wienand@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '648d28f488f6ff08f5607ff229b9ad9e4a5b93c2')
Children:
09b9c1b1bb4bc6dfc8e876d4d65751e7ed32971f
Parents:
c4c516319dd7380d23251f74e2a664cdb5664571
Message:
[oliver]

kutil.cc, polys.cc, ringgb.cc:
* clean up


git-svn-id: file:///usr/local/Singular/svn/trunk@9197 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
kernel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/kutil.cc

    rc4c516 rf0d4069  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.25 2006-06-12 00:07:11 wienand Exp $ */
     4/* $Id: kutil.cc,v 1.26 2006-06-12 00:35:13 wienand Exp $ */
    55/*
    66* ABSTRACT: kernel: utils for kStd
     
    16731673        {
    16741674          if (i < 0)  break;
    1675           if ((strat->L[i].p2 == p) && pLmEqual(strat->L[j].lcm,strat->L[i].lcm)
    1676 #ifdef HAVE_RING2TOM
    1677             && pDivisibleBy(strat->L[j].lcm, strat->L[i].lcm)
    1678 #endif
    1679           )
     1675          if ((strat->L[i].p2 == p) && pLmEqual(strat->L[j].lcm,strat->L[i].lcm))
    16801676          {
    16811677            /*L[i] could be canceled but we search for a better one to cancel*/
     
    16841680            && (pNext(strat->L[l].p) == strat->tail)
    16851681            && (!pLmEqual(strat->L[i].p,strat->L[l].p))
    1686 #ifdef HAVE_RING2TOM
    1687             && 1 == 0
    1688 #endif
    16891682            && pDivisibleBy(p,strat->L[l].lcm))
    16901683            {
     
    18151808  for (j=strat->Ll; j>=0; j--)
    18161809  {
    1817     if (nGreater(pGetCoeff(strat->L[j].lcm), pGetCoeff(p)))
     1810    if (strat->L[j].lcm != NULL && nGreater(pGetCoeff(strat->L[j].lcm), pGetCoeff(p)))
    18181811    {
    18191812      if (pCompareChain(p,strat->L[j].p1,strat->L[j].p2,strat->L[j].lcm))
  • kernel/polys.cc

    rc4c516 rf0d4069  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: polys.cc,v 1.9 2006-06-12 00:07:11 wienand Exp $ */
     4/* $Id: polys.cc,v 1.10 2006-06-12 00:35:13 wienand Exp $ */
    55
    66/*
     
    935935
    936936  if (lcm==NULL) return FALSE;
    937   #ifdef HAVE_RING2TOM
    938   // In coefficient rings, the coefficient plays a role in chain crit TODO
    939   if (currRing->cring == 1 && !pLmDivisibleByNoComp(p, lcm)) return FALSE;
    940   #endif
    941937
    942938  for (j=pVariables; j; j--)
  • kernel/ringgb.cc

    rc4c516 rf0d4069  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ringgb.cc,v 1.11 2006-06-12 00:07:12 wienand Exp $ */
     4/* $Id: ringgb.cc,v 1.12 2006-06-12 00:35:13 wienand Exp $ */
    55/*
    66* ABSTRACT: ringgb interface
     
    205205      return(0);
    206206    }
    207     pDelete(&h);
    208207  }
    209208  Print("I");
Note: See TracChangeset for help on using the changeset viewer.