Changeset a05c71 in git for kernel/f5gb.h


Ignore:
Timestamp:
Aug 31, 2009, 3:55:46 PM (14 years ago)
Author:
Christian Eder
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')
Children:
fb1212fa95dcc1179dddfd72a79683e1282d5662
Parents:
f414c0965b52eb8faa2ff8c9afef799657e50a29
Message:
termination tests included in procedure findReducers()


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

Legend:

Unmodified
Added
Removed

  • kernel/f5gb.h

    rf414c0 ra05c71  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: f5gb.h,v 1.43 2009-08-30 15:26:00 ederc Exp $ */
     4/* $Id: f5gb.h,v 1.44 2009-08-31 13:55:46 ederc Exp $ */
    55/*
    66* ABSTRACT: f5gb interface
    … …  
    3434==========================================================================
    3535*/
    36 bool compareMonomials(int* m1, int** m2, int numberOfRules);
     36bool compareMonomials(int* m1, int** m2, int numberOfRuleOlds);
    3737
    3838
    … …  
    4343==================================================
    4444*/
    45 LList* F5inc(int i, poly f_i, LList* gPrev, ideal gbPrev, poly ONE, LTagList* lTag, RList* rules, RTagList* rTag,int termination);
     45LList* F5inc(int i, poly f_i, LList* gPrev,LList* reducers, ideal gbPrev, poly ONE, LTagList* lTag, RList* rules, RTagList* rTag,int termination);
    4646
    4747/*
    … …  
    5252================================================================
    5353*/
    54 void criticalPair(LList* gPrev, CListOld* critPairs, LTagList* lTag, RTagList* rTag, RList* rules);
     54void criticalPair(LList* gPrev, CListOld* critPairs, LTagList* lTag, RTagList* rTag, RList* RuleOlds);
    5555
    5656/*
    … …  
    6666=====================================
    6767*/
    68 inline bool criterion2(int idx, poly t, LNode* l, RList* rules, RTagList* rTag);
     68inline bool criterion2(int idx, poly t, LNode* l, RList* RuleOlds, RTagList* rTag);
    6969
    7070/*
    7171==========================================================================================================
    72 Criterion 2, i.e. Rewritten Criterion, for its second call in sPols(), with added lastRuleTested parameter
     72Criterion 2, i.e. Rewritten Criterion, for its second call in sPols(), with added lastRuleOldTested parameter
    7373==========================================================================================================
    7474*/
    75 inline bool criterion2(poly t, LPoly* l, RList* rules, Rule* testedRule);
     75inline bool criterion2(poly t, LPolyOld* l, RList* RuleOlds, RuleOld* testedRuleOld);
    7676
    7777/*
    … …  
    8080==================================
    8181*/
    82 inline void computeSPols(CNode* first, RTagList* rTag, RList* rules, LList* sPolyList);
     82inline void computeSPols(CNode* first, RTagList* rTag, RList* RuleOlds, LList* sPolyList);
    8383
    8484/*
    … …  
    8787========================================================================
    8888*/
    89 inline void reduction(LList* sPolyList, CListOld* critPairs, LList* gPrev, RList* rules, LTagList* lTag, RTagList* rTag,
     89inline void reduction(LList* sPolyList, CListOld* critPairs, LList* gPrev, RList* RuleOlds, LTagList* lTag, RTagList* rTag,
    9090                 ideal gbPrev);
    9191
    … …  
    9595========================================================================
    9696*/
    97 inline void newReduction(LList* sPolyList, CListOld* critPairs, LList* gPrev, RList* rules, LTagList* lTag, RTagList* rTag, ideal gbPrev, int termination);
     97inline void newReduction(LList* sPolyList, CListOld* critPairs, LList* gPrev, LList* reducers, RList* rules, LTagList* lTag, RTagList* rTag, ideal gbPrev, int termination);
    9898
    9999/*!
    … …  
    106106 *
    107107 * the "bad" ones are the reducers which corrupt the label of temp, they are tested
    108  * later on for possible new rules and S-polynomials to be added to the algorithm
     108 * later on for possible new RuleOlds and S-polynomials to be added to the algorithm
    109109 * ================================================================================
    110110 */
    111 void findReducers(LNode* l, LList* sPolyList, ideal gbPrev, LList* gPrev, CListOld* critPairs, RList* rules, LTagList* lTag, RTagList* rTag, int termination);
     111void findReducers(LNode* l, LList* sPolyList, ideal gbPrev, LList* gPrev, LList* reducers, CListOld* critPairs, RList* rules, LTagList* lTag, RTagList* rTag, int termination);
    112112
    113113/*
    … …  
    117117=====================================================================================
    118118*/
    119 inline void topReduction(LNode* l, LList* sPolyList, LList* gPrev, CListOld* critPairs, RList* rules, LTagList* lTag, RTagList* rTag, ideal gbPrev);
     119inline void topReduction(LNode* l, LList* sPolyList, LList* gPrev, CListOld* critPairs, RList* RuleOlds, LTagList* lTag, RTagList* rTag, ideal gbPrev);
    120120
    121121/*
    … …  
    133133=====================================================================
    134134*/
    135 inline LNode* findReductor(LNode* l, LList* sPolyList, LNode* gPrevRedCheck, LList* gPrev, RList* rules, LTagList* lTag,RTagList* rTag);
     135inline LNode* findReductor(LNode* l, LList* sPolyList, LNode* gPrevRedCheck, LList* gPrev, RList* RuleOlds, LTagList* lTag,RTagList* rTag);
    136136
    137137/*
Note: See TracChangeset for help on using the changeset viewer.