diff --git a/artificial_bee_colony/abc_config.toml b/artificial_bee_colony/abc_config.toml index 2fb0fa8..7fa4cde 100644 --- a/artificial_bee_colony/abc_config.toml +++ b/artificial_bee_colony/abc_config.toml @@ -1,8 +1,8 @@ -[start_parameters] -decision_variable_count = 50 +[input_parameters] +decision_variable_count = 30 food_source_number = 20 -food_source_try_limit = 1000 +food_source_try_limit = 60 upper_bound = 100 lower_bound = -100 -iteration = 100 -run = 30 \ No newline at end of file +iteration = 1000 +run = 100 diff --git a/artificial_bee_colony/src/utils.rs b/artificial_bee_colony/src/utils.rs index 56e30e6..a536944 100644 --- a/artificial_bee_colony/src/utils.rs +++ b/artificial_bee_colony/src/utils.rs @@ -89,12 +89,13 @@ impl Input { reader .lines() .map(|unchecked_line| unchecked_line.unwrap()) - .map(|mut line|{ + .map(|mut line| { if let Some(comment_location) = line.find('#') { let _ = line.split_off(comment_location); } line }) + .filter(|uncommented_line| !uncommented_line.is_empty()) .for_each(|line| { lines.append( &mut line @@ -103,6 +104,7 @@ impl Input { .collect::>(), ) }); + if lines[0].starts_with("[input_parameters]") { for i in 1..lines.len() { match lines[i].as_str() {