Differences From Artifact [8629f9c48aba56fd]:
- File
src/solver.d
- 2012-07-15 12:40:58 - part of checkin [c88611bab8] on branch trunk - horock solver (user: kinaba) [annotate]
To Artifact [36995877ce5f2cde]:
- File
src/solver.d
- 2012-07-15 12:58:32 - part of checkin [f8d6e266eb] on branch trunk - Do not rush to L even all \ are collected. (user: kinaba) [annotate]
67 67 return ad>bd;;
68 68 })(la);
69 69 Pos[] ra = g.map.razors();
70 70 const(Pos)[] hi = g.map.objects('W');
71 71
72 72 Tuple!(char,int)[] cand;
73 73 char c = 'W';
74 - if( la.empty ) {
74 + if( g.map.collected_lambda == g.map.total_lambda ) {
75 75 cand = search(g, ro, [li], death);
76 - } else {
76 + } else if( !la.empty ){
77 77 cand ~= search(g, ro, la~ra, death);
78 78 }
79 79
80 80 // 'higesori' mode
81 81 if( !hi.empty && g.map.razor>0 ) {
82 82 int his = 0;
83 83 for(int dy=-1; dy<=+1; ++dy)
................................................................................
385 385 plan_broken = true;
386 386 }
387 387 else
388 388 plan = plan[1..$];
389 389 }
390 390 }
391 391
392 -alias Solver_2!(Solver_1) MainSolver;
393 -//alias Solver_1 MainSolver;
392 +//alias Solver_2!(Solver_1) MainSolver;
393 +alias Solver_1 MainSolver;