RDG-Networks 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl

{RDG_Networks-0.2.3.dist-info → RDG_Networks-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RDG-Networks
-Version: 0.2.3
+Version: 0.2.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.2.3.dist-info → RDG_Networks-0.2.4.dist-info}/RECORD

@@ -3,12 +3,12 @@ RDG_networks/__init__.py,sha256=aCfGs87cJn0Tp5GqTpFXPOEfJPpR4Tnnz819Kk_0t84,661
 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
-RDG_networks/generate_line_segments_dynamic.py,sha256=hAdqjyNgkEUnm7CprSKeEu7yCbvFBY2OHnkB_smubuA,7438
+RDG_networks/generate_line_segments_dynamic.py,sha256=GoIhGXYbcvjqR5BJCnkvAGp8QBpzsE1ZSbl2k9XAOGI,7531
 RDG_networks/get_intersection_segments.py,sha256=mXB5qCy1oOps4Vu1mX6flW6v_4Xxc71YK41yOWjJX8o,2797
 RDG_networks/sample_in_polygon.py,sha256=qpPpW-Da1vK8ZkVWMJ0zBsE8IgyMB619gCdybSkzKSQ,1605
-RDG_Networks-0.2.3.dist-info/LICENSE.txt,sha256=BHUkX2GsdTr30sKmVZ1MLGR1njnx17EX_oUuuSVZZPE,598
-RDG_Networks-0.2.3.dist-info/METADATA,sha256=oU7JLuH6AAby1lALPMtF-YzJ4nA81KeR3ww04YAgT4k,2422
-RDG_Networks-0.2.3.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-RDG_Networks-0.2.3.dist-info/entry_points.txt,sha256=Htsh9jRabMCGHwXayUwZoSy-9IFGFrMB1X9hgyyr3_8,350
-RDG_Networks-0.2.3.dist-info/top_level.txt,sha256=4gUUYafD5Al9V8ZSiViVGYHpRMMCsCBcGgCNodk9Syg,13
-RDG_Networks-0.2.3.dist-info/RECORD,,
+RDG_Networks-0.2.4.dist-info/LICENSE.txt,sha256=BHUkX2GsdTr30sKmVZ1MLGR1njnx17EX_oUuuSVZZPE,598
+RDG_Networks-0.2.4.dist-info/METADATA,sha256=UAxR8eK6DyBT3B1C1O9chrCUnYpWfhh7YcytLETtYMc,2422
+RDG_Networks-0.2.4.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+RDG_Networks-0.2.4.dist-info/entry_points.txt,sha256=Htsh9jRabMCGHwXayUwZoSy-9IFGFrMB1X9hgyyr3_8,350
+RDG_Networks-0.2.4.dist-info/top_level.txt,sha256=4gUUYafD5Al9V8ZSiViVGYHpRMMCsCBcGgCNodk9Syg,13
+RDG_Networks-0.2.4.dist-info/RECORD,,

RDG_networks/generate_line_segments_dynamic.py

@@ -2,6 +2,7 @@ import numpy as np
 import random
 from shapely.geometry import LineString
 from typing import List, Dict, Any, Tuple
+import matplotlib.pyplot as plt
 
 from .Classes import LineSegment
 
@@ -88,7 +89,7 @@ def update_for_border_intersections(lines: List[Dict[str, Any]]) -> List[Dict[st
             
     return lines
 
-def check_and_update_when_intersect(lines: List[Dict[str, Any]], epsilon: float) -> List[Dict[str, Any]]:
+def check_and_update_when_intersect(lines: List[Dict[str, Any]], epsilon: float, dt: float) -> List[Dict[str, Any]]:
     """
     Check for intersections between lines and update their properties accordingly.
 
@@ -99,36 +100,37 @@ def check_and_update_when_intersect(lines: List[Dict[str, Any]], epsilon: float)
     Returns:
         List[Dict[str, Any]]: The updated list of lines after handling intersections.
     """
+        
     for index1, j1 in enumerate(lines):
         for index2, j2 in enumerate(lines):
             if j1['id'][:-2] == j2['id'][:-2] or index2 < index1:
                 continue
-                
+            
             if j1['growth_status'] == False and j2['growth_status'] == False:
                 continue
-                
+            
             line1 = LineString([j1['start'], j1['end']])
             line2 = LineString([j2['start'], j2['end']])
-
+            
             intersection_pt = line1.intersection(line2)
 
             if not intersection_pt.is_empty:
                 d1 = np.linalg.norm(np.array(j1['start']) - np.array([intersection_pt.x, intersection_pt.y]))
                 d2 = np.linalg.norm(np.array(j2['start']) - np.array([intersection_pt.x, intersection_pt.y]))
                 
-                arrival_1 = j1['introduction_time'] + d1 / epsilon
-                arrival_2 = j2['introduction_time'] + d2 / epsilon
+                arrival_1 = j1['introduction_time'] + d1 / epsilon * dt
+                arrival_2 = j2['introduction_time'] + d2 / epsilon * dt
 
                 if arrival_1 > arrival_2:
                     lines[index1]['end'] = (intersection_pt.x, intersection_pt.y)
                     lines[index1]['neighbors_initial'] = lines[index1]['neighbors_initial'] + [j2['id'][:-2]]
-                    lines[index1]['growth_status'] = False
+                    lines[index1]['growth_status'] = False                    
 
                 else:                        
                     lines[index2]['end'] = (intersection_pt.x, intersection_pt.y)
                     lines[index2]['neighbors_initial'] = lines[index2]['neighbors_initial'] + [j1['id'][:-2]]
                     lines[index2]['growth_status'] = False
-                    
+
     return lines
 
 def transform_to_standard_lines(lines: List[Dict[str, Any]]) -> List[LineSegment]:
@@ -173,7 +175,7 @@ def generate_line_segments_dynamic(size: int, dt: float, epsilon: float, time: f
     """
     lines = []
     line_id, t, t_total = 1, 0, 0
-
+    
     # Stop loop whenever we have enough lines and all lines have stopped growing
     while len(lines) / 2 < size or np.any([item['growth_status'] for item in lines]):
 
@@ -185,17 +187,18 @@ def generate_line_segments_dynamic(size: int, dt: float, epsilon: float, time: f
             if time == 0:
                 number_of_lines_to_add = size
             else:
-                number_of_lines_to_add = int(t - (t % time))
+                number_of_lines_to_add = int(t / time)
+                
             for _ in range(number_of_lines_to_add):
                 lines = add_new_line(lines, line_id, t_total, angles=angles)
                 line_id += 1
-            
-                t = 0
+                
+            t = 0
 
         lines = grow_lines(lines, epsilon)
         lines = update_for_border_intersections(lines)
-        lines = check_and_update_when_intersect(lines, epsilon)
-
+        lines = check_and_update_when_intersect(lines, epsilon, dt)
+        
     lines = transform_to_standard_lines(lines)
         
     return lines