RDG-Networks 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

{RDG_Networks-0.1.2.dist-info → RDG_Networks-0.1.4.dist-info}/METADATA

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

RDG_Networks-0.1.4.dist-info/RECORD

@@ -0,0 +1,13 @@
+RDG_networks/Classes.py,sha256=_9X3JPHFAYYlaC8IZ_H9__sfz99G5l9UfPl65lL60_4,7977
+RDG_networks/__init__.py,sha256=lbEZ5NwKERxQ4oLXTxWoe8q8f6c_iSx4ZQXDwgx_OP4,759
+RDG_networks/draw_segments.py,sha256=0jc1H_8YUUH7YSCtIfzgZdeIZRTX--FZUUGo2m45Lxo,983
+RDG_networks/generate_line_network.py,sha256=F8p7AFS0vYQEfTdTtTMhP0yK92VFq3FakaSte6K5AOw,1139
+RDG_networks/generate_line_segments.py,sha256=j5IuC49ms_0GBiCx8bBK8KeO4XM8CYIylztrLf5RgjU,9002
+RDG_networks/get_intersection_segments.py,sha256=T9a8UGxcSSglJNt7k5BzAHmDCTvo-D5E75sqOyZNstE,2751
+RDG_networks/sample_in_polygon.py,sha256=qpPpW-Da1vK8ZkVWMJ0zBsE8IgyMB619gCdybSkzKSQ,1605
+RDG_Networks-0.1.4.dist-info/LICENSE.txt,sha256=Zlv8517YKFuHaaqksoTKeIiQBl9DGxhUdb_0kJg0NOE,1066
+RDG_Networks-0.1.4.dist-info/METADATA,sha256=Zj-Za9uEKTgbUPX0xVvLMHsCR6vGWMasZreiqc3Knv8,1756
+RDG_Networks-0.1.4.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+RDG_Networks-0.1.4.dist-info/entry_points.txt,sha256=4LC5qJH7VKpjuuhDR3HpJulO4qy9K5UlAUOGBg6ctxA,268
+RDG_Networks-0.1.4.dist-info/top_level.txt,sha256=4gUUYafD5Al9V8ZSiViVGYHpRMMCsCBcGgCNodk9Syg,13
+RDG_Networks-0.1.4.dist-info/RECORD,,

RDG_networks/draw_segments.py

@@ -1,7 +1,7 @@
 import matplotlib.pyplot as plt
 from typing import List, Optional
 
-from RDG_networks.Classes import LineSegment
+from Classes import LineSegment
 
 def draw_segments(segments: List[LineSegment], fig: Optional[plt.Figure] = None, ax: Optional[plt.Axes] = None) -> None:
     """

RDG_networks/generate_line_segments.py

@@ -4,8 +4,8 @@ import numpy as np
 import random
 from typing import List, Tuple, Union
 
-from RDG_networks.Classes import Line, LineSegment, Polygon
-from RDG_networks.sample_in_polygon import sample_in_polygon
+from Classes import Line, LineSegment, Polygon
+from sample_in_polygon import sample_in_polygon
     
 def doLinesIntersect(line1: Line, line2: Line) -> Tuple[bool, Union[Tuple[float, float], None]]:
     """
@@ -62,20 +62,20 @@ def get_vertices(vertices, index_begin, index_end, vertex_begin, vertex_end):
     
     return vertices1, vertices2
 
-def update_polygon_arr(polygon_id, polygon_arr, neighbor1, neighbor2, vertex_begin, vertex_end, id):
+def update_polygon_arr(polygon_id, polygon_arr, neighbor1, neighbor2, vertex_begin, vertex_end):
     
     vertices=polygon_arr[polygon_id]['vertices']
     cycle = polygon_arr[polygon_id]['faces']
     index_begin, index_end = (cycle.index(neighbor1), cycle.index(neighbor2))
     
-    cycle1, cycle2 = get_cyles(cycle=cycle, segment_new_id=id, neighbor1=neighbor1, neighbor2=neighbor2, index_begin=index_begin, index_end=index_end)
+    cycle1, cycle2 = get_cyles(cycle=cycle, segment_new_id=str(len(polygon_arr)), neighbor1=neighbor1, neighbor2=neighbor2, index_begin=index_begin, index_end=index_end)
     vertices1, vertices2 = get_vertices(vertices, index_begin, index_end, vertex_begin, vertex_end)
 
     polygon1 = Polygon(vertices=vertices1)
     area1 = polygon1.area()
     area2 = polygon_arr[polygon_id]['area'] - area1
     
-    polygon_new_1 = { id: { 'vertices': vertices1, 'area': area1, 'faces': cycle1[:-1] } }
+    polygon_new_1 = { f'p{len(polygon_arr)+1}': { 'vertices': vertices1, 'area': area1, 'faces': cycle1[:-1] } }
     polygon_new_2 = { polygon_id: { 'vertices': vertices2, 'area': area2, 'faces': cycle2[:-1] } }
 
     polygon_arr.update(polygon_new_1)
@@ -103,8 +103,9 @@ def add_line_segment(segments_dict, polygon_arr, angles='uniform') -> Tuple[List
 
     Returns:
     - Updated line_segments list.
-    """
+    """    
     polygon_id, polygon = pick_item_with_probability(polygon_arr)
+    
     line_segments_to_check = [segments_dict[segment] for segment in polygon['faces']]
     
     location_new = sample_in_polygon(polygon['vertices'])
@@ -160,12 +161,13 @@ def add_line_segment(segments_dict, polygon_arr, angles='uniform') -> Tuple[List
         intersections_f = [intersection for intersection in intersection_points if intersection["point"][1] > line_new.location[1]]
 
     # Determine correct segment length
-    id = str(len(polygon_arr)+1)
+    id = str(len(segments_dict)-3)
+
     start = min(intersections_b, key=lambda x: x["segment_length"])
     end = min(intersections_f, key=lambda x: x["segment_length"])
     
     # Add new segment object with corresponding neighbors
-    neighbors_initial = {}  
+    neighbors_initial = {}
     neighbors_initial[start["id"]] = start["point"]
     neighbors_initial[end["id"]] = end["point"]
     segment_new = LineSegment(start=start["point"], end=end["point"], id=id, neighbors_initial=neighbors_initial, neighbors=neighbors_initial)
@@ -177,8 +179,8 @@ def add_line_segment(segments_dict, polygon_arr, angles='uniform') -> Tuple[List
     
     vertex_begin = start["point"]
     vertex_end = end["point"]
-    polygon_arr = update_polygon_arr(polygon_id=polygon_id, polygon_arr=polygon_arr, neighbor1=start["id"], neighbor2=end["id"], vertex_begin=vertex_begin, vertex_end=vertex_end, id=id)
-
+    polygon_arr = update_polygon_arr(polygon_id=polygon_id, polygon_arr=polygon_arr, neighbor1=start["id"], neighbor2=end["id"], vertex_begin=vertex_begin, vertex_end=vertex_end)
+    
     return segments_dict, polygon_arr
 
 def generate_line_segments(size: int, angles='uniform') -> Tuple[nx.Graph, List[LineSegment]]:
@@ -198,7 +200,7 @@ def generate_line_segments(size: int, angles='uniform') -> Tuple[nx.Graph, List[
         LineSegment((1, 1), (1, 0), id='b4', neighbors_initial={'b1': (1, 0), 'b3': (1, 1)}, neighbors={'b1': (1, 0), 'b3': (1, 1)})
     ]
     
-    polygon_arr = { '1': { 'vertices': [(0,0), (0,1), (1,1), (1,0)], 'area': 1, 'faces': [ 'b1', 'b2', 'b3', 'b4' ] } }
+    polygon_arr = { 'p1': { 'vertices': [(0,0), (0,1), (1,1), (1,0)], 'area': 1, 'faces': [ 'b1', 'b2', 'b3', 'b4' ] } }
     
     segments = borders
     segments_dict = {segment.id: segment for segment in segments}

RDG_networks/get_intersection_segments.py

@@ -1,7 +1,7 @@
 import numpy as np
 from typing import List, Tuple
 
-from RDG_networks.Classes import LineSegment
+from Classes import LineSegment
 
 def order_points(points: List[Tuple[float, float]], segment_start: Tuple[float, float]) -> List[Tuple[float, float]]:
     """
@@ -31,8 +31,16 @@ def get_intersection_segments(line_segments: List[LineSegment]) -> List[LineSegm
     """
     intersection_points = {segment.id: [] for segment in line_segments}
 
+    intersection_points['b1'] = [(1, 0), (0, 0)] 
+    intersection_points['b2'] = [(0, 1), (0, 0)] 
+    intersection_points['b3'] = [(0, 1), (1, 1)] 
+    intersection_points['b4'] = [(1, 1), (1, 0)] 
+
     # Add all segments minus the borders
     for index, segment in enumerate(line_segments):
+        if segment.id in ['b1', 'b2', 'b3', 'b4']:
+            continue
+
         neighbors_initial = segment.neighbors_initial
 
         # Add segment start and end points to intersection points
@@ -46,7 +54,9 @@ def get_intersection_segments(line_segments: List[LineSegment]) -> List[LineSegm
     # Order intersection points
     ordered_intersection_points = {}
     for segment_id, points in intersection_points.items():
+        
         ordered_points = order_points(points, points[0])
+ 
         ordered_intersection_points[segment_id] = ordered_points
 
     # Generate intersection segments
@@ -62,4 +72,4 @@ def get_intersection_segments(line_segments: List[LineSegment]) -> List[LineSegm
             intersection_segments.append(segment_new)
             i += 1
 
-    return intersection_segments
+    return intersection_segments

RDG_Networks-0.1.2.dist-info/RECORD

@@ -1,13 +0,0 @@
-RDG_networks/Classes.py,sha256=_9X3JPHFAYYlaC8IZ_H9__sfz99G5l9UfPl65lL60_4,7977
-RDG_networks/__init__.py,sha256=lbEZ5NwKERxQ4oLXTxWoe8q8f6c_iSx4ZQXDwgx_OP4,759
-RDG_networks/draw_segments.py,sha256=ZHTQtu7szm4M3PWDRJa5WCetDN1yNQem9C0l8xfaTr8,996
-RDG_networks/generate_line_network.py,sha256=F8p7AFS0vYQEfTdTtTMhP0yK92VFq3FakaSte6K5AOw,1139
-RDG_networks/generate_line_segments.py,sha256=ocC5vRRzB8LNsFnKL_2n1imUH1xD2cewoDXy4N-Mp7w,8983
-RDG_networks/get_intersection_segments.py,sha256=hYul5dS5eHglRVfb47FQF3k2UWHG5nnTkbnO_1aJ1eI,2480
-RDG_networks/sample_in_polygon.py,sha256=qpPpW-Da1vK8ZkVWMJ0zBsE8IgyMB619gCdybSkzKSQ,1605
-RDG_Networks-0.1.2.dist-info/LICENSE.txt,sha256=Zlv8517YKFuHaaqksoTKeIiQBl9DGxhUdb_0kJg0NOE,1066
-RDG_Networks-0.1.2.dist-info/METADATA,sha256=g_GmYl15EImvDNk_Khf3aBkoiStZJFm6L8AmQvU67l4,1756
-RDG_Networks-0.1.2.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-RDG_Networks-0.1.2.dist-info/entry_points.txt,sha256=4LC5qJH7VKpjuuhDR3HpJulO4qy9K5UlAUOGBg6ctxA,268
-RDG_Networks-0.1.2.dist-info/top_level.txt,sha256=4gUUYafD5Al9V8ZSiViVGYHpRMMCsCBcGgCNodk9Syg,13
-RDG_Networks-0.1.2.dist-info/RECORD,,