From 8f88b294511b786e8ae518594eceafb8da9d3f34 Mon Sep 17 00:00:00 2001 From: Justin Worthe Date: Sun, 15 Jul 2018 22:55:55 +0200 Subject: Flipped bitfields on the opponent side to make implementation more concise --- tests/expressive_to_bitwise_comparison.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/expressive_to_bitwise_comparison.rs') diff --git a/tests/expressive_to_bitwise_comparison.rs b/tests/expressive_to_bitwise_comparison.rs index 6a72748..e0c9a30 100644 --- a/tests/expressive_to_bitwise_comparison.rs +++ b/tests/expressive_to_bitwise_comparison.rs @@ -45,6 +45,8 @@ proptest! { let (settings, mut expressive_state) = input::json::read_expressive_state_from_file(STATE_PATH).expect("Failed to load expressive state"); let (_, mut bitwise_state) = input::json::read_bitwise_state_from_file(STATE_PATH).expect("Failed to load bitwise state"); + expressive_state.sort(); + let mut expected_status = GameStatus::Continue; while expected_status == GameStatus::Continue { let player_command = random_player_move(&settings, &expressive_state, &bitwise_state, &mut rng); @@ -176,11 +178,11 @@ fn build_bitwise_from_expressive(expressive: &expressive_engine::ExpressiveGameS let (mut left, mut right) = m.pos.to_bitfield(); let mut res = acc.clone(); for mut tier in res.iter_mut() { - let setting = (!tier.0 & left, !tier.1 & right); + let setting = (!tier.0 & right, !tier.1 & left); tier.0 |= setting.0; tier.1 |= setting.1; - left &= !setting.0; - right &= !setting.1; + right &= !setting.0; + left &= !setting.1; } res }); -- cgit v1.2.3