Changeset cf218e8 in git
 Timestamp:
 Apr 10, 2009, 9:01:11 PM (15 years ago)
 Branches:
 (u'fiekerDuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4188d308699580d975efd0f6cca8dcb41c396f70')
 Children:
 8b09ef24947688a333cfa1d2bd4db6970e7bb313
 Parents:
 8d9e0d2856a0d53fb3cce0dd24b0390dd4f9f065
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

kernel/kutil.cc
r8d9e0d rcf218e8 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: kutil.cc,v 1.13 3 20090408 17:32:57motsak Exp $ */4 /* $Id: kutil.cc,v 1.134 20090410 19:01:11 motsak Exp $ */ 5 5 /* 6 6 * ABSTRACT: kernel: utils for kStd … … 1542 1542 if(pHasNotCF(p, strat>S[i])) 1543 1543 { 1544 //if(ncRingType(currRing) == nc_lie)1545 //{1546 //// generalized prodcrit for lietype1547 //strat>cp++;1548 //Lp.p = nc_p_Bracket_qq(pCopy(p),strat>S[i]);1549 //}1550 //else1544 if(ncRingType(currRing) == nc_lie) 1545 { 1546 // generalized prodcrit for lietype 1547 strat>cp++; 1548 Lp.p = nc_p_Bracket_qq(pCopy(p),strat>S[i]); 1549 } 1550 else 1551 1551 if( ALLOW_PROD_CRIT(strat) ) 1552 1552 { … … 1556 1556 } 1557 1557 else 1558 { 1558 1559 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 } 1560 1565 } 1561 1566 else 1567 { 1562 1568 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 } 1564 1575 1565 1576 … … 1614 1625 Lp.p2 = p; 1615 1626 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 } 1619 1635 1620 1636 if (atR >= 0)
Note: See TracChangeset
for help on using the changeset viewer.