Changeset 7523a7 in git


Ignore:
Timestamp:
Jun 12, 2006, 7:40:10 PM (18 years ago)
Author:
Oliver Wienand <wienand@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '648d28f488f6ff08f5607ff229b9ad9e4a5b93c2')
Children:
ffde366b5edf43184cdef9fba1212ec84b1b00c5
Parents:
d2bf5007073dfa4f5f78e737768f464d25fcb0b6
Message:
[oliver]

kutil.*:
* clean up


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

Legend:

Unmodified
Added
Removed
  • kernel/kutil.cc

    rd2bf500 r7523a7  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.27 2006-06-12 14:27:23 Singular Exp $ */
     4/* $Id: kutil.cc,v 1.28 2006-06-12 17:40:09 wienand Exp $ */
    55/*
    66* ABSTRACT: kernel: utils for kStd
     
    18541854          deleteInL(strat->L,&strat->Ll,j,strat);
    18551855          strat->c3++;
    1856           Print("|UL|");
     1856          // Print("|UL|");
    18571857        }
    18581858      }
     
    18951895        if (i < 0)  break;
    18961896        // Element is from B and has the same lcm as L[j]
    1897         if ((strat->L[i].p2 == p) && pLmEqual(strat->L[j].lcm,strat->L[i].lcm)
    1898 #ifdef HAVE_RING2TOM
    1899           && nGreater(pGetCoeff(strat->L[j].lcm), pGetCoeff(strat->L[i].lcm))
    1900 #endif
    1901         )
     1897        if ((strat->L[i].p2 == p) && nGreater(pGetCoeff(strat->L[j].lcm), pGetCoeff(strat->L[i].lcm))
     1898             && pLmEqual(strat->L[j].lcm,strat->L[i].lcm))
    19021899        {
    19031900          /*L[i] could be canceled but we search for a better one to cancel*/
    19041901          strat->c3++;
    1905           Print("|EP|");
     1902          // Print("|EP|");
    19061903          if (isInPairsetL(i-1,strat->L[j].p1,strat->L[i].p1,&l,strat)
    19071904          && (pNext(strat->L[l].p) == strat->tail)
    19081905          && (!pLmEqual(strat->L[i].p,strat->L[l].p))
    1909 #ifdef HAVE_RING2TOM
    1910 //        && 1 == 0
    1911 #endif
    19121906          && pDivisibleBy(p,strat->L[l].lcm))
    19131907          {
  • kernel/kutil.h

    rd2bf500 r7523a7  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: kutil.h,v 1.16 2006-05-19 10:22:36 Singular Exp $ */
     6/* $Id: kutil.h,v 1.17 2006-06-12 17:40:10 wienand Exp $ */
    77/*
    88* ABSTRACT: kernel: utils for kStd
     
    280280  BOOLEAN * NotUsedAxis;
    281281  BOOLEAN * pairtest;/*used for enterOnePair*/
     282#ifdef HAVE_RING2TOM
     283//  unsigned int * lmcomp;/*used for enterOnePairRing and chainCritRing*/
     284#endif
    282285  poly tail;
    283286  leftv kIdeal;
Note: See TracChangeset for help on using the changeset viewer.