Flipped bitfields on the opponent side to make implementation more concise

2 files changed, 7 insertions, 5 deletions

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
         });
diff --git a/tests/monte_carlo_test.rs b/tests/monte_carlo_test.rs
index 87feadb..832cdb3 100644
--- a/tests/monte_carlo_test.rs
+++ b/tests/monte_carlo_test.rs
@@ -10,12 +10,12 @@ const STATE_PATH: &str = "tests/state0.json";
 #[test]
 fn it_does_a_normal_turn_successfully() {
     let start_time = PreciseTime::now();
-    let (settings, state) = match input::json::read_expressive_state_from_file(STATE_PATH) {
+    let (settings, state) = match input::json::read_bitwise_state_from_file(STATE_PATH) {
         Ok(ok) => ok,
         Err(error) => panic!("Error while parsing JSON file: {}", error)
     };
     let max_time = Duration::milliseconds(200);
     strategy::monte_carlo::choose_move(&settings, &state, &start_time, max_time);
 
-    assert!(start_time.to(PreciseTime::now()) < max_time + Duration::milliseconds(10))
+    assert!(start_time.to(PreciseTime::now()) < max_time + Duration::milliseconds(50))
 }