Changeset 6d77472 in git for kernel/kstd2.cc
- Timestamp:
- Nov 28, 2013, 5:14:07 PM (10 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- faa12b153d136fe6d92324f9d140a98f250566f5
- Parents:
- f3e25c24fb9167335fed07b0b1d94ea513423a4b
- git-author:
- Christian Eder <ederc@mathematik.uni-kl.de>2013-11-28 17:14:07+01:00
- git-committer:
- Christian Eder <ederc@mathematik.uni-kl.de>2013-12-12 13:51:26+01:00
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/kstd2.cc
rf3e25c r6d77472 55 55 #define SBA_TAIL_RED 1 56 56 #define SBA_PRODUCT_CRITERION 0 57 #define SBA_PRINT_ZERO_REDUCTIONS 1 58 #define SBA_PRINT_REDUCTION_STEPS 1 59 #define SBA_PRINT_OPERATIONS 1 60 #define SBA_PRINT_INTERREDUCTION_STEPS 1 61 #define SBA_PRINT_INTERREDUCTION_OPERATIONS 1 62 #define SBA_PRINT_SIZE_G 1 63 #define SBA_PRINT_SIZE_SYZ 1 57 #define SBA_PRINT_ZERO_REDUCTIONS 0 58 #define SBA_PRINT_REDUCTION_STEPS 0 59 #define SBA_PRINT_OPERATIONS 0 60 #define SBA_PRINT_SIZE_G 0 61 #define SBA_PRINT_SIZE_SYZ 0 64 62 #define SBA_PRINT_PRODUCT_CRITERION 0 65 63 66 64 // counts sba's reduction steps 65 #if SBA_PRNT_REDUCTION_STEPS 67 66 long sba_reduction_steps; 67 long sba_interreduction_steps; 68 #endif 69 #if SBA_PRINT_OPERATIONS 68 70 long sba_operations; 69 70 // counts interreduction steps if sba is used incrementally71 long sba_interreduction_steps;72 71 long sba_interreduction_operations; 72 #endif 73 73 74 /*********************************************** 74 75 * SBA stuff -- done … … 476 477 477 478 ksReducePoly(h, &(strat->T[ii]), NULL, NULL, strat); 478 #if SBA_PRINT_ INTERREDUCTION_STEPS479 #if SBA_PRINT_REDUCTION_STEPS 479 480 sba_interreduction_steps++; 480 481 #endif 481 #if SBA_PRINT_ INTERREDUCTION_OPERATIONS482 #if SBA_PRINT_REDUCTION_OPERATIONS 482 483 sba_interreduction_operations += pLength(strat->T[ii].p); 483 484 #endif … … 927 928 928 929 ksReducePoly(h, &(strat->T[ii]), NULL, NULL, strat); 929 #if SBA_PRINT_ INTERREDUCTION_STEPS930 #if SBA_PRINT_REDUCTION_STEPS 930 931 sba_interreduction_steps++; 931 932 #endif 932 #if SBA_PRINT_ INTERREDUCTION_OPERATIONS933 #if SBA_PRINT_REDUCTION_OPERATIONS 933 934 sba_interreduction_operations += pLength(strat->T[ii].p); 934 935 #endif … … 1103 1104 number coef; 1104 1105 ksReducePoly(h,&(strat->T[ii]),strat->kNoetherTail(),&coef,strat); 1105 #if SBA_PRINT_ INTERREDUCTION_STEPS1106 #if SBA_PRINT_REDUCTION_STEPS 1106 1107 sba_interreduction_steps++; 1107 1108 #endif 1108 #if SBA_PRINT_ INTERREDUCTION_OPERATIONS1109 #if SBA_PRINT_REDUCTION_OPERATIONS 1109 1110 sba_interreduction_operations += pLength(strat->T[ii].p); 1110 1111 #endif … … 1675 1676 // The corresponding orders are computed in sbaRing(), depending 1676 1677 // on the flag strat->incremental 1678 #if SBA_PRINT_ZERO_REDUCTIONS 1677 1679 long zeroreductions = 0; 1680 #endif 1681 #if SBA_PRINT_PRODUCT_CRITERION 1678 1682 long product_criterion = 0; 1683 #endif 1684 #if SBA_PRINT_SIZE_G 1679 1685 long size_g = 0; 1686 #endif 1687 #if SBA_PRINT_SIZE_SYZ 1680 1688 long size_syz = 0; 1689 #endif 1681 1690 // global variable 1691 #if SBA_PRINT_REDUCTION_STEPS 1682 1692 sba_reduction_steps = 0; 1693 sba_interreduction_steps = 0; 1694 #endif 1695 #if SBA_PRINT_OPERATIONS 1683 1696 sba_operations = 0; 1684 sba_interreduction_steps = 0;1685 1697 sba_interreduction_operations = 0; 1698 #endif 1686 1699 1687 1700 ideal F = F0; … … 2116 2129 // pair was not detected by the rewritten criterion in strat->red = redSig 2117 2130 if (red_result!=2) { 2131 #if SBA_PRINT_ZERO_REDUCTIONS 2118 2132 zeroreductions++; 2133 #endif 2119 2134 enterSyz(strat->P,strat); 2120 2135 //#if 1 … … 2236 2251 printf("----------------------------------------------------------\n"); 2237 2252 printf("ZERO REDUCTIONS: %ld\n",zeroreductions); 2253 zeroreductions = 0; 2238 2254 #endif 2239 2255 #if SBA_PRINT_REDUCTION_STEPS 2240 2256 printf("----------------------------------------------------------\n"); 2241 printf(" TOP S-REDUCTIONS:%ld\n",sba_reduction_steps);2257 printf("S-REDUCTIONS: %ld\n",sba_reduction_steps); 2242 2258 #endif 2243 2259 #if SBA_PRINT_OPERATIONS 2244 2260 printf("OPERATIONS: %ld\n",sba_operations); 2245 2261 #endif 2246 #if SBA_PRINT_ INTERREDUCTION_STEPS2262 #if SBA_PRINT_REDUCTION_STEPS 2247 2263 printf("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - \n"); 2248 2264 printf("INTERREDUCTIONS: %ld\n",sba_interreduction_steps); 2249 2265 #endif 2250 #if SBA_PRINT_ INTERREDUCTION_OPERATIONS2266 #if SBA_PRINT_REDUCTION_OPERATIONS 2251 2267 printf("INTERREDUCTION OPERATIONS: %ld\n",sba_interreduction_operations); 2252 2268 #endif 2253 #if SBA_PRINT_ INTERREDUCTION_STEPS2269 #if SBA_PRINT_REDUCTION_STEPS 2254 2270 printf("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - \n"); 2255 2271 printf("ALL REDUCTIONS: %ld\n",sba_reduction_steps+sba_interreduction_steps); 2256 #endif 2257 #if SBA_PRINT_INTERREDUCTION_OPERATIONS 2272 sba_interreduction_steps = 0; 2273 sba_reduction_steps = 0; 2274 #endif 2275 #if SBA_PRINT_OPERATIONS 2258 2276 printf("ALL OPERATIONS: %ld\n",sba_operations+sba_interreduction_operations); 2277 sba_interreduction_operations = 0; 2278 sba_operations = 0; 2259 2279 #endif 2260 2280 #if SBA_PRINT_SIZE_G 2261 2281 printf("----------------------------------------------------------\n"); 2262 2282 printf("SIZE OF G: %ld\n",size_g); 2283 size_g = 0; 2263 2284 #endif 2264 2285 #if SBA_PRINT_SIZE_SYZ 2265 2286 printf("SIZE OF SYZ: %ld\n",size_syz); 2266 2287 printf("----------------------------------------------------------\n"); 2288 size_syz = 0; 2267 2289 #endif 2268 2290 #if SBA_PRINT_PRODUCT_CRITERION 2269 2291 printf("PRODUCT CRITERIA: %ld\n",product_criterion); 2270 #endif 2271 zeroreductions = 0; 2272 size_g = 0; 2273 size_syz = 0; 2274 product_criterion = 0; 2275 sba_reduction_steps = 0; 2276 sba_operations = 0; 2277 sba_interreduction_steps = 0; 2278 sba_interreduction_operations = 0; 2292 product_criterion = 0; 2293 #endif 2279 2294 return (strat->Shdl); 2280 2295 }
Note: See TracChangeset
for help on using the changeset viewer.