Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
a76005c
Add NetworkModelResult and supporting classes for network data handling
jpalm3r Feb 18, 2026
e4d9362
Simplify parsing logic
jpalm3r Feb 18, 2026
d0c0f92
feat: Add NetworkModelResult for handling network data in model skill
jpalm3r Feb 19, 2026
91d4513
small fixes
jpalm3r Feb 19, 2026
3d7df6c
feat: Add NodeModelResult and NodeObservation for network node handling
jpalm3r Feb 19, 2026
1fc1ecf
feat: Add extract_multiple method for batch extraction of NodeModelRe…
jpalm3r Feb 19, 2026
35882ab
feat: Enhance matching functionality to support NodeModelResult and N…
jpalm3r Feb 19, 2026
5a692ef
feat: Update matching logic to extract observations from NetworkModel…
jpalm3r Feb 19, 2026
e15ae63
feat: Add NetworkObservation class for handling collections of node o…
jpalm3r Feb 19, 2026
1219a51
Fix test
jpalm3r Feb 19, 2026
98f8a80
Importing network test data
jpalm3r Feb 19, 2026
91daa72
feat: Update observation handling to include NodeObservation and adju…
jpalm3r Feb 20, 2026
26a6d45
feat: Simplify node retrieval in NodeModelResult and enhance coordina…
jpalm3r Feb 20, 2026
89d4925
feat: Enhance time coordinate handling in NetworkModelResult and impr…
jpalm3r Feb 20, 2026
caeee13
feat: Refactor observation handling to support network geometry and s…
jpalm3r Feb 20, 2026
c8c3ebd
refactor: Simplify node retrieval in NodeObservation by removing unne…
jpalm3r Feb 20, 2026
f826ea5
Update src/modelskill/matching.py
jpalm3r Feb 20, 2026
87e1335
commit with errors
jpalm3r Feb 20, 2026
a4476ad
Fix mypy issues. Introduce Nework1D protocol
jpalm3r Feb 20, 2026
0966458
Removing NetworkObservation
jpalm3r Feb 20, 2026
4e5cd78
refactor: streamline NetworkModelResult extraction method by removing…
jpalm3r Feb 20, 2026
0f5af4d
refactor: simplify observation matching logic in _match_single_obs fu…
jpalm3r Feb 20, 2026
d32e337
fix: add assertion message for non-empty datetime indices in _get_glo…
jpalm3r Feb 20, 2026
636bc0f
test: add unit tests for NetworkModelResult and NodeObservation classes
jpalm3r Feb 20, 2026
6bfa6bc
refactor: update notebook to use new network dataset and remove obsol…
jpalm3r Feb 20, 2026
f91a4df
Rename notebook
jpalm3r Feb 20, 2026
e42c69e
Enhance NodeObservation to support multiple nodes and auto-assign items
jpalm3r Feb 20, 2026
4cc16bf
Create MultiNodeObservation
jpalm3r Feb 23, 2026
dd91c65
refactor: streamline MultiNodeObservation initialization and enhance …
jpalm3r Feb 23, 2026
6298695
Add basic tests
jpalm3r Feb 23, 2026
902551b
feat: add validation function for network data and enhance NetworkTyp…
jpalm3r Feb 23, 2026
12e7176
Include dataset validation and transformation
jpalm3r Feb 23, 2026
4621f8b
nb run
jpalm3r Feb 23, 2026
c77e86c
Add aux_item in NetworkModelResult
jpalm3r Feb 23, 2026
197e01f
merge latest changes
jpalm3r Feb 23, 2026
3cd7404
Removing obsolete tests
jpalm3r Feb 23, 2026
ce65da7
merging latest changes
jpalm3r Feb 23, 2026
eb57ed2
feat: enhance NodeObservation and TimeSeries classes with Self type h…
jpalm3r Feb 24, 2026
6e4fc6b
Improting Self from typing_extension
jpalm3r Feb 24, 2026
4bded79
fix: correct typo in FieldTypes definition in matching.py
jpalm3r Feb 24, 2026
4fd5888
feat: add Self type hint and instance creation method to NodeModelResult
jpalm3r Feb 24, 2026
45e21fa
fix: remove NodeModelResult from Timeseries documentation
jpalm3r Feb 24, 2026
8d7c66d
Improving ValueError message
jpalm3r Feb 24, 2026
75a5db8
fix test valueerror message
jpalm3r Feb 24, 2026
2606a27
refactor: replace NETWORK geometry type with NODE in relevant modules
jpalm3r Feb 24, 2026
7b55d95
feat: handle NODE geometry type in TimeSeries class for data conversion
jpalm3r Feb 24, 2026
c1b505c
typo
jpalm3r Feb 24, 2026
ac09177
Removing some Optional statements
jpalm3r Feb 24, 2026
ad757a5
Replacing All Optional[...] statements
jpalm3r Feb 24, 2026
c023fb1
unused import
jpalm3r Feb 24, 2026
b124569
Replace assert by if... raise ValueError()
jpalm3r Feb 24, 2026
3deeeac
Updating obsolete tests
jpalm3r Feb 24, 2026
ac0da42
Refactor time series alignment: move align_data and helper functions …
jpalm3r Feb 24, 2026
1a98701
Simplifying tests.
jpalm3r Feb 24, 2026
8c48d5d
Refactor type hints: replace Optional with union types for improved c…
jpalm3r Feb 24, 2026
8ec880d
leftovers
jpalm3r Feb 24, 2026
769f1e2
Fix mypy error
jpalm3r Feb 24, 2026
8f47b36
Remove obsolete test
jpalm3r Feb 24, 2026
a01c696
Remove redundant check
jpalm3r Feb 24, 2026
3a4deca
Correct type.
jpalm3r Feb 24, 2026
3090bf1
Remove legacy Geometry.Network instances
jpalm3r Feb 25, 2026
f49d955
Newer tests for matching network results
jpalm3r Feb 25, 2026
82e50f2
Adding test for wrong matching
jpalm3r Feb 25, 2026
f65c833
Typo
jpalm3r Feb 25, 2026
1ae8fdc
Merge changes after round of review
jpalm3r Feb 25, 2026
5e82a12
Fix network validation
jpalm3r Feb 25, 2026
1455362
remove empty step in notebook
jpalm3r Feb 25, 2026
ca0b332
Remove empty cell
jpalm3r Feb 25, 2026
82a619b
Fix tests
jpalm3r Feb 25, 2026
79f6cf3
merging latest changes
jpalm3r Feb 25, 2026
f169f83
Include new tests for init of network
jpalm3r Feb 25, 2026
baaa4db
Fix test
jpalm3r Feb 25, 2026
467989e
remove detailed docstring
jpalm3r Feb 26, 2026
80f50b8
Including mapping as nodes argument
jpalm3r Feb 26, 2026
140ae33
Make MultiNodeObservation a Collection
jpalm3r Feb 26, 2026
eb49cc9
fix contains from MultiNodeObservation
jpalm3r Feb 26, 2026
3a64c37
improve notebook
jpalm3r Feb 26, 2026
e366942
Replace MultiNodeObservation by classmethod
jpalm3r Feb 26, 2026
3070b07
Remove unused import
jpalm3r Feb 27, 2026
4d130a5
Replace MultiNodeObservation for class method in NodeObservation
jpalm3r Feb 27, 2026
bf0296a
Save new nb
jpalm3r Feb 27, 2026
2aaee29
Merging latest changes
jpalm3r Feb 27, 2026
aa03ae9
commit nb
jpalm3r Feb 27, 2026
ceac146
Include csv to read a point
jpalm3r Feb 27, 2026
f11fb31
Refactor NodeObservation.from_multiple to handle optional data and im…
jpalm3r Feb 27, 2026
8f0dc68
Improving notebook and comitting test sensor data
jpalm3r Feb 27, 2026
369ba44
Including overload
jpalm3r Feb 27, 2026
aba3c59
comment out script for saving test data
jpalm3r Feb 27, 2026
9c054f2
Including new tests
jpalm3r Feb 27, 2026
95c41aa
Include csv to read a point
jpalm3r Feb 27, 2026
443b584
Refactor NodeObservation.from_multiple to handle optional data and im…
jpalm3r Feb 27, 2026
0b4bd07
Including new tests
jpalm3r Feb 27, 2026
6104e77
Merge pull request #588 from DHI/japr/multinodeobs
jpalm3r Feb 27, 2026
42442f9
fix mypy issues
jpalm3r Feb 27, 2026
75ad5e1
Merge pull request #593 from DHI/japr/netowrk-support-mypy-fix
jpalm3r Mar 2, 2026
2434dff
Refactor network and base modules: remove NodeObservation import and …
jpalm3r Mar 2, 2026
080267d
Introduce adapters module
jpalm3r Mar 2, 2026
c253a33
Refactor network module: change NetworkNode, EdgeBreakPoint, and Netw…
jpalm3r Mar 2, 2026
ed999b5
Refactor to_dataset for efficiency
jpalm3r Mar 2, 2026
008c240
Include overloads for type consistency
jpalm3r Mar 2, 2026
6cecf4d
Fix type conversion for _Res1D instantiation by converting Path to st…
jpalm3r Mar 2, 2026
dd1e3a8
Add BasicNode and BasicEdge classes for programmatic network construc…
jpalm3r Mar 2, 2026
c1ac25a
Merge branch 'japr/network-support' into japr/network-protocol
jpalm3r Mar 2, 2026
c714aa0
Fix notebook
jpalm3r Mar 2, 2026
204eceb
Expand nb
jpalm3r Mar 2, 2026
72fc80e
Adding networks dependency group
jpalm3r Mar 3, 2026
6ea9c0a
Include dosctrings
jpalm3r Mar 3, 2026
061cb14
Improving notebook documentation
jpalm3r Mar 4, 2026
50c4eff
Improved notebook documentation
jpalm3r Mar 4, 2026
ae9d6a2
documentation
jpalm3r Mar 4, 2026
b5e9fa0
Remove list signature from NodeObservation.from_multiple()
jpalm3r Mar 4, 2026
3f6399c
recall docstring tweak
jpalm3r Mar 5, 2026
952620c
res1d mapping infographic
jpalm3r Mar 5, 2026
03db9b7
fixing node 7 -> 6
jpalm3r Mar 6, 2026
87f8caf
Merge pull request #589 from DHI/japr/network-protocol
jpalm3r Mar 6, 2026
8e22bee
network docs draft
jpalm3r Mar 6, 2026
179dac9
add networks to sidebar
jpalm3r Mar 6, 2026
c7fa963
Mypy issues: Refactor type annotations for breakpoints and edges in R…
jpalm3r Mar 6, 2026
8ecc1c1
Merge pull request #602 from DHI/japr/mypy-issues
jpalm3r Mar 6, 2026
4c813b7
Refactoring for solving soft dependencies
jpalm3r Mar 6, 2026
08258d0
Refactor imports and update type checks for NetworkModelResult
jpalm3r Mar 17, 2026
3765264
delete copilot context
jpalm3r Mar 17, 2026
5ad7b33
add network as optional dpeendency for pip users
jpalm3r Mar 17, 2026
d484b86
Added installation section. Fixed imports.
jpalm3r Mar 17, 2026
7c95c04
Merge branch 'japr/network-dependencies' into japr/network-docs
jpalm3r Mar 17, 2026
48515d1
Reorganize network documentation: update dependency installation sect…
jpalm3r Mar 17, 2026
76372bb
Update documentation workflow to include 'networks' group in dependen…
jpalm3r Mar 17, 2026
30b7fc8
Add Res1D network mapping image and enhance network documentation
jpalm3r Mar 17, 2026
e6e2ce0
Adding Extensions to sidebar
jpalm3r Mar 17, 2026
43f0d4d
Addressing review comments.
jpalm3r Mar 18, 2026
3ff2105
merging latest changes
jpalm3r Mar 18, 2026
e4a2150
installing networks dev group in ci for tests
jpalm3r Mar 18, 2026
fe7486d
Import fix
jpalm3r Mar 18, 2026
b43429c
merge minor fixes
jpalm3r Mar 18, 2026
618bd47
Adding repr to network
jpalm3r Mar 18, 2026
baca62a
Cleaning network docs
jpalm3r Mar 18, 2026
80e7d91
fix nb imports
jpalm3r Mar 18, 2026
60a5412
Rearrange networks documentation
jpalm3r Mar 18, 2026
f3d8fcd
print network repr
jpalm3r Mar 18, 2026
a3f98dc
minor rewrite
jpalm3r Mar 18, 2026
10b89b7
remove unnecessary print
jpalm3r Mar 18, 2026
aecf24c
Adding new classes to api docs
jpalm3r Mar 19, 2026
5de4344
Include api documentation
Mar 19, 2026
0d23d25
Install network dependencies to test notebooks
Mar 19, 2026
e053c94
Merge branch 'main' into japr/network-support
jpalm3r Mar 19, 2026
dc60e23
Merge branch 'japr/network-support' into japr/network-docs
jpalm3r Mar 19, 2026
c6ed04a
Merge pull request #619 from DHI/japr/network-docs
jpalm3r Mar 19, 2026
be6f200
running nb
Mar 20, 2026
2b3fae9
dummy commit
jpalm3r Mar 20, 2026
aa5e9e9
Add build-no-networks job to GitHub Actions and ensure networkx is im…
jpalm3r Mar 24, 2026
3b6a6e3
Potential fix for pull request finding 'Statement has no effect'
jpalm3r Mar 24, 2026
dea9138
Potential fix for pull request finding 'Statement has no effect'
jpalm3r Mar 24, 2026
b2fd40b
Potential fix for pull request finding 'Statement has no effect'
jpalm3r Mar 24, 2026
2c39179
Implement basic network creation function and update tests to use it
jpalm3r Mar 24, 2026
cc02c99
Merge branch 'japr/network-support' of https://github.com/DHI/modelsk…
jpalm3r Mar 24, 2026
ee25d72
Removing cell with error
jpalm3r Mar 25, 2026
1d032cf
changing version to alpha release 1.4.0a1
jpalm3r Mar 25, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
version: "1.8.27"

- name: Install dependencies
run: uv sync --group dev --group docs

run: uv sync --group dev --group docs --group networks
- name: Build documentation
run: just docs

Expand Down
22 changes: 21 additions & 1 deletion .github/workflows/full_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,30 @@
enable-cache: true

- name: Install dependencies
run: uv sync --group test --no-dev
run: uv sync --group test --group networks --no-dev

- name: Type check
run: just typecheck

- name: Test
run: just test

build-no-networks:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- uses: extractions/setup-just@v3

- name: Set up uv
uses: astral-sh/setup-uv@v6
with:
python-version: "3.10"
enable-cache: true

- name: Install dependencies (without networks)
run: uv sync --group test --no-dev

- name: Test
run: just test
2 changes: 1 addition & 1 deletion .github/workflows/notebooks_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
python-version: "3.14"
enable-cache: true
- name: Install dependencies
run: uv sync --group test --group notebooks --no-dev
run: uv sync --group test --group notebooks --group networks --no-dev
- name: Test notebooks
run: |
uv run pytest tests/notebooks/
7 changes: 7 additions & 0 deletions docs/_quarto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ website:
- user-guide/selecting-data.qmd
- user-guide/plotting.qmd
- user-guide/statistics.qmd
- section: "Extensions"
contents:
- user-guide/network.qmd

- title: "Examples"
contents:
Expand Down Expand Up @@ -78,6 +81,7 @@ website:
- api/observation.qmd
- api/PointObservation.qmd
- api/TrackObservation.qmd
- api/NodeObservation.qmd
- section: "Model Result"
href: api/model.qmd
contents:
Expand All @@ -87,6 +91,7 @@ website:
- api/DfsuModelResult.qmd
- api/GridModelResult.qmd
- api/DummyModelResult.qmd
- api/NetworkModelResult.qmd
- section: "Matching"
contents:
- api/match.qmd
Expand Down Expand Up @@ -164,6 +169,7 @@ quartodoc:
- observation
- PointObservation
- TrackObservation
- NodeObservation
- title: Model Result
desc: ""
contents:
Expand All @@ -175,6 +181,7 @@ quartodoc:
- DfsuModelResult
- GridModelResult
- DummyModelResult
- NetworkModelResult
- title: Matching
desc: Matching functions
contents:
Expand Down
Binary file added docs/images/res1d_network_mapping.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading