Swap to GriddedParticle throughout

src/main.rs

@@ -25,7 +25,7 @@ fn main() {
 
     println!("Running: {:?}", cli);
 
-    let mut sys = DLASystem::<SmallRng, VectorStorage, LocalRandomWalker>::new(
+    let mut sys = DLASystem::<SmallRng, Position, VectorStorage, LocalRandomWalker>::new(
         SmallRng::seed_from_u64(cli.seed),
         cli.max_particles,
         cli.stick_probability

src/system/mod.rs

@@ -1,4 +1,6 @@
+use std::f32::consts::PI;
 use std::ops::Add;
+use rand::Rng;
 use serde::{Serialize, Deserialize, Serializer};
 
 pub mod walker;
@@ -7,6 +9,7 @@ pub mod model;
 
 pub trait GriddedPosition: Add<Output=Self> + Serialize + Clone {
     fn zero() -> Self;
+    fn spawn<R: Rng>(rng: &mut R, radius: f32) -> Self;
     fn abs(&self) -> f32;
     fn neighbours(&self) -> Vec<Self>;
     fn linear_index(&self, grid_size: u32) -> usize;
@@ -37,6 +40,12 @@ impl GriddedPosition for Position {
         Position { x: 0, y: 0 }
     }
 
+    fn spawn<R: Rng>(rng: &mut R, radius: f32) -> Self {
+        let theta = rng.gen_range(0f32..1.0) * 2.0 * PI;
+        let (x, y) = (radius * theta.cos(), radius * theta.sin());
+        Position { x: x as i32, y: y as i32 }
+    }
+
     fn abs(&self) -> f32 {
         ((self.x.pow(2) + self.y.pow(2)) as f32).powf(0.5)
     }

src/system/model.rs

@@ -9,7 +9,7 @@ use crate::system::storage::{Storage, VectorStorage};
 use crate::system::walker::{LocalRandomWalker, Walker};
 use serde::{Serialize, Deserialize};
 
-pub struct DLASystem<R: Rng, S: Storage, W: Walker<R>> {
+pub struct DLASystem<R: Rng, P: GriddedPosition, S: Storage<P>, W: Walker<R, P>> {
     rng: R,
     storage: S,
     walker: W,
@@ -19,8 +19,8 @@ pub struct DLASystem<R: Rng, S: Storage, W: Walker<R>> {
 
     pub running: bool,
 
-    particles: Vec<Position>,
-    active_particle: Option<Position>,
+    particles: Vec<P>,
+    active_particle: Option<P>,
 
     add_ratio: f32,
     add_circle: f32,
@@ -29,9 +29,9 @@ pub struct DLASystem<R: Rng, S: Storage, W: Walker<R>> {
     cluster_radius: f32,
 }
 
-impl<R: Rng, S: Storage, W: Walker<R>> DLASystem<R, S, W> {
-    pub fn new(rng: R, max_particles: usize, stick_probability: f32) -> DLASystem<R, VectorStorage, LocalRandomWalker> {
-        let mut sys: DLASystem<R, VectorStorage, LocalRandomWalker> = DLASystem {
+impl<R: Rng, P: GriddedPosition, S: Storage<P>, W: Walker<R, P>> DLASystem<R, P, S, W> {
+    pub fn new(rng: R, max_particles: usize, stick_probability: f32) -> DLASystem<R, Position, VectorStorage, LocalRandomWalker> {
+        let mut sys: DLASystem<R, Position, VectorStorage, LocalRandomWalker> = DLASystem {
             rng,
             stick_probability,
             max_particles,
@@ -87,7 +87,7 @@ impl<R: Rng, S: Storage, W: Walker<R>> DLASystem<R, S, W> {
         }
     }
 
-    fn check_stick(&mut self, position: &Position) -> bool {
+    fn check_stick(&mut self, position: &P) -> bool {
         position.neighbours()
             .iter()
             .any(|neighbour|
@@ -97,16 +97,14 @@ impl<R: Rng, S: Storage, W: Walker<R>> DLASystem<R, S, W> {
     }
 
     fn spawn_particle(&mut self) {
-        let theta = self.rng.gen_range(0f32..1.0) * 2.0 * PI;
-        let (x, y) = (self.add_circle * theta.cos(), self.add_circle * theta.sin());
-        let position = Position { x: x as i32, y: y as i32 };
+        let position = P::spawn(&mut self.rng, self.add_circle);
 
         if !self.storage.at(&position) {
             self.active_particle = Some(position);
         }
     }
 
-    fn deposit(&mut self, p0: &Position) {
+    fn deposit(&mut self, p0: &P) {
         self.particles.push(p0.clone());
         self.storage.deposit(p0);
 

src/system/storage.rs

@@ -1,8 +1,8 @@
-use crate::system::Position;
+use crate::system::{GriddedPosition, Position};
 
-pub trait Storage {
-    fn at(&self, position: &Position) -> bool;
-    fn deposit(&mut self, position: &Position);
+pub trait Storage<P: GriddedPosition> {
+    fn at(&self, position: &P) -> bool;
+    fn deposit(&mut self, position: &P);
 }
 
 pub struct VectorStorage {
@@ -35,7 +35,7 @@ impl VectorStorage {
     }
 }
 
-impl Storage for VectorStorage {
+impl Storage<Position> for VectorStorage {
     fn at(&self, position: &Position) -> bool {
         return self.backing[self.linear_index(position)]
     }

src/system/walker.rs

@@ -2,8 +2,8 @@ use num_integer::Integer;
 use rand::prelude::Rng;
 use crate::system::{GriddedPosition, Position};
 
-pub trait Walker<R: Rng> {
-    fn walk(&self, rng: &mut R, position: &Position) -> Position;
+pub trait Walker<R: Rng, P: GriddedPosition> {
+    fn walk(&self, rng: &mut R, position: &P) -> P;
 }
 
 pub struct LocalRandomWalker {
@@ -14,7 +14,7 @@ impl LocalRandomWalker {
     pub(crate) fn new(dim: u32) -> LocalRandomWalker { LocalRandomWalker { dim } }
 }
 
-impl<R: Rng> Walker<R> for LocalRandomWalker {
+impl<R: Rng> Walker<R, Position> for LocalRandomWalker {
     fn walk(&self, rng: &mut R, position: &Position) -> Position {
         let neighbours = position.neighbours();
         let index = rng.gen_range(0..(neighbours.len()));