Changeset d30a399 in git for kernel/kstd2.cc
- Timestamp:
- Oct 19, 2012, 9:59:20 AM (11 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 8710ff0734063b049b29453b8d06161041fffbc7b37b3984a12e1552c7bafc9fd5a7849240ea7980
- Parents:
- f2359093b446e8c68c3bda0f0484c4dbf7bd93a8
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/kstd2.cc
rf23590 rd30a399 2031 2031 // only global: avoid normalization, return a multiply of NF 2032 2032 poly p; 2033 int i;2034 2033 2035 2034 //if ((idIs0(F))&&(Q==NULL)) … … 2037 2036 //strat->ak = idRankFreeModule(F); 2038 2037 /*- creating temp data structures------------------- -*/ 2039 BITSET save_test=test; 2040 test|=Sy_bit(OPT_REDTAIL); 2038 BITSET save1; 2039 SI_SAVE_OPT1(save1); 2040 si_opt_1|=Sy_bit(OPT_REDTAIL); 2041 2041 initBuchMoraCrit(strat); 2042 2042 strat->initEcart = initEcartBBA; … … 2071 2071 #endif 2072 2072 { 2073 BITSET save=test; 2074 test &= ~Sy_bit(OPT_INTSTRATEGY); 2073 si_opt_1 &= ~Sy_bit(OPT_INTSTRATEGY); 2075 2074 p = redtailBba(p,max_ind,strat,(lazyReduce & KSTD_NF_NONORM)==0); 2076 test=save;2077 2075 } 2078 2076 } … … 2088 2086 omfree(strat->fromQ); 2089 2087 idDelete(&strat->Shdl); 2090 test=save_test;2088 SI_RESTORE_OPT1(save1); 2091 2089 if (TEST_OPT_PROT) PrintLn(); 2092 2090 return p; … … 2113 2111 //strat->ak = idRankFreeModule(F); 2114 2112 /*- creating temp data structures------------------- -*/ 2115 BITSET save_test=test; 2116 test|=Sy_bit(OPT_REDTAIL); 2113 BITSET save1; 2114 SI_SAVE_OPT1(save1); 2115 si_opt_1|=Sy_bit(OPT_REDTAIL); 2117 2116 initBuchMoraCrit(strat); 2118 2117 strat->initEcart = initEcartBBA; … … 2127 2126 /*- compute------------------------------------------------------- -*/ 2128 2127 res=idInit(IDELEMS(q),si_max(q->rank,F->rank)); 2129 BITSET save=test; 2130 test &= ~Sy_bit(OPT_INTSTRATEGY); 2128 si_opt_1 &= ~Sy_bit(OPT_INTSTRATEGY); 2131 2129 for (i=IDELEMS(q)-1; i>=0; i--) 2132 2130 { … … 2155 2153 } 2156 2154 /*- release temp data------------------------------- -*/ 2157 test=save;2155 SI_RESTORE_OPT1(save1); 2158 2156 omfree(strat->sevS); 2159 2157 omfree(strat->ecartS); … … 2166 2164 omfree(strat->fromQ); 2167 2165 idDelete(&strat->Shdl); 2168 test=save_test;2166 SI_RESTORE_OPT1(save1); 2169 2167 if (TEST_OPT_PROT) PrintLn(); 2170 2168 return res; … … 2184 2182 { 2185 2183 int Ll_old, red_result = 1; 2186 BOOLEAN withT = FALSE;2187 2184 int pos = 0; 2188 2185 hilbeledeg=1; … … 3001 2998 void initBbaShift(ideal F,kStrategy strat) 3002 2999 { 3003 int i;3004 // idhdl h;3005 3000 /* setting global variables ------------------- */ 3006 3001 strat->enterS = enterSBba; /* remains as is, we change enterT! */ … … 3035 3030 // if (TEST_OPT_PROT) 3036 3031 // { 3037 // for(i =1; i<=(currRing->N); i++)3032 // for(int i=1; i<=rVar(currRing); i++) 3038 3033 // Print(" %d",ecartWeights[i]); 3039 3034 // PrintLn();
Note: See TracChangeset
for help on using the changeset viewer.