small change

This commit is contained in:
René Fuhry 2023-05-31 23:00:53 +02:00 committed by GitHub
parent 36678bf8ee
commit cffad9380b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -77,10 +77,11 @@ pub fn calculate_exzentrizitaeten(distanz_matrix: &Vec<Vec<usize>>) -> Vec<usize
exzentrizitaeten exzentrizitaeten
} }
pub fn calculate_properties(exzentrizitaeten: &Vec<usize>) -> (usize, usize, Vec<usize>) { pub fn calculate_properties(exzentrizitaeten: &Vec<usize>) -> (usize, usize, Vec<usize>, bool) {
let mut radius: usize = usize::MAX; let mut radius: usize = usize::MAX;
let mut diameter: usize = 0; let mut diameter: usize = 0;
let mut centre: Vec<usize> = vec![]; let mut centre: Vec<usize> = vec![];
let mut connected: bool = true;
for i in 0..exzentrizitaeten.len() { for i in 0..exzentrizitaeten.len() {
if exzentrizitaeten[i] > diameter { if exzentrizitaeten[i] > diameter {
@ -94,9 +95,11 @@ pub fn calculate_properties(exzentrizitaeten: &Vec<usize>) -> (usize, usize, Vec
centre.clear(); centre.clear();
centre.push(i + 1); centre.push(i + 1);
} }
if exzentrizitaeten[i] == 0 {
connected = false;
}
} }
let results: (usize, usize, Vec<usize>, bool) = (radius, diameter, centre, connected);
let results: (usize, usize, Vec<usize>) = (radius, diameter, centre);
results results
} }