diff --git a/src/control/rl.rs b/src/control/rl.rs index 2f68a27..6440606 100644 --- a/src/control/rl.rs +++ b/src/control/rl.rs @@ -179,9 +179,8 @@ impl RlController { let demand: Vec = (0..net.stages.len()) .map(|j| { let mut d = 0.0; - for m in 0..net.movements.len() { + for (m, mo) in ctx.view.moves.iter().enumerate().take(net.movements.len()) { if stat(net, j, m).is_some() { - let mo = &ctx.view.moves[m]; d += mo.queue + mo.vehicles .iter() @@ -206,8 +205,7 @@ impl RlController { let net = ctx.net; let mut f = Vec::with_capacity(n_inputs(net)); let cur = ctx.sig.stage; - for m in 0..net.movements.len() { - let mo = &ctx.view.moves[m]; + for (m, mo) in ctx.view.moves.iter().enumerate().take(net.movements.len()) { let mut n10 = 0.0; let mut n30 = 0.0; for o in &mo.vehicles { diff --git a/src/sim/mod.rs b/src/sim/mod.rs index 396055b..f9f7e8c 100644 --- a/src/sim/mod.rs +++ b/src/sim/mod.rs @@ -1341,8 +1341,7 @@ impl Sim { } let mut dist = self.net.links[link].length() - v.s; let mut prev = link; - for k in v.ri + 1..v.route.len() { - let next = v.route[k]; + for &next in &v.route[v.ri + 1..] { for &j in &self.occ[next] { let w = &self.vehicles[j]; consider(&mut best, dist + w.s - w.len(), w.v, j);