Changeset ab76b4 in git for kernel/f5gb.h


Ignore:
Timestamp:
Mar 8, 2010, 11:49:06 AM (13 years ago)
Author:
Christian Eder
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
c1a5fdccad23660f683eef44f4ca207fa4050c1c
Parents:
56b0c82650ffab78c72a5629796b5fe751482448
Message:
latest F5 version including F5,F5R,F5C & F5+

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

Legend:

Unmodified
Added
Removed

  • kernel/f5gb.h

    r56b0c8 rab76b4  
    4343==================================================
    4444*/
    45 LList* F5inc(int i, poly f_i, LList* gPrev,LList* reducers, 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 plus ,int termination);
    4646
    4747/*
    … …  
    5555================================================================
    5656*/
    57 void criticalPair(LList* gPrev, CListOld* critPairs, LTagList* lTag, RTagList* rTag, RList* RuleOlds);
     57void criticalPair(LList* gPrev, CListOld* critPairs, LTagList* lTag, RTagList* rTag, RList* RuleOlds, PList* rejectedGBList, int plus);
     58
     59
     60bool checkDGB(LList* gPrev);
     61
     62
     63/*
     64 * Arris Check if we are finished after the current degree step:
     65 * Checks all remaining critical pairs, i.e. those of higher degree,
     66 * by the two Buchberger criteria.
     67 * return value: 0, if all remaining critical pairs are deleted by
     68 *                  Buchberger's criteria
     69 *               1, otherwise
     70 */
     71bool arrisCheck(CNode* first,LNode* firstGCurr, long arrisdeg);
    5872
    5973/*
    … …  
    6680================================================================
    6781*/
    68 void criticalPair2(LList* gPrev, CListOld* critPairs, LTagList* lTag, RTagList* rTag, RList* RuleOlds);
     82void criticalPair2(LList* gPrev, CListOld* critPairs, LTagList* lTag, RTagList* rTag, RList* RuleOlds, PList* rejectedGBList);
    6983
    7084/*
    … …  
    90104
    91105/*
     106 * check for useful pairs in the given subset of critical pairs
     107 */
     108int computeUsefulMinDeg(CNode* first);
     109
     110/*
    92111==================================
    93112Computation of S-Polynomials in F5
    94113==================================
    95114*/
    96 inline void computeSPols(CNode* first, RTagList* rTag, RList* RuleOlds, LList* sPolyList);
     115inline void computeSPols(CNode* first, RTagList* rTag, RList* RuleOlds, LList* sPolyList, PList* rejectedGBList);
    97116
    98117/*
    … …  
    102121*/
    103122inline void reduction(LList* sPolyList, CListOld* critPairs, LList* gPrev, RList* RuleOlds, LTagList* lTag, RTagList* rTag,
    104                  ideal gbPrev);
     123                 ideal gbPrev, PList* rejectedGBList, int plus);
    105124
    106125/*
    … …  
    109128========================================================================
    110129*/
    111 inline void newReduction(LList* sPolyList, CListOld* critPairs, LList* gPrev, LList* reducers, RList* rules, LTagList* lTag, RTagList* rTag, ideal gbPrev, int termination);
     130inline void newReduction(LList* sPolyList, CListOld* critPairs, LList* gPrev, LList* reducers, RList* rules, LTagList* lTag, RTagList* rTag, ideal gbPrev, int termination, PList* rejectedGBList, int plus);
    112131
    113132/*!
    … …  
    123142 * ================================================================================
    124143 */
    125 void findReducers(LNode* l, LList* sPolyList, ideal gbPrev, LList* gPrev, LList* reducers, CListOld* critPairs, RList* rules, LTagList* lTag, RTagList* rTag, int termination);
     144void findReducers(LNode* l, LList* sPolyList, ideal gbPrev, LList* gPrev, LList* reducers, CListOld* critPairs, RList* rules, LTagList* lTag, RTagList* rTag, int termination, PList* rejectedGBList, int plus);
    126145
    127146/*
    … …  
    131150=====================================================================================
    132151*/
    133 inline void topReduction(LNode* l, LList* sPolyList, LList* gPrev, CListOld* critPairs, RList* RuleOlds, LTagList* lTag, RTagList* rTag, ideal gbPrev);
     152inline void topReduction(LNode* l, LList* sPolyList, LList* gPrev, CListOld* critPairs, RList* RuleOlds, LTagList* lTag, RTagList* rTag, ideal gbPrev, PList* rejectedGBList, int plus);
    134153
    135154/*
    … …  
    154173======================================
    155174*/
    156 ideal F5main(ideal i, ring r, int opt, int termination);
     175ideal F5main(ideal i, ring r, int opt, int plus, int termination);
    157176
    158177#endif
Note: See TracChangeset for help on using the changeset viewer.