Changeset 87beab7 in git for kernel/f5gb.h


Ignore:
Timestamp:
Feb 11, 2009, 10:24:08 PM (14 years ago)
Author:
Christian Eder
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
34fcf813ea36a30ddd0d8107abf9a73b247be289
Parents:
c5d8ddb1112344ad68257ea0c296d5b17aee0433
Message:
lots of stuff debugged, lots of wrong loop terminations improved, still problems with reduction subalgorithms reduction(), topReduction() & findReductor()


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

Legend:

Unmodified
Added
Removed

  • kernel/f5gb.h

    rc5d8dd r87beab7  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: f5gb.h,v 1.23 2009-02-08 19:17:54 ederc Exp $ */
     4/* $Id: f5gb.h,v 1.24 2009-02-11 21:24:07 ederc Exp $ */
    55/*
    66* ABSTRACT: f5gb interface
    … …  
    3535==================================================
    3636*/
    37 LList* F5inc(int i, poly f_i, LList* gPrev, ideal gbPrev, poly ONE);
     37LList* F5inc(int i, poly f_i, LList* gPrev, ideal gbPrev, poly ONE, LTagList* lTag, RList* rules, RTagList* rTag);
    3838
    3939/*
    … …  
    4444================================================================
    4545*/
    46 CList* criticalPair(LList* gPrev, CList* critPairs, LTagList* lTag, RTagList* rTag);
     46CList* criticalPair(LList* gPrev, CList* critPairs, LTagList* lTag, RTagList* rTag, RList* rules);
    4747
    4848/*
    … …  
    5858=====================================
    5959*/
    60 bool criterion2(poly* t, LNode* l, RTagList* rTag);
     60bool criterion2(poly* t, LNode* l, RList* rules, RTagList* rTag);
    6161
    6262/*
    … …  
    6565==========================================================================================================
    6666*/
    67 bool criterion2(poly* t, LPoly* l, RTagList* rTag, Rule* lastRuleTested);
     67bool criterion2(poly* t, LPoly* l, RList* rules, Rule* lastRuleTested);
    6868
    6969/*
    … …  
    7979========================================================================
    8080*/
    81 LNode* reduction(LList* sPolyList, LList* completed, LList* gPrev, LTagList* lTag, RTagList* rTag,
     81LList* reduction(LList* &sPolyList, LList* &completed, LList* &gPrev, RList* &rules, LTagList* &lTag, RTagList* &rTag,
    8282                 ideal gbPrev);
    8383
    … …  
    8888=====================================================================================
    8989*/
    90 void topReduction(LNode* l, LList* completed, LList* gPrev, LTagList* lTag, RTagList* rTag);
     90TopRed* topReduction(LNode* l, LList* &completed, LList* &gPrev, RList* &rules, LTagList* &lTag, RTagList* &rTag);
    9191
    9292/*
    … …  
    9595=====================================================================
    9696*/
    97 LRed* findReductor(LNode* l,LList* completed,LList* gPrev,LTagList* lTag,RTagList* rTag,
     97LNode* findReductor(LNode* l,LList* &completed,LList* &gPrev, RList* &rules, LTagList* &lTag,RTagList* &rTag,
    9898                    LNode* gPrevRedCheck, LNode* completedRedCheck);
    9999
    100100/*
    101101======================================
    102 main function of our f5 implementation
     102main function of our F5 implementation
    103103======================================
    104104*/
Note: See TracChangeset for help on using the changeset viewer.