diff --git a/src/path_calc.rs b/src/path_calc.rs index 0444035..692ca4e 100644 --- a/src/path_calc.rs +++ b/src/path_calc.rs @@ -52,15 +52,15 @@ pub async fn calc_route(routes:&mut [crate::route::Route], from:crate::types::Co let min_direct_route = routes.iter().min_by_key(|route|route_measure_dist_to(route)+route_measure_dist_from(route)).unwrap(); let min_to_bu_route = routes.iter().min_by_key(|route|route_measure_dist_from(route)+route_measure_dist_bu(route)).unwrap(); let min_from_bu_route = routes.iter().min_by_key(|route|route_measure_dist_bu(route)+route_measure_dist_to(route)).unwrap(); - //let min_to_bc_hub = routes.iter().min_by_key(|route|route_measure_dist_from(route)+route_measure_dist_bc_hub(route)).unwrap(); - //let min_from_bc_hub = routes.iter().min_by_key(|route|route_measure_dist_bc_hub(route)+route_measure_dist_to(route)).unwrap(); + let min_to_bc_hub = routes.iter().min_by_key(|route|route_measure_dist_from(route)+route_measure_dist_bc_hub(route)).unwrap(); + let min_from_bc_hub = routes.iter().min_by_key(|route|route_measure_dist_bc_hub(route)+route_measure_dist_to(route)).unwrap(); let direct_route_cost = route_measure_dist_to(min_direct_route) + route_measure_dist_from(min_direct_route); let bu_route_cost = route_measure_dist_from(min_to_bu_route) + route_measure_dist_to(min_from_bu_route); - //let bc_route_cost = route_measure_dist_from(min_to_bc_hub) + route_measure_dist_from(min_from_bc_hub); - let min_to_bc_hub = crate::route::Route::default(); - let min_from_bc_hub = crate::route::Route::default(); - let bc_route_cost = u64::MAX; + let bc_route_cost = route_measure_dist_from(min_to_bc_hub) + route_measure_dist_from(min_from_bc_hub); + //let min_to_bc_hub = crate::route::Route::default(); + //let min_from_bc_hub = crate::route::Route::default(); + //let bc_route_cost = u64::MAX; let min = *[direct_route_cost,bu_route_cost,bc_route_cost].iter().min().unwrap(); if direct_route_cost <= min{