..

Author: Platane

cargo/snk-grid/src/color.rs

@@ -0,0 +1,44 @@
+#[derive(Copy, Clone, Debug, PartialEq, PartialOrd)]
+#[repr(u8)]
+pub enum Color {
+    Empty = 0,
+    Color1 = 1,
+    Color2 = 2,
+    Color3 = 3,
+    Color4 = 4,
+}
+impl Default for Color {
+    fn default() -> Self {
+        Color::Empty
+    }
+}
+impl Color {
+    pub fn is_walkable(&self, walkable: Color) -> bool {
+        *self <= walkable
+    }
+    pub fn is_empty(&self) -> bool {
+        *self == Color::Empty
+    }
+    pub fn cost(&self) -> u32 {
+        match self {
+            Color::Empty => 0,
+            Color::Color1 => 1,
+            Color::Color2 => 150,
+            Color::Color3 => 150 * 150,
+            Color::Color4 => 150 * 150 * 150,
+        }
+    }
+}
+
+#[test]
+fn it_should_sort_cell() {
+    assert_eq!(Color::Empty < Color::Color1, true);
+    assert_eq!(Color::Color1 < Color::Color2, true);
+    assert_eq!(Color::Color2 < Color::Color3, true);
+    assert_eq!(Color::Color3 < Color::Color4, true);
+}
+#[test]
+fn it_should_sum_cost() {
+    // it should not panic
+    let _somehow_max_cost = Color::Color4.cost() * 350;
+}

cargo/snk-grid/src/grid.rs

@@ -1,27 +1,4 @@
-use crate::point::Point;
-
-#[derive(Copy, Clone, Debug, PartialEq, PartialOrd)]
-#[repr(u8)]
-pub enum Color {
-    Empty = 0,
-    Color1 = 1,
-    Color2 = 2,
-    Color3 = 3,
-    Color4 = 4,
-}
-impl Default for Color {
-    fn default() -> Self {
-        Color::Empty
-    }
-}
-impl Color {
-    pub fn is_walkable(&self, walkable: Color) -> bool {
-        *self <= walkable
-    }
-    pub fn is_empty(&self) -> bool {
-        *self == Color::Empty
-    }
-}
+use crate::{color::Color, point::Point};
 
 pub fn iter_rectangle_fill(width: i8, height: i8) -> impl Iterator<Item = Point> {
     (0..height).flat_map(move |y| (0..width).map(move |x| Point { x, y }))
@@ -115,13 +92,6 @@ impl Grid<Color> {
     }
 }
 
-#[test]
-fn it_should_sort_cell() {
-    assert_eq!(Color::Empty < Color::Color1, true);
-    assert_eq!(Color::Color1 < Color::Color2, true);
-    assert_eq!(Color::Color2 < Color::Color3, true);
-    assert_eq!(Color::Color3 < Color::Color4, true);
-}
 #[test]
 fn it_should_grid_create() {
     let grid = Grid::<Color>::create_with_default(30, 10);

cargo/snk-grid/src/grid_ascii.rs

@@ -1,5 +1,6 @@
 use crate::{
-    grid::{Color, Grid, iter_rectangle_fill},
+    color::Color,
+    grid::{Grid, iter_rectangle_fill},
     point::Point,
 };
 

cargo/snk-grid/src/grid_samples.rs

@@ -1,4 +1,7 @@
-use crate::grid::{Color, Grid, iter_rectangle_fill};
+use crate::{
+    color::Color,
+    grid::{Grid, iter_rectangle_fill},
+};
 
 // Pseudorandom number generator from the "Xorshift RNGs" paper by George Marsaglia.
 // https://github.com/rust-lang/rust/blob/1.55.0/library/core/src/slice/sort.rs#L559-L573

cargo/snk-grid/src/lib.rs

@@ -1,3 +1,4 @@
+pub mod color;
 pub mod direction;
 pub mod grid;
 pub mod grid_ascii;

cargo/snk-js/src/lib.rs

@@ -1,10 +1,6 @@
 use js_sys;
 use log::info;
-use snk_grid::{
-    direction::Direction,
-    grid::{Color, Grid},
-    grid_samples::SampleGrid,
-};
+use snk_grid::{color::Color, direction::Direction, grid::Grid, grid_samples::SampleGrid};
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]

cargo/snk-solver/src/cost_to_outside.rs

@@ -1,12 +1,13 @@
 use snk_grid::{
+    color::Color,
     direction::iter_neighbour,
-    grid::{Color, Grid, iter_rectangle_hull},
+    grid::{Grid, iter_rectangle_hull},
     point::Point,
 };
-use std::{collections::HashSet, usize};
+use std::collections::HashSet;
 
 pub fn update_cost_to_outside(
-    cost_to_outside: &mut Grid<usize>,
+    cost_to_outside: &mut Grid<u32>,
     grid: &Grid<Color>,
     mut changed: HashSet<Point>,
 ) -> () {
@@ -21,7 +22,8 @@ pub fn update_cost_to_outside(
         // propagate the change to its neightbourn
         for pn in iter_neighbour(p) {
             if cost_to_outside.is_inside(pn) {
-                let new_cost = c + (grid.get(pn) as usize) * 100;
+                let cost = grid.get(pn).cost();
+                let new_cost = c + cost;
                 if new_cost < cost_to_outside.get(pn) {
                     cost_to_outside.set(pn, new_cost);
                     changed.insert(pn);
@@ -33,13 +35,13 @@ pub fn update_cost_to_outside(
 
 //
 // cost_to_outside : for each cell return the minimal cost ( = sum of dot, with greater color costing more ) to get outside
-pub fn create_cost_to_outside(grid: &Grid<Color>) -> Grid<usize> {
-    let mut cost_to_outside = Grid::<usize>::create_with_value(grid.width, grid.height, usize::MAX);
+pub fn create_cost_to_outside(grid: &Grid<Color>) -> Grid<u32> {
+    let mut cost_to_outside = Grid::<u32>::create_with_value(grid.width, grid.height, u32::MAX);
 
     let mut changed = HashSet::<Point>::new();
 
     for p in iter_rectangle_hull(grid.width as i8, grid.height as i8) {
-        let cost = (grid.get(p) as usize) * 100;
+        let cost = grid.get(p).cost();
         cost_to_outside.set(p, cost);
         changed.insert(p);
     }

cargo/snk-solver/src/fitness.rs

@@ -1,6 +1,7 @@
 use snk_grid::{
+    color::Color,
     direction::Direction,
-    grid::{Color, Grid, iter_rectangle_fill},
+    grid::{Grid, iter_rectangle_fill},
     snake::{Snake, Snake4},
 };
 

cargo/snk-solver/src/solver.rs

@@ -1,8 +1,4 @@
-use snk_grid::{
-    direction::Direction,
-    grid::{Color, Grid},
-    snake::Snake4,
-};
+use snk_grid::{color::Color, direction::Direction, grid::Grid, snake::Snake4};
 
 pub fn solve(grid: &Grid<Color>, snake: &Snake4) -> Vec<Direction> {
     vec![]