Skip to content

Commit dbae892

Browse files
panstromekpanstromek
committed
ref: make thor reference explicit on more places
1 parent 9b7c64a commit dbae892

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

‎crates/engine/src/game.rs‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ pub fn extended_compute_move<L: ComputeMoveLogger, Out: ComputeMoveOutput, FE: F
164164
mut mid: i32,
165165
mut exact: i32,
166166
mut wld: i32, mut echo: i32, g_state: &mut FullState,
167-
update_cb: fn(&EvaluatedList), mut should_stop: StopFn)
167+
update_cb: fn(&EvaluatedList), mut should_stop: StopFn, thor: &Thor)
168168
-> EvaluatedList {
169169
let mut list = EvaluatedList::new();
170170
let mut i: i32 = 0;
@@ -341,7 +341,7 @@ pub fn extended_compute_move<L: ComputeMoveLogger, Out: ComputeMoveOutput, FE: F
341341
0, 0,
342342
1, &mut shallow_info, g_state.config.display_pv,
343343
g_state.config.echo,
344-
g_state);
344+
g_state, thor);
345345
if shallow_info.type_0 == PASS_EVAL {
346346
/* Don't allow pass */
347347
compute_move::<L, Out, FE, Thor>(side_to_move, 0,
@@ -351,7 +351,7 @@ pub fn extended_compute_move<L: ComputeMoveLogger, Out: ComputeMoveOutput, FE: F
351351
0, 0,
352352
1, &mut shallow_info, g_state.config.display_pv,
353353
g_state.config.echo,
354-
g_state);
354+
g_state, thor);
355355
if shallow_info.type_0 == PASS_EVAL {
356356
/* Game over */
357357
disc_diff = disc_count(side_to_move, &(g_state.board).board) -
@@ -502,7 +502,7 @@ pub fn extended_compute_move<L: ComputeMoveLogger, Out: ComputeMoveOutput, FE: F
502502
1, &mut this_eval,
503503
g_state.config.display_pv,
504504
g_state.config.echo,
505-
g_state);
505+
g_state,thor);
506506
}
507507
if force_return != 0 || should_stop() {
508508
/* Clear eval and exit search immediately */
@@ -528,7 +528,7 @@ pub fn extended_compute_move<L: ComputeMoveLogger, Out: ComputeMoveOutput, FE: F
528528
current_wld - 1,
529529
1, &mut this_eval, g_state.config.display_pv,
530530
g_state.config.echo,
531-
g_state);
531+
g_state, thor);
532532
}
533533
if this_eval.type_0 == PASS_EVAL {
534534
/* Game over */
@@ -881,7 +881,8 @@ pub fn generic_compute_move<L: ComputeMoveLogger, Out: ComputeMoveOutput, FE: Fr
881881
eval_info: &mut EvaluationType,
882882
logger: &mut Option<L>,
883883
display_pv:i32,
884-
echo:i32, g_state: &mut FullState
884+
echo:i32, g_state: &mut FullState,
885+
thor: &Thor
885886
)
886887
-> i8 {
887888
let mut book_eval_info = EvaluationType::new();
@@ -1300,15 +1301,18 @@ pub fn compute_move<L: ComputeMoveLogger, Out: ComputeMoveOutput, FE: FrontEnd,
13001301
wld: i32,
13011302
search_forced: i32,
13021303
eval_info: &mut EvaluationType, display_pv:i32, echo:i32,
1303-
g_state: &mut FullState)
1304+
g_state: &mut FullState,
1305+
thor: &Thor
1306+
)
13041307
-> i8 {
13051308
return generic_compute_move::<L, Out, FE, Thor>(
13061309
side_to_move, update_all, my_time,
13071310
my_incr, timed_depth,
13081311
book, mid,
13091312
exact, wld,
13101313
search_forced, eval_info, &mut L::create_log_file_if_needed(), display_pv, echo,
1311-
g_state
1314+
g_state,
1315+
thor
13121316
);
13131317
}
13141318

‎crates/engine/src/zebra.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ pub fn next_state<
384384
&mut ComputeMoveLog::create_log_file_if_needed(),
385385
play_state.g_state.config.display_pv,
386386
play_state.g_state.config.echo,
387-
&mut play_state.g_state);
387+
&mut play_state.g_state, thor);
388388
if play_state.side_to_move == 0 {
389389
ZF::set_evals(produce_compact_eval(play_state.eval_info), 0.0f64);
390390
} else {

‎crates/legacy-zebra/src/game.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ pub fn ponder_move<
136136
_book: i32,
137137
mid: i32,
138138
exact: i32,
139-
wld: i32, display_pv: i32, mut echo:i32, g_state: &mut FullState) {
139+
wld: i32, display_pv: i32, mut echo:i32, g_state: &mut FullState, thor: &Thor) {
140140
type Rep = LibcFatalError;
141141

142142
let mut eval_info =EvaluationType::new();
@@ -177,7 +177,7 @@ pub fn ponder_move<
177177
if (8) < mid {
178178
8
179179
} else { mid }, 0, 0,
180-
0, &mut eval_info, display_pv, echo, g_state);
180+
0, &mut eval_info, display_pv, echo, g_state, thor);
181181
echo = stored_echo;
182182
/* Sort the opponents on the score and push the table move (if any)
183183
to the front of the list */
@@ -210,7 +210,7 @@ pub fn ponder_move<
210210
engine::src::game::compute_move::<L, Out, FE, Thor>(0 + 2 - side_to_move,
211211
0, 0, 0,
212212
1, 0, mid, exact, wld,
213-
0, &mut eval_info, display_pv, echo, g_state);
213+
0, &mut eval_info, display_pv, echo, g_state, thor);
214214
let move_0 = this_move;
215215
{
216216
unmake_move(side_to_move, move_0, &mut g_state.board.board, &mut g_state.moves, &mut g_state.hash, &mut g_state.flip_stack);
@@ -305,7 +305,7 @@ pub fn extended_compute_move<FE: FrontEnd>(
305305
side_to_move: i32, book_only: i32, book: i32, mid: i32, exact: i32, wld: i32, echo: i32, g_state: &mut FullState)
306306
-> EvaluatedList {
307307
engine::src::game::extended_compute_move::<LogFileHandler, LibcZebraOutput, FE, LegacyThor, _>(
308-
side_to_move, book_only, book, mid, exact, wld, echo, g_state, |_| (), || false
308+
side_to_move, book_only, book, mid, exact, wld, echo, g_state, |_| (), || false, &LegacyThor
309309
)
310310
}
311311
/*
@@ -477,7 +477,7 @@ pub fn legacy_compute_move(side_to_move: i32,
477477
&mut LogFileHandler::create_log_file_if_needed(),
478478
g_state.config.display_pv,
479479
g_state.config.echo,
480-
g_state);
480+
g_state, &LegacyThor);
481481
}
482482

483483
pub struct LibcZebraOutput;

‎webzebra/crate/src/lib.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,7 @@ impl ZebraGame {
360360
} else {
361361
cached_stop = should_stop();
362362
cached_stop
363-
}
364-
);
363+
}, &WasmThor);
365364
self.game.g_state.search.full_pv = stored_pv;
366365
self.game.g_state.search.full_pv_depth = stored_pv_depth;
367366
self.game.g_state.g_book.set_slack(stored_slack);

0 commit comments

Comments
 (0)