Earthnuker/ED_LRR
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

chore: rust code cleanup

Browse source
This commit is contained in:
Daniel S. 2019-09-28 19:26:49 +02:00
parent b662a24e9a
commit 935891c852
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rust/src/route.rs
View file

@ -489,7 +489,7 @@ impl Router {
&start_sys, &start_sys,
)); ));
seen.insert(start_sys.id); seen.insert(start_sys.id);
while !(queue.is_empty() || found) { while !found {
while let Some((depth, _, sys)) = queue.pop() { while let Some((depth, _, sys)) = queue.pop() {
if t_last.elapsed().as_millis() > 100 { if t_last.elapsed().as_millis() > 100 {
t_last = Instant::now(); t_last = Instant::now();
@ -534,6 +534,9 @@ impl Router {
}); });
// queue.reverse(); // queue.reverse();
} }
if queue.is_empty() {
break;
}
} }
println!(); println!();
@ -590,7 +593,7 @@ impl Router {
let mut queue: Vec<(f32, usize, &System)> = Vec::new(); let mut queue: Vec<(f32, usize, &System)> = Vec::new();
queue.push((start_sys.distp(goal_sys), 0, &start_sys)); queue.push((start_sys.distp(goal_sys), 0, &start_sys));
seen.insert(start_sys.id); seen.insert(start_sys.id);
while !(queue.is_empty() || found) { while !found {
while let Some((_, depth, sys)) = queue.pop() { while let Some((_, depth, sys)) = queue.pop() {
if t_last.elapsed().as_millis() > 100 { if t_last.elapsed().as_millis() > 100 {
t_last = Instant::now(); t_last = Instant::now();
@ -629,6 +632,9 @@ impl Router {
queue.sort_by(|a, b| fcmp(a.0, b.0).then(a.1.cmp(&b.1))); queue.sort_by(|a, b| fcmp(a.0, b.0).then(a.1.cmp(&b.1)));
queue.reverse(); queue.reverse();
} }
if queue.is_empty() {
break;
}
} }
if !found { if !found {
return Err(format!("No route from {} to {} found!", src_name, dst_name)); return Err(format!("No route from {} to {} found!", src_name, dst_name));
@ -820,7 +826,7 @@ impl Router {
let mut queue_next: VecDeque<(usize, &System)> = VecDeque::new(); let mut queue_next: VecDeque<(usize, &System)> = VecDeque::new();
queue.push_front((0, &start_sys)); queue.push_front((0, &start_sys));
seen.insert(start_sys.id); seen.insert(start_sys.id);
while !(queue.is_empty() || found) { while !found {
while let Some((d, sys)) = queue.pop_front() { while let Some((d, sys)) = queue.pop_front() {
if sys.id == goal_sys.id { if sys.id == goal_sys.id {
found = true; found = true;
@ -877,6 +883,9 @@ impl Router {
); );
} }
std::mem::swap(&mut queue, &mut queue_next); std::mem::swap(&mut queue, &mut queue_next);
if queue.is_empty() {
break;
}
depth += 1; depth += 1;
} }
println!(); println!();