Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenCLSim Demo Notebooks #130

Draft
wants to merge 104 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
a554532
make openclsim moving compatible with opentnsim moving, use opentnsim…
Dec 29, 2022
a42d4a3
Example with a depth varying path
markvankoningsveld Jan 10, 2023
c32edbe
Merge branch 'master' into feature/opentnsim-openclsim-demo-notebooks
Feb 3, 2023
8cbbc00
add networkx module
Feb 3, 2023
02bf885
Merge branch 'feature/opentnsim-openclsim-demo-notebooks' of github.c…
Feb 3, 2023
0cd9a79
flake8
Feb 3, 2023
e013f98
fix typo in attribute name, flake8
Feb 3, 2023
5acce42
implement separation between moving over geometries and moving over n…
Feb 3, 2023
9418763
rename
Feb 13, 2023
987aadb
missing dep
Feb 13, 2023
e06e1b3
notebook for opentnsim + openclsim with opentnsim moving and openclsi…
Feb 17, 2023
5538cde
add demo of dredging with routing
Feb 22, 2023
6fb89fc
Create priority.py
arashsepehri Feb 28, 2023
7faf979
Merge branch 'feature/opentnsim-openclsim-demo-notebooks' of https://…
arashsepehri Feb 28, 2023
a102c29
add opentnsim compatible log entry functions
Feb 28, 2023
6203ab8
Merge branch 'feature/opentnsim-openclsim-demo-notebooks' of github.c…
Feb 28, 2023
0994eaa
extra asserts for openclsim/opentnsim compatibility
Feb 28, 2023
32b6a33
make openclsim moving compatible with opentnsim moving, use opentnsim…
Dec 29, 2022
c6ef440
add networkx module
Feb 3, 2023
ec30e46
flake8
Feb 3, 2023
594b19e
fix typo in attribute name, flake8
Feb 3, 2023
3df890b
implement separation between moving over geometries and moving over n…
Feb 3, 2023
b550284
rename
Feb 13, 2023
74a7341
missing dep
Feb 13, 2023
d145eb3
notebook for opentnsim + openclsim with opentnsim moving and openclsi…
Feb 17, 2023
789fc73
add demo of dredging with routing
Feb 22, 2023
647166f
add opentnsim compatible log entry functions
Feb 28, 2023
8c429de
extra asserts for openclsim/opentnsim compatibility
Feb 28, 2023
177b725
source of module, multiple with same name
Mar 6, 2023
f650146
make log modules of opentnsim and openclsim compatible, warn if incon…
Mar 6, 2023
e1e8503
test with opentnsim + openclsim logging
Mar 6, 2023
2da47cb
remove self assignment
Mar 6, 2023
138300a
rename function
Mar 6, 2023
438cf8d
default engine order, full power
Mar 6, 2023
6c03b6f
remove duplicated code
Mar 6, 2023
e1625ee
code issues in movable
Mar 6, 2023
6726e29
line length
Mar 8, 2023
a08e274
fix unit tests for movable
Mar 8, 2023
cef5306
fix while activity tests
Mar 8, 2023
0dc1013
support empty logs
Mar 8, 2023
a54dd9a
formatting
Mar 8, 2023
8954390
fixing flake/black/isort
Mar 8, 2023
912584d
flake / black / isort
Mar 8, 2023
9a83f85
Merge branch 'master' into feature/opentnsim-openclsim-connection
Mar 8, 2023
410df00
Merging with latest feature/opentnsim-openclsim-connection, together …
Mar 9, 2023
e29c957
Complex example for interaction between seagoing vessels and dredging
arashsepehri Mar 9, 2023
886d393
Update __init__.py
arashsepehri Mar 13, 2023
ab17a57
Hopper Cutter Notebook
arashsepehri Apr 4, 2023
0f70a7b
Single Run with Priority
arashsepehri Apr 4, 2023
ac3c00c
Update Priority Mixin
arashsepehri Apr 5, 2023
b004b98
Update _init_.
arashsepehri Apr 5, 2023
7decccc
Update Notebook 35
arashsepehri Apr 11, 2023
eab07a5
update priority.py
arashsepehri Apr 17, 2023
4ab815e
update location.py
arashsepehri Apr 17, 2023
feab235
update notebook 35
arashsepehri Apr 18, 2023
196fc81
Add Indicator Module
arashsepehri Apr 25, 2023
76a86f4
update priority.py
arashsepehri Apr 25, 2023
94edc03
update __init__.py
arashsepehri Apr 25, 2023
e74a445
use shared registry, switch from directed to undirected graph, make t…
Apr 26, 2023
be26f71
Update indicators.py
arashsepehri May 3, 2023
0224df2
update init.py and indicators.py
arashsepehri May 8, 2023
c32937d
update priority.py
arashsepehri May 9, 2023
b8c2bb6
update __init__.py
arashsepehri May 9, 2023
d3222a7
add notebook 37
arashsepehri May 12, 2023
d4331cb
update __init__.py
arashsepehri May 12, 2023
3df69cd
update notebook 37
arashsepehri May 16, 2023
1481c1a
update priority.py
arashsepehri May 30, 2023
e4a9028
update priority.py and __init__.py
arashsepehri May 31, 2023
f3369f8
update some mixins
arashsepehri Jul 4, 2023
aa5a3cc
Notebook 38
Aug 10, 2023
f2ad8d0
Update notebook 33
Aug 10, 2023
2d2681e
Update access.py and __init__.py
Aug 21, 2023
4e868ed
update access.py and __initi__.py
Aug 23, 2023
72ccaad
update notebook 33
Aug 23, 2023
cf68b71
Update modules
Aug 31, 2023
857add5
add depth plugin from feature/depth_plugin branch
Aug 31, 2023
e9303c6
load plugins as module variables
Aug 31, 2023
e155b22
integrating depth plugin
Aug 31, 2023
04ad515
Add depth plugin parameters and some tidal window
Sep 4, 2023
3e24aad
update notebook 33
Sep 13, 2023
4eb3b40
Update Notebook 33
Sep 14, 2023
cc17110
update access
Sep 14, 2023
43a72aa
prepare layout for accessibility plugin
Sep 14, 2023
3b5db37
some updates
Sep 25, 2023
d04d6e7
update notebook 38
Sep 27, 2023
7faee26
updates on access.py and notebook 33
Oct 5, 2023
23ee691
implement sedimentation rate + wait for sedimentation
Oct 9, 2023
68361a8
adding excel files for Notebook 39
Oct 17, 2023
5b026a7
integrating notebook 33
Oct 18, 2023
b54d91c
Cleanups
Oct 19, 2023
589d722
add tidal window initial version
Feb 2, 2024
7d0190f
rename function
Feb 7, 2024
5f12f6c
Add WID Notebook
Apr 5, 2024
be14135
update
Apr 5, 2024
0be640d
add WID notebook
Apr 5, 2024
9865e9f
WID module
Apr 8, 2024
f5c43b7
updates WID
Apr 8, 2024
62186f9
update WID notebook
Apr 8, 2024
569ef58
Add exercise
Apr 22, 2024
8c25b34
backhoe barge notebook
Apr 23, 2024
75c0fcb
updates on tide criteria
May 7, 2024
2f8d8c5
Implement wait for tide
May 8, 2024
e05b93a
update notebook 40
Jun 5, 2024
ed2685f
Some updtes
arashsepehri Sep 9, 2024
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
Prev Previous commit
Next Next commit
fix typo in attribute name, flake8
  • Loading branch information
Fedor Baart committed Feb 3, 2023
commit e013f9862b07498b186fb6a0654ce773597189c9
9 changes: 7 additions & 2 deletions src/openclsim/core/movable.py
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ def v(self):
return self._v

@property
def currentspeed(self):
def current_speed(self):
warnings.warn(
"The property `.currentspeed` is deprected. Use `.v` instead.",
DeprecationWarning,
@@ -192,7 +192,12 @@ def pass_edge(self, origin: str, destination: str):
origin_geometry = self.env.graph.nodes[origin]["geometry"]
destination_geometry = self.env.graph.nodes[destination]["geometry"]
edge_geometry = edge["geometry"]
print("check if we need to reorder", edge_geometry, origin_geometry, destination_geometry)
print(
"check if we need to reorder",
edge_geometry,
origin_geometry,
destination_geometry,
)

for on_pass_edge_function in self.on_pass_edge_functions:
on_pass_edge_function(origin, destination)
2 changes: 1 addition & 1 deletion tests/test_basic_functions.py
Original file line number Diff line number Diff line change
@@ -94,7 +94,7 @@ def move_and_test(env, destination, movable, expected_speed, expected_time):
start = env.now
env.process(movable.move(destination))
env.run()
np.testing.assert_almost_equal(movable.current_speed, expected_speed)
np.testing.assert_almost_equal(movable.v, expected_speed)
assert movable.geometry.equals(destination.geometry)
hours_spent = (env.now - start) / 3600
np.testing.assert_almost_equal(hours_spent, expected_time, decimal=2)