Mercurial > lbo > hg > collisions
changeset 3:35d708e7cc0c
Tune parameters
author | Lewin Bormann <lbo@spheniscida.de> |
---|---|
date | Sun, 15 Nov 2020 18:36:43 +0100 |
parents | c9c0a2509f23 |
children | 1606d1cd0c45 |
files | run.sh src/main.rs |
diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/run.sh Sun Nov 15 18:21:31 2020 +0100 +++ b/run.sh Sun Nov 15 18:36:43 2020 +0100 @@ -1,4 +1,5 @@ #!/bin/bash +rm render.csv cargo run --release gnuplot -persist plot.gpt
--- a/src/main.rs Sun Nov 15 18:21:31 2020 +0100 +++ b/src/main.rs Sun Nov 15 18:36:43 2020 +0100 @@ -134,9 +134,11 @@ fn bounce_off(&mut self, other: &mut Particle) { let conn = self.pos - other.pos; if (conn.normsq() > (self.rad * self.rad + other.rad * other.rad)) { + // timetohit() predicted that we would be closer than normsq() at this point, but we + // are not. println!("BUG? {} > {}", conn.normsq(), self.rad * self.rad + other.rad * other.rad); + return; } - //assert!(conn.normsq() <= (self.rad * self.rad + other.rad * other.rad)); // Determine orthogonal bounce plane. let connu = conn.unit(); @@ -347,7 +349,7 @@ fn render_3_particles() { use std::io::Write; - let mut sys = System::new(10., 1e4 as usize, 20); + let mut sys = System::new(10., 1e3 as usize, 50); let mut destfile = std::fs::OpenOptions::new() .write(true) .create(true) @@ -361,7 +363,7 @@ }); // limit, redrawhz, steps - sys.simulate(10e6 as usize, 10, 10000, Some(render_cb)); + sys.simulate(10e6 as usize, 5, 10000, Some(render_cb)); } fn main() {