Refactored number generator

Author: buraksenyurt

drone-lab/src/controller/simulation_controller.rs

@@ -13,14 +13,14 @@ impl<'a> SimulationController<'a> {
         for i in 0..drone_count {
             let model = DRONE_MODELS[get_random_number(DRONE_MODELS.len())];
             self.drones.push(Drone {
-                id: 1,
+                id: i as u32,
                 energy_level: 100.0,
                 model,
                 is_alive: true,
                 location: Location {
-                    x: 0.0,
-                    y: 0.0,
-                    z: 0.0,
+                    x: get_random_between(1, 100) as f32,
+                    y: get_random_between(1, 100) as f32,
+                    z: get_random_between(1, 100) as f32,
                     caption: "",
                 },
             })

drone-lab/src/data/generator.rs

@@ -9,3 +9,19 @@ pub fn get_random_number(max: usize) -> usize {
 
     if max == 0 { 0 } else { nanos % max }
 }
+
+pub fn get_random_between(min: usize, max: usize) -> usize {
+    if min > max {
+        panic!("Min must be less than or equal to Max");
+    }
+
+    let duration = SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .expect("Error at duration calculation");
+
+    let nanos = duration.subsec_nanos() as usize;
+    let range = max - min + 1;
+
+    min + (nanos % range)
+}
+

drone-lab/src/main.rs

@@ -1,4 +1,4 @@
-use data::{DRONE_MODELS, get_random_number};
+use data::{DRONE_MODELS, get_random_between, get_random_number};
 
 mod controller;
 mod data;
@@ -17,4 +17,9 @@ fn main() {
         let max_value = DRONE_MODELS.len();
         println!("{}", DRONE_MODELS[get_random_number(max_value)]);
     }
+
+    for _ in 0..10 {
+        let number = get_random_between(10, 100);
+        println!("{number}");
+    }
 }

drone-lab/src/tests/generator_tests.rs

@@ -1,6 +1,6 @@
 #[cfg(test)]
 mod test {
-    use crate::data::{DRONE_MODELS, get_random_number};
+    use crate::data::{DRONE_MODELS, get_random_between, get_random_number};
 
     #[test]
     fn random_drone_model_test() {
@@ -13,4 +13,12 @@ mod test {
                 .any(|m| m.to_string() == model.to_string())
         );
     }
+
+    #[test]
+    fn random_number_between_range_test() {
+        let min_value = 10;
+        let max_value = 50;
+        let actual = get_random_between(min_value, max_value);
+        assert!(actual >= min_value && actual <= max_value);
+    }
 }