Changeset 0bf6d1 in git
- Timestamp:
- Nov 25, 2015, 5:26:00 PM (8 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- a4dd0aa5b834e797bf7b0386495103218f185e98
- Parents:
- da3c03f9b177b37854122939917b92627999ddc1
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/walk.cc
rda3c03 r0bf6d1 2527 2527 mpz_out_str( stdout, 10, vec[j]); 2528 2528 PrintS(" is greater than 2147483647 (max. integer representation)\n"); 2529 Print("// So vector[%d] := %d is wrong!!\n",j+1, vec[j]);// vec[j] is mpz_t2529 //Print("// So vector[%d] := %d is wrong!!\n",j+1, vec[j]);// vec[j] is mpz_t 2530 2530 } 2531 2531 } … … 4254 4254 next_weight = MkInterRedNextWeight(curr_weight,target_weight, G); 4255 4255 xtnw=xtnw+clock()-to; 4256 #ifdef PRINT_VECTORS4256 /*#ifdef PRINT_VECTORS 4257 4257 MivString(curr_weight, target_weight, next_weight); 4258 4258 #endif 4259 4259 */ 4260 4260 if(Overflow_Error == TRUE) 4261 4261 { … … 4293 4293 tproc=tproc+clock()-tinput; 4294 4294 4295 Print("\n// takes %d steps and calls \"Rec_LastGB\" (%d):",4295 /*Print("\n// takes %d steps and calls \"Rec_LastGB\" (%d):", 4296 4296 nwalk, tp_deg+1); 4297 4297 */ 4298 4298 G = Rec_LastGB(G,curr_weight, orig_target_weight, tp_deg+1,nnwinC); 4299 4299 newRing = currRing; … … 4329 4329 { 4330 4330 // nOverflow_Error = Overflow_Error; 4331 Print("\n// takes %d steps and calls \"Rec_LastGB (%d):", tp_deg+1);4331 //Print("\n// takes %d steps and calls \"Rec_LastGB (%d):", tp_deg+1); 4332 4332 tproc=tproc+clock()-tinput; 4333 4333 F1 = Rec_LastGB(F1,curr_weight, orig_target_weight, tp_deg+1,nnwinC); … … 4607 4607 //Print("\n// pSetm_Error = (%d)", ErrorCheck()); 4608 4608 //Print("\n// Overflow_Error? (%d)", nOverflow_Error); 4609 Print("\n// Awalk2 took %d steps!!", nstep);4609 //Print("\n// Awalk2 took %d steps!!", nstep); 4610 4610 #endif 4611 4611 … … 8621 8621 next_weight = MwalkNextWeightCC(curr_weight,target_weight, G); 8622 8622 tnw=tnw+clock()-to; 8623 #ifdef PRINT_VECTORS8623 /*#ifdef PRINT_VECTORS 8624 8624 MivString(curr_weight, target_weight, next_weight); 8625 8625 #endif 8626 8626 */ 8627 8627 8628 8628 /* check whether the computed intermediate weight vector is in … … 8834 8834 delete iv_lp; 8835 8835 omFree(npert); 8836 8836 /* 8837 8837 #ifdef TIME_TEST 8838 8838 Print("\n// Computation took %d steps and %.2f sec", … … 8844 8844 Print("\n// Overflow_Error? (%d)\n", Overflow_Error); 8845 8845 #endif 8846 8846 */ 8847 8847 return(G); 8848 8848 } … … 9492 9492 newRing = currRing; 9493 9493 Gomega1 = idrMoveR(Gomega, oldRing,currRing); 9494 9494 /* 9495 9495 #ifdef ENDWALKS 9496 9496 if(endwalks == 1) … … 9501 9501 } 9502 9502 #endif 9503 9503 */ 9504 9504 to=clock(); 9505 9505 // compute a reduced Groebner basis of <Gomega> w.r.t. "newRing" … … 9601 9601 if( test_w_in_ConeCC(G1, target_weight) != 1 || ntestwinC == 0) 9602 9602 { 9603 PrintS("\n// The perturbed target vector doesn't STAY in the correct cone!!");9603 //PrintS("\n// The perturbed target vector doesn't STAY in the correct cone!!"); 9604 9604 if(tp_deg == 1) 9605 9605 { … … 9630 9630 9631 9631 //Print("\n// \"Mpwalk\" (1,%d) took %d steps and %.2f sec. Overflow_Error (%d)", tp_deg, nwalk, ((double) clock()-tinput)/1000000, nOverflow_Error); 9632 Print("\n// Mprwalk took %d steps. Ring= %s;\n", nwalk, rString(currRing));9632 //Print("\n// Mprwalk took %d steps. Ring= %s;\n", nwalk, rString(currRing)); 9633 9633 return(result); 9634 9634 } … … 9832 9832 next_weight = MkInterRedNextWeight(curr_weight,target_weight, G); 9833 9833 xtnw=xtnw+clock()-to; 9834 #ifdef PRINT_VECTORS9834 /*#ifdef PRINT_VECTORS 9835 9835 MivString(curr_weight, target_weight, next_weight); 9836 9836 #endif 9837 9837 */ 9838 9838 if(Overflow_Error == TRUE) 9839 9839 { … … 9905 9905 delete exivlp; 9906 9906 #ifdef TIME_TEST 9907 9907 /* 9908 9908 Print("\n// \"Main procedure\" took %d steps, %.2f sec. and Overflow_Error(%d)", 9909 9909 nwalk, ((double) tproc)/1000000, nOverflow_Error); 9910 9910 9911 9911 TimeStringFractal(xftinput, tostd, xtif, xtstd,xtextra, xtlift, xtred, xtnw); 9912 9912 */ 9913 9913 // Print("\n// pSetm_Error = (%d)", ErrorCheck()); 9914 Print("\n// Overflow_Error? (%d)", Overflow_Error);9915 Print("\n// Awalk1 took %d steps.\n", nstep);9914 // Print("\n// Overflow_Error? (%d)", Overflow_Error); 9915 // Print("\n// Awalk1 took %d steps.\n", nstep); 9916 9916 #endif 9917 9917 return(result);
Note: See TracChangeset
for help on using the changeset viewer.