Changeset 6ee080 in git


Ignore:
Timestamp:
Nov 24, 2014, 8:06:57 PM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')
Children:
abd6a89d45e459c5b2873fe52bf29f3e7a08e127
Parents:
638ecc50fb697a8e0a643d6c393f667ff4a4be2f
Message:
code cleanup: moved static definitions to tgb.cc
Location:
kernel/GBEngine
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • kernel/GBEngine/tgb.cc

    r638ecc r6ee080  
    4040#if 1
    4141static omBin lm_bin = NULL;
     42static int add_to_reductors(slimgb_alg* c, poly h, int len, int ecart, BOOLEAN simplified=FALSE);
     43static void multi_reduction(red_object* los, int & losl, slimgb_alg* c);
     44static void multi_reduce_step(find_erg & erg, red_object* r, slimgb_alg* c);
     45static BOOLEAN extended_product_criterion(poly p1, poly gcd1, poly p2, poly gcd2, slimgb_alg* c);
     46static poly gcd_of_terms(poly p, ring r);
     47static int tgb_pair_better_gen(const void* ap,const void* bp);
     48static BOOLEAN pair_better(sorted_pair_node* a,sorted_pair_node* b, slimgb_alg* c=NULL);
     49static BOOLEAN state_is(calc_state state, const int & i, const int & j, slimgb_alg* c);
     50static void super_clean_top_of_pair_list(slimgb_alg* c);
     51static int simple_posInS (kStrategy strat, poly p,int len, wlen_type wlen);
     52static int* make_connections(int from, int to, poly bound, slimgb_alg* c);
     53static BOOLEAN has_t_rep(const int & arg_i, const int & arg_j, slimgb_alg* state);
     54static void shorten_tails(slimgb_alg* c, poly monom);
     55static poly redNF2 (poly h,slimgb_alg* c , int &len, number&  m,int n=0);
     56static poly redNFTail (poly h,const int sl,kStrategy strat, int len);
     57static int bucket_guess(kBucket* bucket);
    4258
    4359static void simplify_poly (poly p, ring r)

  • kernel/GBEngine/tgb_internal.h

    r638ecc r6ee080  
    309309    //SOONTREP
    310310  };
    311 //static BOOLEAN pair_cmp(sorted_pair_node* a,sorted_pair_node* b);
    312311template <class len_type, class set_type>  int pos_helper(kStrategy strat, poly p, len_type len, set_type setL, polyset set);
    313 static int add_to_reductors(slimgb_alg* c, poly h, int len, int ecart, BOOLEAN simplified=FALSE);
    314 static int bucket_guess(kBucket* bucket);
    315 static poly redNFTail (poly h,const int sl,kStrategy strat, int len);
    316 static poly redNF2 (poly h,slimgb_alg* c , int &len, number&  m,int n=0);
    317312void free_sorted_pair_node(sorted_pair_node* s, ring r);
    318 static void shorten_tails(slimgb_alg* c, poly monom);
    319 static void replace_pair(int & i, int & j, slimgb_alg* c);
    320 //static sorted_pair_node** add_to_basis(poly h, int i, int j,slimgb_alg* c, int* ip=NULL);
    321 //static void do_this_spoly_stuff(int i,int j,slimgb_alg* c);
    322 //ideal t_rep_gb(ring r,ideal arg_I);
    323313ideal do_t_rep_gb(ring r,ideal arg_I, int syz_comp, BOOLEAN F4_mode,int deg_pos);
    324 static BOOLEAN has_t_rep(const int & arg_i, const int & arg_j, slimgb_alg* state);
    325 //static int* make_connections(int from, poly bound, slimgb_alg* c);
    326 static int* make_connections(int from, int to, poly bound, slimgb_alg* c);
    327314void now_t_rep(const int & arg_i, const int & arg_j, slimgb_alg* c);
    328 //static void soon_t_rep(const int & arg_i, const int & arg_j, slimgb_alg* c);
    329 //static int pLcmDeg(poly a, poly b);
    330 static int simple_posInS (kStrategy strat, poly p,int len, wlen_type wlen);
    331 //static BOOLEAN find_next_pair(slimgb_alg* c, BOOLEAN go_higher=TRUE);
    332 
    333 //static sorted_pair_node* pop_pair(slimgb_alg* c);
    334 //static BOOLEAN no_pairs(slimgb_alg* c);
     315
    335316void clean_top_of_pair_list(slimgb_alg* c);
    336 static void super_clean_top_of_pair_list(slimgb_alg* c);
    337 static BOOLEAN state_is(calc_state state, const int & i, const int & j, slimgb_alg* c);
    338 static BOOLEAN pair_better(sorted_pair_node* a,sorted_pair_node* b, slimgb_alg* c=NULL);
    339 static int tgb_pair_better_gen(const void* ap,const void* bp);
    340 static poly redTailShort(poly h, kStrategy strat);
    341 static poly gcd_of_terms(poly p, ring r);
    342 static BOOLEAN extended_product_criterion(poly p1, poly gcd1, poly p2, poly gcd2, slimgb_alg* c);
    343 //static poly kBucketGcd(kBucket* b, ring r);
    344 static void multi_reduction(red_object* los, int & losl, slimgb_alg* c);
    345317int slim_nsize(number n, ring r);
    346318sorted_pair_node* quick_pop_pair(slimgb_alg* c);
    … …  
    351323int tgb_pair_better_gen2(const void* ap,const void* bp);
    352324int kFindDivisibleByInS_easy(kStrategy strat,poly p, long sev);
    353 //static int quality(poly p, int len, slimgb_alg* c);
    354325/**
    355326   makes on each red_object in a region a single_step
    … …  
    402373
    403374};
    404 
    405 static void multi_reduce_step(find_erg & erg, red_object* r, slimgb_alg* c);
    406 //static void finalize_reduction_step(reduction_step* r);
    407375
    408376template <class len_type, class set_type>  int pos_helper(kStrategy strat, poly p, len_type len, set_type setL, polyset set)
    … …  
    14571425}
    14581426#endif
    1459 static wlen_type pair_weighted_length(int i, int j, slimgb_alg* c);
    14601427wlen_type pELength(poly p, ring r);
    14611428int terms_sort_crit(const void* a, const void* b);
Note: See TracChangeset for help on using the changeset viewer.