ADD Better format CSV files (#126)

* ADD Better format CSV files

* FIX restructuring

Author: eleniv3d

src/gh/components/DF_cloud_mesh_distance/code.py

@@ -55,7 +55,7 @@ def RunScript(self,
                 siffed_rh_mesh_target_list.append(rh_mesh_target_list[i])
 
         # calculate distances
-        o_result = df_error_estimation.df_cloud_2_rh_mesh_comparison(siffed_df_cloud_source_list, siffed_rh_mesh_target_list, i_signed_flag, i_swap)
+        o_result = df_error_estimation.df_cloud_2_rh_mesh_comparison(i_assembly, df_cloud_source_list, rh_mesh_target_list, i_signed_flag, i_swap)
 
         # distances to tree
         distances_tree = Grasshopper.DataTree[object]()

src/gh/components/DF_csv_exporter/code.py

@@ -9,6 +9,43 @@
 
 
 class DFCsvExporter(component):
+    def _get_id(self, idx, i_result):
+        """ Get the ID of the element """
+        counter = 0
+
+        if self.prefix == "beam":
+            return idx
+        elif self.prefix == "joint":
+            for idx_b, beam in enumerate(i_result.assembly.beams):
+                for idx_j, joint in enumerate(beam.joints):
+                    if counter == idx:
+                        return f"{idx_b}--{idx_b}--{idx_j}"
+                    counter += 1
+        elif self.prefix == "joint_face":
+            for idx_b, beam in enumerate(i_result.assembly.beams):
+                for idx_j, joint in enumerate(beam.joints):
+                    for idx_f, face in enumerate(joint.faces):
+                        if counter == idx:
+                            return f"{idx_b}--{idx_j}--{idx_f}"
+                        counter += 1
+
+    def _write_csv(self, file_path, rows):
+        """ Write the CSV file """
+        with open(file_path, mode='w', newline='') as file:
+            writer = csv.writer(file)
+            writer.writerow([f"{self.prefix} id", "distances", "min_deviation", "max_deviation", "std_deviation", "rmse"])
+            writer.writerows(rows)
+
+    def _prepare_row(self, idx, i_result):
+        """ Prepare a row for the CSV file """
+        distances = [round(value, 4) for value in i_result.distances[idx]]
+        min_dev = round(i_result.distances_min_deviation[idx], 4)
+        max_dev = round(i_result.distances_max_deviation[idx], 4)
+        std_dev = round(i_result.distances_sd_deviation[idx], 4)
+        rmse = round(i_result.distances_rmse[idx], 4)
+        distances_str = ";".join(map(str, distances))
+        return [self._get_id(idx, i_result), distances_str, min_dev, max_dev, std_dev, rmse]
+
     def RunScript(self,
                   i_dump: bool,
                   i_export_dir: str,
@@ -17,31 +54,21 @@ def RunScript(self,
                   i_result: DFVizResults):
 
         if i_dump:
-            # Ensure the export directory exists
             os.makedirs(i_export_dir, exist_ok=True)
 
+            if len(i_result.assembly.beams) == len(i_result.source):
+                self.prefix = "beam"
+            elif len(i_result.assembly.all_joints) == len(i_result.source):
+                self.prefix = "joint"
+            elif len(i_result.assembly.all_joint_faces) == len(i_result.source):
+                self.prefix = "joint_face"
+
             if i_export_seperate_files:
-                # Export each list of values to a separate file
-                for idx, list_of_values in enumerate(i_result.distances):
-                    file_name = f"{i_file_name}_{idx + 1}.csv"
-                    file_path = os.path.join(i_export_dir, file_name)
-                    with open(file_path, mode='w', newline='') as file:
-                        writer = csv.writer(file)
-                        writer.writerow([list_of_values])
+                for idx in range(len(i_result.source)):
+                    element_id = self._get_id( idx, i_result)
+                    file_path = os.path.join(i_export_dir, f"{i_file_name}_{self.prefix}_{element_id}.csv")
+                    self._write_csv(file_path, [self._prepare_row(idx, i_result)])
             else:
-                # Export all values to a single file
                 file_path = os.path.join(i_export_dir, f"{i_file_name}.csv")
-                with open(file_path, mode='w', newline='') as file:
-                    writer = csv.writer(file)
-                    for list_of_values in i_result.distances:
-                        writer.writerow([list_of_values])
-
-# if __name__ == "__main__":
-#     com = DFCsvExporter()
-#     o_viz_settings = com.RunScript(
-#         i_dump,
-#         i_export_dir,
-#         i_file_name,
-#         i_export_seperate_files,
-#         i_result
-#         )
+                rows = [self._prepare_row(idx, i_result) for idx in range(len(i_result.source))]
+                self._write_csv(file_path, rows)

src/gh/diffCheck/diffCheck/df_error_estimation.py

@@ -6,26 +6,27 @@
 import numpy as np
 from diffCheck import diffcheck_bindings  # type: ignore
 import Rhino.Geometry as rg
+from diffCheck.df_geometries import DFAssembly
 
 
 def df_cloud_2_df_cloud_comparison(source_list, target_list):
     """
         Compute the Euclidean distance for every point of a source pcd to its
         closest point on a target pointcloud
     """
-    results = DFVizResults()
+    results = DFVizResults(DFAssembly())
     for source, target in zip(source_list, target_list):
         distances = np.asarray(source.compute_distance(target))
         results.add(source, target, distances)
 
     return results
 
 
-def df_cloud_2_rh_mesh_comparison(cloud_source_list, rhino_mesh_target_list, signed_flag, swap):
+def df_cloud_2_rh_mesh_comparison(assembly, cloud_source_list, rhino_mesh_target_list, signed_flag, swap):
     """
         Computes distances between a pcd and a mesh
     """
-    results = DFVizResults()
+    results = DFVizResults(assembly)
 
     for source, target in zip(cloud_source_list, rhino_mesh_target_list):
 
@@ -123,7 +124,7 @@ class DFVizResults:
     This class compiles the resluts of the error estimation into one object
     """
 
-    def __init__(self):
+    def __init__(self, assembly):
 
         self.source = []
         self.target = []
@@ -133,6 +134,7 @@ def __init__(self):
         self.distances_min_deviation = []
         self.distances_sd_deviation = []
         self.distances = []
+        self.assembly = assembly
 
     def add(self, source, target, distances):