RDG-Networks 0.3.9__py3-none-any.whl → 0.3.11__py3-none-any.whl

{RDG_Networks-0.3.9.dist-info → RDG_Networks-0.3.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: RDG-Networks
-Version: 0.3.9
+Version: 0.3.11
 Summary: Most of the code from the RDG Networks project
 Home-page: https://github.com/NiekMooij/RDG_networks
 Author: Niek Mooij

{RDG_Networks-0.3.9.dist-info → RDG_Networks-0.3.11.dist-info}/RECORD

@@ -1,5 +1,5 @@
 RDG_networks/Classes.py,sha256=_9X3JPHFAYYlaC8IZ_H9__sfz99G5l9UfPl65lL60_4,7977
-RDG_networks/__init__.py,sha256=8cc-h5ifS7RP1-N4b1Ow-4bA6MxgFETaS6SD0of54Fk,1575
+RDG_networks/__init__.py,sha256=XWmsAEPzxbMBO3tU9OjDOyGGLIfwvRK7ebGEon3Y8wE,1659
 RDG_networks/draw_segments.py,sha256=U53N5GXmQHWKdM1Q1faP_EGKjc6enOu2mcsunzSFpP0,984
 RDG_networks/generate_line_network.py,sha256=lJ4rhObim3WcEQoebomewRQKWNJC5phFyFYRW7qjXIg,1127
 RDG_networks/generate_line_segments.py,sha256=QV8_k7q6TD5c7Hcb2Ms_apEdWYw4XdLr7rdJgh49v4Q,9004
@@ -7,17 +7,18 @@ RDG_networks/generate_line_segments_dynamic.py,sha256=GoIhGXYbcvjqR5BJCnkvAGp8QB
 RDG_networks/generate_line_segments_static.py,sha256=7KvHZi3krv-tAGydJR_gbMMmHKZ5azzrKcQe3fuWzCE,9265
 RDG_networks/get_intersection_segments.py,sha256=mXB5qCy1oOps4Vu1mX6flW6v_4Xxc71YK41yOWjJX8o,2797
 RDG_networks/sample_in_polygon.py,sha256=qpPpW-Da1vK8ZkVWMJ0zBsE8IgyMB619gCdybSkzKSQ,1605
-RDG_networks/save_to_stl.py,sha256=St8kGw6wl8uOGx8KhrZhBfe89-mOfp5JKhz0dEDBvc0,3894
-RDG_networks/thickness/Classes.py,sha256=zRhi2TFDwK1oARvAd1HlxnMWeHSj7KKO-u79_r23tXc,8176
+RDG_networks/save_data.py,sha256=pMbQtWu1-Q_rSOKm_GeT_0wILu4Yk7tLHiyq3g46BQk,4378
+RDG_networks/save_to_json.py,sha256=YPO0Kc5AjLysr_y9kVGeAWvO-mv4LHWEbujbfjHOChE,531
+RDG_networks/thickness/Classes.py,sha256=NweH3l77rzZGoAcYwYq_LrpnIsDrXOem6poznTBm9a8,8972
 RDG_networks/thickness/__init__.py,sha256=DzH-mmdrk5e1LL7oq5kg0xaDjtWR7DiCeKKchArHSIs,703
-RDG_networks/thickness/generate_line_segments_thickness.py,sha256=q3MVKEC8w1MUpiRGF6o4MKh6VHBIs1nuIibsqsewDcQ,29037
+RDG_networks/thickness/generate_line_segments_thickness.py,sha256=D32KQMzOsqnzJ05XMgy-BF3PgET5UZLFhPBi_rCH26I,29112
 RDG_networks/thickness/generate_line_segments_thickness_correct.py,sha256=rvvqEMGYX7imosKedyXHyTkBV4C2_24K8UxthXDTe7Q,28627
 RDG_networks/thickness/generate_line_segments_thickness_static.py,sha256=6-2p4GOQFU-dP5Q9nYuaVqeb7wvxk2Fqld3A7cV2pY8,8964
 RDG_networks/thickness/orientate_network.py,sha256=4jii3y89Jlw1tPmTWoUyrKE7MlHq21JuoiuwnBa1Mkk,15484
 RDG_networks/thickness/sample_in_polygon.py,sha256=nJ-yqfoCCGfC6_EpGL3L1t1LOYdqWZd-7v5bxy6th34,1849
-RDG_Networks-0.3.9.dist-info/LICENSE.txt,sha256=BHUkX2GsdTr30sKmVZ1MLGR1njnx17EX_oUuuSVZZPE,598
-RDG_Networks-0.3.9.dist-info/METADATA,sha256=hlDd-R21n_eTohn-xz3OU7-ZvLragLhxSHwNWTq0u4M,2577
-RDG_Networks-0.3.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-RDG_Networks-0.3.9.dist-info/entry_points.txt,sha256=coqOWe9rYYuz9VQvJGFomTzvEP7JY5T9V9gauMhSb_0,986
-RDG_Networks-0.3.9.dist-info/top_level.txt,sha256=4gUUYafD5Al9V8ZSiViVGYHpRMMCsCBcGgCNodk9Syg,13
-RDG_Networks-0.3.9.dist-info/RECORD,,
+RDG_Networks-0.3.11.dist-info/LICENSE.txt,sha256=BHUkX2GsdTr30sKmVZ1MLGR1njnx17EX_oUuuSVZZPE,598
+RDG_Networks-0.3.11.dist-info/METADATA,sha256=qD0yBa-cEhs1AUcprwg8B9L7VkczxX37NmdLL9EZP4A,2578
+RDG_Networks-0.3.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+RDG_Networks-0.3.11.dist-info/entry_points.txt,sha256=TxynZ-ZDOUTjGcNE04io0GRKkUgDKn-Byxf0Zo-tLU8,1080
+RDG_Networks-0.3.11.dist-info/top_level.txt,sha256=4gUUYafD5Al9V8ZSiViVGYHpRMMCsCBcGgCNodk9Syg,13
+RDG_Networks-0.3.11.dist-info/RECORD,,

{RDG_Networks-0.3.9.dist-info → RDG_Networks-0.3.11.dist-info}/entry_points.txt

@@ -9,7 +9,9 @@ generate_line_segments_thickness = RDG_networks.thickness.generate_line_segments
 generate_line_segments_thickness_static = RDG_networks.generate_line_segments_thickness_static:main
 get_alignment_mean = RDG_networks.thickness.get_alignment_mean:main
 get_intersection_segments = RDG_networks.get_intersection_segments:main
+load_from_json = RDG_networks.load_from_json:main
 orientate_network = RDG_networks.thickness.orientate_network:main
 rotate_network = RDG_networks.thickness.rotate_network:main
-save_to_stl = RDG_networks.save_to_stl:main
+save_data = RDG_networks.save_to_stl:main
+save_to_json = RDG_networks.save_to_json:main
 translate_network = RDG_networks.thickness.translate_network:main

RDG_networks/__init__.py

@@ -14,7 +14,7 @@ from .thickness.orientate_network import translate_network
 from .thickness.orientate_network import clip_network
 from .thickness.orientate_network import rotate_network
 from .thickness.orientate_network import get_alignment_mean
-from .save_to_stl import save_to_stl
+from .save_data import save_to_stl, save_to_json, load_from_json
 
 __all__ = ['generate_line_segments', 
            'generate_line_segments_thickness',
@@ -33,5 +33,7 @@ __all__ = ['generate_line_segments',
            'Line', 
            'LineSegment', 
            'Polygon',
-           'save_to_stl'
+           'save_to_stl',
+           'save_to_json',
+           'load_from_json'
            ]

RDG_networks/{save_to_stl.py → save_data.py}

@@ -7,6 +7,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 import math
 import pickle
+import json
 
 import numpy as np
 from stl import mesh
@@ -114,4 +115,16 @@ def save_to_stl(seg_thick_dict, thickness, name, frame_thickness = None):
     merged_mesh = merge_3d_meshes(mesh_list)
 
     # Save the merged mesh as an STL file   
-    merged_mesh.save(name)
+    merged_mesh.save(name)
+
+def save_to_json(data_dict, file_path):
+    data_dict['segments_dict'] = {key: pol.to_dict() for key, pol in data_dict['segments_dict'].items()}
+    data_dict['segment_thickness_dict'] = {key: pol.to_dict() for key, pol in data_dict['segment_thickness_dict'].items()}
+
+    with open(file_path, 'w') as json_file:
+        json.dump(data_dict, json_file)
+
+def load_from_json(file_path):
+    with open(file_path, 'r') as file:
+        data = json.load(file)
+    return data

RDG_networks/save_to_json.py

@@ -0,0 +1,14 @@
+import json
+from .Classes import Line, LineSegment, Polygon
+
+def save_to_json(data_dict, file_path):
+    data_dict['segments_dict'] = {key: pol.to_dict() for key, pol in data_dict['segments_dict'].items()}
+    data_dict['segment_thickness_dict'] = {key: pol.to_dict() for key, pol in data_dict['segment_thickness_dict'].items()}
+
+    with open(file_path, 'w') as json_file:
+        json.dump(data_dict, json_file)
+
+def load_from_json(file_path):
+    with open(file_path, 'r') as file:
+        data = json.load(file)
+    return data

RDG_networks/thickness/Classes.py

@@ -3,6 +3,7 @@ import matplotlib.axes._axes as axes
 from matplotlib.patches import Polygon as polgon
 import numpy as np
 from typing import List, Tuple, Union, Optional
+import json
 
 class Line:
     """
@@ -87,6 +88,21 @@ class LineSegment:
         """
         return copy.deepcopy(self)
     
+    def to_dict(self) -> dict:
+        """
+        Convert the LineSegment object to a dictionary.
+
+        Returns:
+        - dict: A dictionary representation of the LineSegment object.
+        """
+        return {
+            'start': self.start,
+            'end': self.end,
+            'id': self.id,
+            'neighbors_initial': self.neighbors_initial,
+            'neighbors': self.neighbors
+        }
+    
 class Polygon:
     """
     Represents a polygon defined by a list of vertices.
@@ -178,6 +194,19 @@ class Polygon:
             x2, y2 = self.vertices[(i + 1) % len(self.vertices)]
             perimeter += np.sqrt((x1-x2)**2 + (y1-y2)**2)
         return perimeter
+    
+    def to_dict(self) -> dict:
+        """
+        Convert the Polygon object to a dictionary.
+
+        Returns:
+            dict: A dictionary representation of the Polygon object.
+        """
+        return {
+            'vertices': self.vertices,
+            'middle_segment': self.middle_segment.to_dict(),
+            'neighbors': self.neighbors
+        }
         
 class Cycle:
     def __init__(self, vertices, id=None):

RDG_networks/thickness/generate_line_segments_thickness.py

@@ -604,6 +604,7 @@ def generate_line_segments_thickness(
         size = len(config)
 
     jammed = False
+    nucleation_points = []
     for i in range(size):
         if config:
             nucleation_point = config[i]['location']
@@ -623,6 +624,8 @@ def generate_line_segments_thickness(
             segments_dict, polygon_arr, segment_thickness_dict, location, angle = output
             generated_config.append({ 'location': location, 'angle': angle, 'thickness': thickness_arr[i] })
 
+            nucleation_points.append(location)
+
         else:
             if config:
                 print('Configuration not possible. Point is skipped.')