hm

Author: Trolldemorted

navpointmatrixcli/src/main.rs

@@ -1,7 +1,9 @@
-use std::fs::{self};
-
+use ordered_f64::OrderedF32;
 use p3_api::data::{navigation_matrix::NavigationMatrix, navigation_vector::NavigationVector, navpoint_matrix::NavpointMatrix};
 use pathfinding::prelude::{build_path, dijkstra_all};
+use std::fs::{self};
+
+pub mod ordered_f64;
 
 pub struct DirectlyConnectedNodes {
     pub connected_nodes: Vec<(u16, u16)>,
@@ -116,11 +118,11 @@ impl DirectlyConnectedNodes {
         buf
     }
 
-    pub fn get_neighbours(&self, node_index: u16, nav_vec: &NavigationVector) -> Vec<(u16, i128)> {
+    pub fn get_neighbours(&self, node_index: u16, nav_vec: &NavigationVector) -> Vec<(u16, OrderedF32)> {
         let mut neighbours = vec![];
         for n in &self.connected_nodes {
             if n.0 == node_index {
-                neighbours.push((n.1, nav_vec.get_distance(n.0 as _, n.1 as _)));
+                neighbours.push((n.1, nav_vec.get_distance(n.0 as _, n.1 as _).into()));
             }
         }
 

navpointmatrixcli/src/ordered_f64.rs

@@ -0,0 +1,56 @@
+use std::{cmp::Ordering, ops::Add};
+
+#[derive(Copy, Clone)]
+pub struct OrderedF32 {
+    value: f32,
+}
+
+impl From<f32> for OrderedF32 {
+    fn from(value: f32) -> Self {
+        Self { value }
+    }
+}
+
+impl pathfinding::num_traits::Zero for OrderedF32 {
+    fn zero() -> Self {
+        Self { value: 0.0 }
+    }
+
+    fn is_zero(&self) -> bool {
+        self.value == 0.0
+    }
+}
+
+impl Add for OrderedF32 {
+    type Output = OrderedF32;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        Self { value: self.value + rhs.value }
+    }
+}
+
+impl Ord for OrderedF32 {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        if self.value < other.value {
+            Ordering::Less
+        } else if self.value > other.value {
+            Ordering::Greater
+        } else {
+            Ordering::Equal
+        }
+    }
+}
+
+impl PartialOrd for OrderedF32 {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        self.value.partial_cmp(&other.value)
+    }
+}
+
+impl PartialEq for OrderedF32 {
+    fn eq(&self, other: &Self) -> bool {
+        self.value == other.value
+    }
+}
+
+impl Eq for OrderedF32 {}

p3-api/src/data/navigation_vector.rs

@@ -17,10 +17,12 @@ impl NavigationVector {
         NavigationVector { length, points }
     }
 
-    pub fn get_distance(&self, source_index: usize, destination_index: usize) -> i128 {
-        let s = self.points[source_index];
-        let d = self.points[destination_index];
-        let i_square = (s.0 as i64 - d.0 as i64).pow(2) + (s.1 as i64 - d.1 as i64).pow(2);
-        ((i_square as f64).sqrt()) as i128
+    pub fn get_distance(&self, source_index: usize, destination_index: usize) -> f32 {
+        let x1 = self.points[source_index].0 as f32;
+        let y1 = self.points[source_index].1 as f32;
+        let x2 = self.points[destination_index].0 as f32;
+        let y2 = self.points[destination_index].1 as f32;
+        let i_square = (x2 - x1).powf(2.0) + (y2 - y1).powf(2.0);
+        i_square.sqrt()
     }
 }