From dbc008ad4d16072d181e0ac6949fab09a9c05801 Mon Sep 17 00:00:00 2001
From: Justin Worthe <justin@worthe-it.co.za>
Date: Mon, 27 Aug 2018 21:48:26 +0200
Subject: Removed branching around energy limiting heuristics

---
 src/engine/bitwise_engine.rs | 60 --------------------------------------------
 src/engine/constants.rs      |  2 --
 2 files changed, 62 deletions(-)

(limited to 'src/engine')

diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs
index f8af86d..628fefc 100644
--- a/src/engine/bitwise_engine.rs
+++ b/src/engine/bitwise_engine.rs
@@ -34,8 +34,6 @@ pub struct Player {
 
     pub iron_curtain_available: bool,
     pub iron_curtain_remaining: u8,
-
-    pub energy_towers_with_heuristics: u64,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -75,9 +73,6 @@ impl BitwiseGameState {
         BitwiseGameState::update_iron_curtain(&mut self.player, self.round);
         BitwiseGameState::update_iron_curtain(&mut self.opponent, self.round);
 
-        self.player.update_energy_towers_with_heuristics();
-        self.opponent.update_energy_towers_with_heuristics();
-
         self.round += 1;
 
         self.update_status();
@@ -436,7 +431,6 @@ impl Player {
             tesla_cooldowns: ArrayVec::new(),
             iron_curtain_available: false,
             iron_curtain_remaining: 0,
-            energy_towers_with_heuristics: 0
         }
     }
 
@@ -459,58 +453,4 @@ impl Player {
         debug_assert!(point.to_either_bitfield() & self.occupied == 0);
         point
     }
-
-    pub fn update_energy_towers_with_heuristics(&mut self) {
-        self.energy_towers_with_heuristics = self.occupied;
-        for y in 0..MAP_HEIGHT {
-            let mask = 255u64 << (y*SINGLE_MAP_WIDTH);
-            let isolated_row = self.energy_towers & mask;
-            let row_count = isolated_row.count_ones();
-            self.energy_towers_with_heuristics |= if row_count >= ENERGY_MAX_IN_ROW {
-                mask
-            } else {
-                0
-            };
-        }
-    }
-
-    pub fn unoccupied_energy_cell_count(&self) -> usize {
-        self.energy_towers_with_heuristics.count_zeros() as usize
-    }
-    pub fn location_of_unoccupied_energy_cell(&self, i: usize) -> Point  {
-        let bit = find_bit_index_from_rank(self.energy_towers_with_heuristics, i as u64);
-        let point = Point { index: bit };
-        debug_assert!(point.to_either_bitfield() & self.occupied == 0);
-        point
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn energy_occupied_marks_empty_rows_appropriately() {
-        let mut player = Player::empty();
-        player.energy_towers = 0;
-        player.occupied = 0;
-        player.update_energy_towers_with_heuristics();
-
-        let expected = 0;
-        let actual = player.energy_towers_with_heuristics;
-
-        assert_eq!(expected, actual);
-    }
-        #[test]
-    fn energy_occupied_marks_full_first_row_appropriately() {
-        let mut player = Player::empty();
-        player.energy_towers = 0x00_07; //3 energy towers in first row, don't build more
-        player.occupied = 0x07_07; //3 more towers in second row, can still build by them
-        player.update_energy_towers_with_heuristics();
-
-        let expected = 0x07_ff;
-        let actual = player.energy_towers_with_heuristics;
-
-        assert_eq!(expected, actual);
-    }
 }
diff --git a/src/engine/constants.rs b/src/engine/constants.rs
index 71d937d..9ece36d 100644
--- a/src/engine/constants.rs
+++ b/src/engine/constants.rs
@@ -26,8 +26,6 @@ pub const ENERGY_GENERATED_TOWER: u16 = 3;
 pub const ENERGY_PRICE: u16 = 20;
 pub const ENERGY_CONSTRUCTION_TIME: u8 = 1;
 
-pub const ENERGY_MAX_IN_ROW: u32 = 3;
-
 pub const IRON_CURTAIN_PRICE: u16 = 100;
 pub const IRON_CURTAIN_UNLOCK_INTERVAL: u16 = 30;
 pub const IRON_CURTAIN_DURATION: u8 = 6;
-- 
cgit v1.2.3