Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/control/rl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,8 @@ impl RlController {
let demand: Vec<f64> = (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()
Expand All @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions src/sim/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading