titaniumtown/physarum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

things

Browse Source
This commit is contained in:
Simon Gardling 2021-03-31 13:04:35 -04:00
parent a0af942255
commit d6d1e00b35
5 changed files with 56 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Notes.md
View File

@ -1,4 +1,4 @@
## sin and cos optimizations:
## sin and cos implementations:
### Setup/Info:
- measured in ms/agent ticked
- 2048 iterations

2
src/lib.rs
View File

@ -4,4 +4,4 @@ mod imgdata; // for storing image data
mod math;
pub mod model;
mod palette;
mod util; // for math things
mod util; // for math things

4
src/main.rs
View File

@ -5,8 +5,8 @@ fn main() {
let n_iterations = 2048;
// Size of grid and pictures
// let (width, height) = (256, 256);
let (width, height) = (1024, 1024);
let (width, height) = (256, 256);
// let (width, height) = (1024, 1024);
// # of agents
let n_particles = 1 << 20;

1
src/math.rs
View File

@ -37,3 +37,4 @@ pub fn cos(mut x: f32) -> f32 {
pub fn sin(x: f32) -> f32 {
return cos(x - std::f32::consts::FRAC_PI_2);
}

106
src/model.rs
View File

@ -34,60 +34,6 @@ impl Agent {
i: i,
}
}
#[inline]
pub fn tick(&mut self, grid: &Grid) {
let (width, height) = (grid.width, grid.height);
let PopulationConfig {
sensor_distance,
sensor_angle,
rotation_angle,
step_distance,
..
} = grid.config;
let xc = self.x + fastapprox::faster::cos(self.angle) * sensor_distance;
let yc = self.y + fastapprox::faster::sin(self.angle) * sensor_distance;
let agent_add_sens = self.angle + sensor_angle;
let agent_sub_sens = self.angle - sensor_angle;
let xl = self.x + fastapprox::faster::cos(agent_sub_sens) * sensor_distance;
let yl = self.y + fastapprox::faster::sin(agent_sub_sens) * sensor_distance;
let xr = self.x + fastapprox::faster::cos(agent_add_sens) * sensor_distance;
let yr = self.y + fastapprox::faster::sin(agent_add_sens) * sensor_distance;
// We sense from the buffer because this is where we previously combined data from all the grid.
let center = grid.get_buf(xc, yc);
let left = grid.get_buf(xl, yl);
let right = grid.get_buf(xr, yr);
// Rotate and move logic
let mut rng = rand::thread_rng();
let mut direction: f32 = 0.0;
if (center > left) && (center > right) {
direction = 0.0;
} else if (center < left) && (center < right) {
direction = *[-1.0, 1.0].choose(&mut rng).unwrap();
} else if left < right {
direction = 1.0;
} else if right < left {
direction = -1.0;
}
let delta_angle = rotation_angle * direction;
self.angle = wrap(self.angle + delta_angle, TAU);
self.x = wrap(
self.x + step_distance * fastapprox::faster::cos(self.angle),
width as f32,
);
self.y = wrap(
self.y + step_distance * fastapprox::faster::sin(self.angle),
height as f32,
);
}
}
impl Clone for Agent {
@ -223,7 +169,57 @@ impl Model {
// Tick agents
self.agents.par_iter_mut().for_each(|agent| {
agent.tick(&grids[agent.population_id]);
let grid = &grids[agent.population_id];
let (width, height) = (grid.width, grid.height);
let PopulationConfig {
sensor_distance,
sensor_angle,
rotation_angle,
step_distance,
..
} = grid.config;
let xc = agent.x + fastapprox::faster::cos(agent.angle) * sensor_distance;
let yc = agent.y + fastapprox::faster::sin(agent.angle) * sensor_distance;
let agent_add_sens = agent.angle + sensor_angle;
let agent_sub_sens = agent.angle - sensor_angle;
let xl = agent.x + fastapprox::faster::cos(agent_sub_sens) * sensor_distance;
let yl = agent.y + fastapprox::faster::sin(agent_sub_sens) * sensor_distance;
let xr = agent.x + fastapprox::faster::cos(agent_add_sens) * sensor_distance;
let yr = agent.y + fastapprox::faster::sin(agent_add_sens) * sensor_distance;
// We sense from the buffer because this is where we previously combined data from all the grid.
let center = grid.get_buf(xc, yc);
let left = grid.get_buf(xl, yl);
let right = grid.get_buf(xr, yr);
// Rotate and move logic
let mut rng = rand::thread_rng();
let mut direction: f32 = 0.0;
if (center > left) && (center > right) {
direction = 0.0;
} else if (center < left) && (center < right) {
direction = *[-1.0, 1.0].choose(&mut rng).unwrap();
} else if left < right {
direction = 1.0;
} else if right < left {
direction = -1.0;
}
let delta_angle = rotation_angle * direction;
agent.angle = wrap(agent.angle + delta_angle, TAU);
agent.x = wrap(
agent.x + step_distance * fastapprox::faster::cos(agent.angle),
width as f32,
);
agent.y = wrap(
agent.y + step_distance * fastapprox::faster::sin(agent.angle),
height as f32,
);
});
// Deposit // TODO - Make this parallel