Changeset 8978fd in git


Ignore:
Timestamp:
Feb 4, 2009, 8:27:12 PM (14 years ago)
Author:
Christian Eder
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
d3398c35021cfa5baa399786805374952ed30fc2
Parents:
a41f3aa4c75f6fbb2d1a2fdcd12f72b57876f857
Message:
criterion2() for spols() added


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

Legend:

Unmodified
Added
Removed

  • kernel/f5gb.cc

    ra41f3aa r8978fd  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: f5gb.cc,v 1.21 2009-02-03 20:55:43 ederc Exp $ */
     4/* $Id: f5gb.cc,v 1.22 2009-02-04 19:27:11 ederc Exp $ */
    55/*
    66* ABSTRACT: f5gb interface
    … …  
    180180}
    181181
     182/*
     183==========================================================================================================
     184Criterion 2, i.e. Rewritten Criterion, for its second call in sPols(), with added lastRuleTested parameter
     185==========================================================================================================
     186*/
     187bool criterion2(poly* t, LNode* l, RTagList* rTag, Rule* lastRuleTested) {
     188    // start at the previously added element to gPrev, as all other elements will have the same index for sure
     189    RNode* testNode =   rTag->getFirst();
     190    // save the monom t1*label_term(l) as it is tested various times in the following
     191    poly u1 = ppMult_qq(*t,l->getTerm());
     192    // first element added to rTag was NULL, check for this
     193    Print("Hier1\n");
     194    while(NULL != testNode && testNode->getRule()->getOrigin() != l->getLPoly()) {
     195        Print("Hier2\n");
     196        if(pLmDivisibleByNoComp(ppMult_qq(*t,l->getTerm()),testNode->getRuleTerm())) {
     197            return true;
     198        }
     199        testNode    =   testNode->getNext();
     200    }
     201    return false;
     202}
    182203
    183204/*

  • kernel/f5gb.h

    ra41f3aa r8978fd  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: f5gb.h,v 1.20 2009-02-03 20:55:43 ederc Exp $ */
     4/* $Id: f5gb.h,v 1.21 2009-02-04 19:27:12 ederc Exp $ */
    55/*
    66* ABSTRACT: f5gb interface
    … …  
    6161
    6262/*
     63==========================================================================================================
     64Criterion 2, i.e. Rewritten Criterion, for its second call in sPols(), with added lastRuleTested parameter
     65==========================================================================================================
     66*/
     67bool criterion2(poly* t, LNode* l, RTagList* rTag, Rule* lastRuleTested);
     68 
     69/*
    6370======================================
    6471main function of our f5 implementation

  • kernel/f5lists.cc

    ra41f3aa r8978fd  
    629629}
    630630
     631RNode* RTagList::getFirst() {
     632    return first->getRNode();
     633}
     634
    631635RNode* RTagList::get(int idx) {
    632636    return first->get(idx, length);

  • kernel/f5lists.h

    ra41f3aa r8978fd  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: f5lists.h,v 1.4 2009-02-03 20:55:43 ederc Exp $ */
     4/* $Id: f5lists.h,v 1.5 2009-02-04 19:27:12 ederc Exp $ */
    55/*
    66* ABSTRACT: list interface
    … …  
    257257        // declaration with first as parameter in LTagNode due to sorting of LTagList
    258258        void    insert(RNode* r);
     259        RNode*  getFirst();
    259260        RNode*  get(int idx);
    260261};
Note: See TracChangeset for help on using the changeset viewer.