Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
steps:
- uses: actions/checkout@v5
- name: Set up Python ${{ matrix.python-version }}
Expand Down
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,19 +139,18 @@ W = World(
)

# Define the scenario
## Create nodes
# Create nodes
W.addNode(name="orig1", x=0, y=0) #xy coords are for visualization
W.addNode(name="orig2", x=0, y=2)
W.addNode(name="merge", x=1, y=1)
W.addNode(name="dest", x=2, y=1)
## Create links between nodes
W.addLink(name="link1", start_node="orig1", end_node="merge",
length=1000, free_flow_speed=20, number_of_lanes=1)
W.addLink(name="link2", start_node="orig2", end_node="merge",
length=1000, free_flow_speed=20, number_of_lanes=1)
W.addLink(name="link3", start_node="merge", end_node="dest",
length=1000, free_flow_speed=20, number_of_lanes=1)
## Create OD traffic demand between nodes

# Create links between nodes
W.addLink(name="link1", start_node="orig1", end_node="merge", length=1000, free_flow_speed=20, number_of_lanes=1)
W.addLink(name="link2", start_node="orig2", end_node="merge", length=1000, free_flow_speed=20, number_of_lanes=1)
W.addLink(name="link3", start_node="merge", end_node="dest", length=1000, free_flow_speed=20, number_of_lanes=1)

# Create OD traffic demand between nodes
W.adddemand(orig="orig1", dest="dest", t_start=0, t_end=1000, flow=0.45)
W.adddemand(orig="orig2", dest="dest", t_start=400, t_end=1000, flow=0.6)

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies = [
"scipy>=1.9.1",
"pandas>=1.4.4",
"PyQt5>=5.15.7",
"dill>=0.3.8",
"dill>=0.3.9",
"networkx>=3.2.1"
]
dynamic = ["version"] # Version is read from uxsim/__init__.py
Expand Down
72 changes: 72 additions & 0 deletions tests/test_other_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from numpy import *
from uxsim import *
from uxsim.Utilities import *
import dill as pickle



Expand Down Expand Up @@ -275,6 +276,77 @@ def test_scenario_write_and_read_areas():

assert df1["total_travel_time"][0] == df2["total_travel_time"][0]


def test_world_save():
W = World(
name="pickle_test",
deltan=5,
tmax=1200,
print_mode=0, save_mode=0, show_mode=1,
random_seed=0
)

# Define the scenario

W.addNode(name="orig1", x=0, y=0)
W.addNode("orig2", 0, 2)
W.addNode("merge", 1, 1)
W.addNode("dest", 2, 1)

W.addLink(name="link1", start_node="orig1", end_node="merge", length=1000, free_flow_speed=20, number_of_lanes=1)
W.addLink("link2", "orig2", "merge", length=1000, free_flow_speed=20, number_of_lanes=1)
W.addLink("link3", "merge", "dest", length=1000, free_flow_speed=20, number_of_lanes=1)

W.adddemand(orig="orig1", dest="dest", t_start=0, t_end=1000, flow=0.45)
W.adddemand("orig2", "dest", 400, 1000, 0.6)

W.show_network()

W.save("test_pickle")

W2 = pickle.load(open("test_pickle.pkl", "rb"))

W2.exec_simulation()

W2.analyzer.print_simple_stats() #no print

W2.analyzer.network(t=500)

assert True

def test_world_copy():

W = World(
name="pickle_test",
deltan=5,
tmax=1200,
print_mode=0, save_mode=0, show_mode=1,
random_seed=0
)

W.addNode(name="orig1", x=0, y=0)
W.addNode("orig2", 0, 2)
W.addNode("merge", 1, 1)
W.addNode("dest", 2, 1)

W.addLink(name="link1", start_node="orig1", end_node="merge", length=1000, free_flow_speed=20, number_of_lanes=1)
W.addLink("link2", "orig2", "merge", length=1000, free_flow_speed=20, number_of_lanes=1)
W.addLink("link3", "merge", "dest", length=1000, free_flow_speed=20, number_of_lanes=1)

W.adddemand(orig="orig1", dest="dest", t_start=0, t_end=1000, flow=0.45)
W.adddemand("orig2", "dest", 400, 1000, 0.6)

W.show_network()

W2 = W.copy()

W2.exec_simulation()

W2.analyzer.print_simple_stats() #no print

W2.analyzer.network(t=500)


def test_k_shortest_path():
W = World(
name="", # Scenario name
Expand Down