Cargo.toml

@@ -7,10 +7,3 @@ authors = ["Adrian Heine <mail@adrianheine.de>"]
 [dependencies]
 tui = "0.15"
 termion = "1.5"
-
-[dev-dependencies]
-criterion = "0.3"
-
-[[bench]]
-name = "benchmark"
-harness = false

README.md

@@ -11,23 +11,3 @@ cargo run
 ```
 
 To exit the simulation, press q, ESC or Ctrl+c.
-
-## Tests
-
-A few tests can be run with:
-
-```sh
-cargo test
-```
-
-## Benchmarks
-
-`cargo bench` runs benchmarks. Their results are available under `target/criterion/report/index.html`.
-
-## Simulation
-
-* The world is a simple two-dimensional rectangle with integer positions
-* Agents can occupy the same space
-* Agents can make one move per simulation step, either by trying to move by at most one unit in both directions or by trying to tag another actor
-* Agents need to be at most one unit away in both directions from others in order to tag them
-* Agents act at the same time and their actions are validated against the previous state

benches/benchmark.rs

@@ -1,48 +0,0 @@
-use criterion::{BenchmarkId, measurement::Measurement};
-use criterion::{criterion_group, criterion_main, Criterion, Throughput, BenchmarkGroup};
-use gntag::agent::{Agent, SimpleAgent};
-use gntag::world::ActualWorld;
-
-fn world<M: Measurement>(mut group: BenchmarkGroup<M>, validate: bool) {
-  let width: isize = 1000;
-  for spacing in (50..100).step_by(10) {
-    group.throughput(Throughput::Elements((width / spacing).pow(2) as u64));
-    group.bench_with_input(
-      BenchmarkId::from_parameter(spacing),
-      &spacing,
-      |b, &spacing| {
-        let mut agents: Vec<(_, Box<dyn Agent>)> = vec![];
-        for x in (0..width).step_by(spacing as usize) {
-          for y in (0..width).step_by(spacing as usize) {
-            agents.push(((x, y).into(), Box::new(SimpleAgent)));
-          }
-        }
-        let mut world = ActualWorld::new((width, width).into(), agents, validate);
-        b.iter(|| world.do_step());
-      },
-    );
-  }
-  group.finish();
-}
-
-fn world_validating(c: &mut Criterion) {
-  let group = c.benchmark_group("world_validating");
-  world(group, true)
-}
-
-fn world_nonvalidating(c: &mut Criterion) {
-  let group = c.benchmark_group("world_nonvalidating");
-  world(group, false)
-}
-
-criterion_group!(benches, world_validating, world_nonvalidating);
-criterion_main!(benches);
-
-// 5000/1000 ->     9,993
-//    5/01 ->      23,252
-//   50/10 ->      14,000
-//  100/20 ->      14,000
-//  100/10 ->      96,000
-//  100/05 ->     917,767
-//  200/10 ->     916,172
-// 1000/10 -> 443,482,526

src/main.rs

@@ -42,7 +42,7 @@ fn run_simulation(view: &Arc<Mutex<Option<TerminalView<impl Backend>>>>) {
       agents.push(((x, y).into(), Box::new(SimpleAgent)));
     }
   }
-  let mut world = ActualWorld::new((width, height).into(), agents, true);
+  let mut world = ActualWorld::new((width, height).into(), agents);
 
   let mut gen = 0;
   loop {

src/world.rs

@@ -5,7 +5,6 @@ pub struct ActualWorld {
   size: Position,
   pub agents: HashMap<AgentId, Box<dyn Agent>>,
   pub state: WorldState,
-  validating: bool,
 }
 
 pub struct WorldState {
@@ -17,11 +16,7 @@ pub struct WorldState {
 impl ActualWorld {
   /// Agents receive incrementing ids starting with 0
   /// The last agent is 'It'
-  pub fn new(
-    size: Position,
-    input_agents: Vec<(Position, Box<dyn Agent>)>,
-    validating: bool,
-  ) -> Self {
+  pub fn new(size: Position, input_agents: Vec<(Position, Box<dyn Agent>)>) -> Self {
     let agent_count = input_agents.len();
     assert!(agent_count > 0);
     let mut id = 0;
@@ -41,7 +36,6 @@ impl ActualWorld {
       size,
       agents,
       state,
-      validating,
     }
   }
 
@@ -83,9 +77,8 @@ impl ActualWorld {
       tagged_by: self.state.tagged_by,
     };
     for (id, mv) in moves {
-      if self.validating {
-        self.check_move(id, &mv);
-      }
+      self.check_move(id, &mv);
+      //println!("{} {:?}", id, mv);
       let mut new_pos = None;
       match mv {
         Move::Noop => {}
@@ -109,10 +102,7 @@ impl ActualWorld {
     match mv {
       Move::Noop => {}
       Move::TryTag(other_id) => {
-        let my_pos = self.state.agent_positions.get(&id).unwrap();
-        let other_pos = self.state.agent_positions.get(&other_id).unwrap();
-        assert!((my_pos.x - other_pos.x).abs() <= 1);
-        assert!((my_pos.y - other_pos.y).abs() <= 1);
+        // FIXME check distance
         assert_eq!(self.state.tagged, id);
         assert_ne!(self.state.tagged_by, Some(*other_id));
         assert!(
@@ -121,8 +111,7 @@ impl ActualWorld {
         );
       }
       Move::TryMove(dir) => {
-        assert!(dir.x.abs() <= 1);
-        assert!(dir.y.abs() <= 1);
+        // FIXME check speed
         let pos = self.state.agent_positions.get(&id).unwrap();
         let size = &self.size;
         assert!(pos.x + dir.x > 0);
@@ -142,7 +131,7 @@ mod test {
   #[test]
   #[should_panic]
   fn empty() {
-    ActualWorld::new(Position { x: 0, y: 0 }, vec![], true);
+    ActualWorld::new(Position { x: 0, y: 0 }, vec![]);
   }
 
   #[test]
@@ -150,7 +139,6 @@ mod test {
     let mut world = ActualWorld::new(
       Position { x: 0, y: 0 },
       vec![(Position { x: 0, y: 0 }, Box::new(NullAgent))],
-      true,
     );
     world.do_step();
     assert_eq!(world.state.tagged, 0);
@@ -171,7 +159,6 @@ mod test {
           Box::new(ScriptedAgent::new(vec![Move::TryTag(0)])),
         ),
       ],
-      true,
     );
     world.do_step();
     assert_eq!(world.state.tagged, 0);
@@ -187,7 +174,6 @@ mod test {
         Position { x: 0, y: 0 },
         Box::new(ScriptedAgent::new(vec![Move::TryMove((-1, -1).into())])),
       )],
-      true,
     );
     world.do_step();
   }