From b42b8f5ced6255555df35c27a33a231e5545cdab Mon Sep 17 00:00:00 2001 From: Alex Wellnitz Date: Mon, 17 Mar 2025 22:41:53 +0100 Subject: [PATCH] feat: add real coordinates --- src/main.rs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index 37baebe..e95f724 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ -use rand::rng; -use rand::seq::SliceRandom; +//use rand::rng; +//use rand::seq::SliceRandom; #[macro_use] extern crate rocket; @@ -46,10 +46,17 @@ fn lin_kernighan(mut tour: Vec, cities: &[(f64, f64)]) -> Vec { #[get("/")] fn index() -> String { - let cities = vec![(0.0, 0.0), (1.0, 5.0), (5.0, 2.0), (6.0, 7.0), (3.0, 4.0)]; + let cities = vec![ + (50.03317681689108, 7.630692594382566), + (50.0511467529328, 7.610264891874095), + (50.07417811821386, 7.637215727783678), + (50.10154844328665, 7.683642662673185), + (50.070237512738046, 7.697022868469907), + (50.052876354261926, 7.6108551506699955), + ]; - let mut tour: Vec = (0..cities.len()).collect(); - tour.shuffle(&mut rng()); + let tour: Vec = (0..cities.len()).collect(); + //tour.shuffle(&mut rng()); let best_tour = lin_kernighan(tour, &cities);