Changeset cf218e8 in git


Ignore:
Timestamp:
Apr 10, 2009, 9:01:11 PM (15 years ago)
Author:
Motsak Oleksandr <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4188d308699580d975efd0f6cca8dcb41c396f70')
Children:
8b09ef24947688a333cfa1d2bd4db6970e7bb313
Parents:
8d9e0d2856a0d53fb3cce0dd24b0390dd4f9f065
Message:
*motsak: Lie bracket instead of S-poly for Lie-algebras due to Viktor


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

Legend:

Unmodified
Added
Removed
  • kernel/kutil.cc

    r8d9e0d rcf218e8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.133 2009-04-08 17:32:57 motsak Exp $ */
     4/* $Id: kutil.cc,v 1.134 2009-04-10 19:01:11 motsak Exp $ */
    55/*
    66* ABSTRACT: kernel: utils for kStd
     
    15421542      if(pHasNotCF(p, strat->S[i]))
    15431543      {
    1544 //         if(ncRingType(currRing) == nc_lie)
    1545 //         {
    1546 //             // generalized prod-crit for lie-type
    1547 //             strat->cp++;
    1548 //             Lp.p = nc_p_Bracket_qq(pCopy(p),strat->S[i]);
    1549 //         }
    1550 //         else
     1544         if(ncRingType(currRing) == nc_lie)
     1545         {
     1546             // generalized prod-crit for lie-type
     1547             strat->cp++;
     1548             Lp.p = nc_p_Bracket_qq(pCopy(p),strat->S[i]);
     1549         }
     1550         else
    15511551        if( ALLOW_PROD_CRIT(strat) )
    15521552        {
     
    15561556        }
    15571557        else
     1558        {
    15581559          Lp.p = // nc_CreateSpoly(strat->S[i],p,currRing);
    1559                  nc_CreateShortSpoly(strat->S[i], p, currRing);
     1560                nc_CreateShortSpoly(strat->S[i], p, currRing);
     1561
     1562          assume(pNext(Lp.p)==NULL); // TODO: this may be violated whenever ext.prod.crit. for Lie alg. is used   
     1563          pNext(Lp.p) = strat->tail; // !!!
     1564        }
    15601565      }
    15611566      else
     1567      {
    15621568        Lp.p = // nc_CreateSpoly(strat->S[i],p,currRing);
    1563                 nc_CreateShortSpoly(strat->S[i], p, currRing);
     1569              nc_CreateShortSpoly(strat->S[i], p, currRing);
     1570
     1571        assume(pNext(Lp.p)==NULL); // TODO: this may be violated whenever ext.prod.crit. for Lie alg. is used   
     1572        pNext(Lp.p) = strat->tail; // !!!
     1573
     1574      }
    15641575
    15651576     
     
    16141625    Lp.p2 = p;
    16151626
    1616 //    if ( !rIsPluralRing(currRing) ) // !!!!
    1617     assume(pNext(Lp.p)==NULL);
    1618     pNext(Lp.p) = strat->tail; // !!!
     1627    if (
     1628        (!rIsPluralRing(currRing))
     1629//      ||  (rIsPluralRing(currRing) && (ncRingType(currRing) != nc_lie))         
     1630       )
     1631    {
     1632      assume(pNext(Lp.p)==NULL); // TODO: this may be violated whenever ext.prod.crit. for Lie alg. is used   
     1633      pNext(Lp.p) = strat->tail; // !!!
     1634    }
    16191635
    16201636    if (atR >= 0)
Note: See TracChangeset for help on using the changeset viewer.