FIX: got rid of distance/distance component in docs

Author: 9and3

doc/documentation.md

@@ -68,5 +68,4 @@ If you need to add a new page to the [tutorials](tutorials.rst) (e.g. a [new tut
 
 ```{eval-rst}
 .. literalinclude:: tutorials.rst
-   :language: rst
-   :lines: 6-14
+   :language: rst

doc/gh_DFCloudCloudDistance.rst

@@ -41,11 +41,6 @@ DF has a Grasshopper_ plugin with a set of components that allows the user to in
      - .. image:: ../src/gh/components/DF_cloud_uniform_downsample/icon.png
      - `gh_DFCloudUniformDownsample <gh_DFCloudUniformDownsample.html>`_
 
-   * - .. image:: ../src/gh/components/DF_cloud_voxel_downsample/icon.png
-     - `gh_DFCloudVoxelDownsample <gh_DFCloudVoxelDownsample.html>`_
-     - .. image:: ../src/gh/components/DF_cloud_cloud_distance/icon.png
-     - `gh_DFCloudCloudDistance <gh_DFCloudCloudDistance.html>`_
-
    * - .. image:: ../src/gh/components/DF_cloud_mesh_distance/icon.png
      - `gh_DFCloudMeshDistance <gh_DFCloudMeshDistance.html>`_
      - .. image:: ../src/gh/components/DF_csv_exporter/icon.png
@@ -83,8 +78,8 @@ DF has a Grasshopper_ plugin with a set of components that allows the user to in
 
    * - .. image:: ../src/gh/components/DF_merge_assemblies/icon.png
      - `gh_DFMergeAssemblies <gh_DFMergeAssemblies.html>`_
-     - 
-     - 
+     - .. image:: ../src/gh/components/DF_cloud_voxel_downsample/icon.png
+     - `gh_DFCloudVoxelDownsample <gh_DFCloudVoxelDownsample.html>`_
 
 
 .. toctree::
@@ -93,7 +88,6 @@ DF has a Grasshopper_ plugin with a set of components that allows the user to in
 
    gh_DFBuildAssembly
    gh_DFCADSegmentator
-   gh_DFCloudCloudDistance
    gh_DFCloudMeshDistance
    gh_DFCloudNormalEstimator
    gh_DFCloudSizeDownsample

doc/gh_components.rst

@@ -10,4 +10,3 @@ diffCheck tutorials
    key-concepts
    joints-evaluation
    assembly-evaluation
-   

doc/tutorials.rst

@@ -128,14 +128,21 @@ def filter_values_based_on_valuetype(self, settings):
     def is_source_cloud(self):
         return type(self.source[0]) is diffcheck_bindings.dfb_geometry.DFPointCloud
 
-
-def df_cloud_2_df_cloud_comparison(source_list, target_list):
+# FIXME: ths is currently broken, we need to fix it
+def df_cloud_2_df_cloud_comparison(
+    assembly: DFAssembly,
+    df_cloud_source_list: typing.List[diffcheck_bindings.dfb_geometry.DFPointCloud],
+    df_cloud_target_list: typing.List[diffcheck_bindings.dfb_geometry.DFPointCloud]
+    ) -> DFVizResults:
     """
         Compute the Euclidean distance for every point of a source pcd to its
         closest point on a target pointcloud
     """
-    results = DFVizResults(DFAssembly())
-    for source, target in zip(source_list, target_list):
+    results = DFVizResults(
+        DFAssembly(
+            [], "cloud-cloud-dummy-dfassembly"
+        ))
+    for source, target in zip(df_cloud_source_list, df_cloud_target_list):
         distances = np.asarray(source.compute_distance(target))
         results.add(source, target, distances)
 
@@ -171,9 +178,6 @@ def rh_cloud_2_rh_mesh_comparison(
         if swap:
             source_df, target = target, source_df
 
-        # FIXME: this is a hack to avoid that the assembly segmentator breaks this
-        # snippet because it is not stamping the rhino pout cloud with the sanity check
-        # user string value.
         sanity_check_value_uncasted = source_rh.GetUserString("df_sanity_scan_check")
         sanity_check_value = None
         if sanity_check_value_uncasted is None:

src/gh/components/DF_cloud_cloud_distance/code.py

@@ -163,40 +163,20 @@ def get_doc_2_meters_unitf():
 def merge_shared_indexes(original_dict):
     """
     Merge the shared indexes of a dictionary
-
     Assume we have a dictionary with lists of indexes as values.
     We want to merge the lists that share some indexes, in order to have a dictionary with, for each key, indexes that are not present under other keys.
-
     :param original_dict: the dictionary to merge
     :return: the merged dictionary
     """
-    merged_dict = {}
-    index_to_key = {}
+    new_dict = {}
 
     for key, (face, indexes) in original_dict.items():
-        merged_indexes = set(indexes)
-        keys_to_merge = set()
-
-        for index in indexes:
-            if index in index_to_key:
-                keys_to_merge.add(index_to_key[index])
-
-        for merge_key in keys_to_merge:
-            merged_indexes.update(merged_dict[merge_key][1])
-            # del merged_dict[merge_key]
-
-        for index in merged_indexes:
-            index_to_key[index] = key
-
-        merged_dict[key] =  (face, list(merged_indexes))
-
-    keys_with_duplicates = {}
-
-    for key in merged_dict.keys():
-        for other_key, (face, indexes) in merged_dict.items():
-            if key in indexes:
-                if key not in keys_with_duplicates:
-                    keys_with_duplicates[key] = []
-                keys_with_duplicates[key].append(other_key)
-
-    return merged_dict
+        intersection_found = False
+        for other_key, (other_face, other_indexes) in original_dict.items():
+            if key != other_key:
+                if set(indexes).intersection(set(other_indexes)):
+                    new_dict[key] = (face, list(set(indexes).union(set(other_indexes))))
+                    intersection_found = True
+        if not intersection_found:
+            new_dict[key] = (face, indexes)
+    return new_dict