From 48a0497ead1185b6401cb9cc83017708a92ac429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20Kaan=20G=C3=9CM=C3=9C=C5=9E?=
 <96421894+Tahinli@users.noreply.github.com>
Date: Wed, 20 Nov 2024 00:20:40 +0300
Subject: [PATCH] pre commit

---
 artificial_bee_colony/src/bee.rs  | 49 +++++++++++++++++++++++++++++--
 artificial_bee_colony/src/main.rs | 37 +++--------------------
 2 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/artificial_bee_colony/src/bee.rs b/artificial_bee_colony/src/bee.rs
index 0309387..81e17cd 100644
--- a/artificial_bee_colony/src/bee.rs
+++ b/artificial_bee_colony/src/bee.rs
@@ -1,10 +1,53 @@
 use rand::Rng;
 
-use crate::food::FoodSource;
+use crate::{food::FoodSource, utils::Input};
 
 pub struct Bee {}
 impl Bee {
-    pub fn employed_bee(
+    pub fn send_all_employed_bees(
+        food_sources: &mut [FoodSource],
+        input:&Input,
+    ) {
+        for food_source_index in 0..input.food_source_number {
+            Bee::employed_bee(
+                food_sources,
+                food_source_index,
+                input.decision_variable_count,
+                input.upper_bound,
+                input.lower_bound,
+            );
+        }
+    }
+
+    pub fn send_all_onlooker_bees(food_sources: &mut [FoodSource],
+        input:&Input,) {
+        let total_fitness = food_sources
+                .iter()
+                .map(|food_source| food_source.fitness_calculation)
+                .sum();
+            let onlooker_bee_count = input.food_source_number;
+            let mut last_looked = 0;
+            for _ in 0..onlooker_bee_count {
+                loop {
+                    if last_looked >= input.food_source_number {
+                        last_looked = 0;
+                    }
+                    if Bee::onlooker_bee(
+                        food_sources,
+                        last_looked,
+                        total_fitness,
+                        input.decision_variable_count,
+                        input.upper_bound,
+                        input.lower_bound,
+                    ) {
+                        break;
+                    }
+                    last_looked += 1;
+                }
+            }
+    }
+
+    fn employed_bee(
         food_sources: &mut [FoodSource],
         food_source_index: usize,
         decision_variable_count: usize,
@@ -20,7 +63,7 @@ impl Bee {
         );
     }
 
-    pub fn onlooker_bee(
+    fn onlooker_bee(
         food_sources: &mut [FoodSource],
         food_source_index: usize,
         total_fitness: f64,
diff --git a/artificial_bee_colony/src/main.rs b/artificial_bee_colony/src/main.rs
index 918cc39..00b58c4 100644
--- a/artificial_bee_colony/src/main.rs
+++ b/artificial_bee_colony/src/main.rs
@@ -19,41 +19,12 @@ fn main() {
         );
         let mut best_food_source = FoodSource::find_best_food_source(&food_sources);
 
+        
         for _ in 0..input.iteration {
-            for food_source_index in 0..input.food_source_number {
-                Bee::employed_bee(
-                    &mut food_sources,
-                    food_source_index,
-                    input.decision_variable_count,
-                    input.upper_bound,
-                    input.lower_bound,
-                );
-            }
+            Bee::send_all_employed_bees(&mut food_sources, &input);
 
-            let total_fitness = food_sources
-                .iter()
-                .map(|food_source| food_source.fitness_calculation)
-                .sum();
-            let onlooker_bee_count = input.food_source_number;
-            let mut last_looked = 0;
-            for _ in 0..onlooker_bee_count {
-                loop {
-                    if last_looked >= input.food_source_number {
-                        last_looked = 0;
-                    }
-                    if Bee::onlooker_bee(
-                        &mut food_sources,
-                        last_looked,
-                        total_fitness,
-                        input.decision_variable_count,
-                        input.upper_bound,
-                        input.lower_bound,
-                    ) {
-                        break;
-                    }
-                    last_looked += 1;
-                }
-            }
+            Bee::send_all_onlooker_bees(&mut food_sources, &input);
+            
             best_food_source = FoodSource::find_best_food_source(&food_sources);
 
             let most_tried_food_source_index =