From 9f21a46e1234f950bd72208cc9896513da308aab Mon Sep 17 00:00:00 2001 From: cjuli1 Date: Thu, 29 Jan 2026 12:06:05 +0100 Subject: [PATCH 1/7] fix change battery storage index to power horizon --- src/io.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/io.jl b/src/io.jl index d1e39a1..e40ba9b 100644 --- a/src/io.jl +++ b/src/io.jl @@ -1705,7 +1705,7 @@ function get_output_main_local() data["batnames"] = batterynames data["batmatrix"] = db.output.batterylevels - data["batindex"] = x2 + data["batindex"] = x1 data["statenames"] = db.output.statenames data["statematrix"] = permutedims(db.output.statematrix) From 7ffc764d3a73aec94af37ed7575d0717272363f4 Mon Sep 17 00:00:00 2001 From: Julien Cabrol <40186418+cjuli1@users.noreply.github.com> Date: Mon, 9 Feb 2026 16:39:36 +0100 Subject: [PATCH 2/7] Update Julia version and TuLiPa installation command Updated Julia version in testing matrix and modified package installation command. --- .github/workflows/testing.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 2f7759c..7655505 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -21,7 +21,7 @@ jobs: matrix: version: #- '1.0' - - '1.9' + - '1.10.3' #- 'nightly' os: - ubuntu-latest @@ -35,6 +35,6 @@ jobs: arch: ${{ matrix.arch }} - uses: julia-actions/cache@v1 - name: Install TuLiPa Package - run: julia -e 'using Pkg; Pkg.add(url = "https://github.com/NVE/TuLiPa.git", rev = "redesign_JulES")' + run: julia -e 'using Pkg; Pkg.add(url = "https://github.com/NVE/TuLiPa.git")' - uses: julia-actions/julia-buildpkg@v1 - - uses: julia-actions/julia-runtest@v1 \ No newline at end of file + - uses: julia-actions/julia-runtest@v1 From 1a213907c2ecbb94d6eefff862a10f0d56b1c88d Mon Sep 17 00:00:00 2001 From: Julien Cabrol <40186418+cjuli1@users.noreply.github.com> Date: Mon, 9 Feb 2026 16:52:12 +0100 Subject: [PATCH 3/7] Update Julia compatibility version to 1.10.3 --- Project.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index 0704bf4..7eca464 100644 --- a/Project.toml +++ b/Project.toml @@ -23,11 +23,11 @@ ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66" Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" [compat] -julia = "1.9.2" +julia = "1.10.3" OrdinaryDiffEq = "6.66.0" ComponentArrays = "0.15.17" Interpolations = "0.16.1" JLD2 = "0.5.15" [extensions] -IfmExt = ["ComponentArrays", "Interpolations", "JLD2", "OrdinaryDiffEq"] \ No newline at end of file +IfmExt = ["ComponentArrays", "Interpolations", "JLD2", "OrdinaryDiffEq"] From acc227334692e55494a5e0c17ad554dd55df6b30 Mon Sep 17 00:00:00 2001 From: Julien Cabrol <40186418+cjuli1@users.noreply.github.com> Date: Mon, 9 Feb 2026 17:00:24 +0100 Subject: [PATCH 4/7] Add TuLiPa as an extra dependency --- Project.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Project.toml b/Project.toml index 7eca464..131f235 100644 --- a/Project.toml +++ b/Project.toml @@ -31,3 +31,6 @@ JLD2 = "0.5.15" [extensions] IfmExt = ["ComponentArrays", "Interpolations", "JLD2", "OrdinaryDiffEq"] + +[extras] +TuLiPa = {url = "https://github.com/NVE/TuLiPa.git"} From a613f757dd5462e539aef23cfa9f2e35bf94adcf Mon Sep 17 00:00:00 2001 From: Julien Cabrol <40186418+cjuli1@users.noreply.github.com> Date: Tue, 10 Feb 2026 12:45:32 +0100 Subject: [PATCH 5/7] Remove TuLiPa dependency from Project.toml Removed the TuLiPa dependency from the extras section. --- Project.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Project.toml b/Project.toml index 131f235..7eca464 100644 --- a/Project.toml +++ b/Project.toml @@ -31,6 +31,3 @@ JLD2 = "0.5.15" [extensions] IfmExt = ["ComponentArrays", "Interpolations", "JLD2", "OrdinaryDiffEq"] - -[extras] -TuLiPa = {url = "https://github.com/NVE/TuLiPa.git"} From caae6edf1af56d36174c485aa1e9ee88165295b4 Mon Sep 17 00:00:00 2001 From: Julien Cabrol <40186418+cjuli1@users.noreply.github.com> Date: Tue, 10 Feb 2026 12:58:26 +0100 Subject: [PATCH 6/7] Update TuLiPa package installation in CI workflow --- .github/workflows/testing.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 7655505..8a26c50 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -34,7 +34,9 @@ jobs: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - uses: julia-actions/cache@v1 - - name: Install TuLiPa Package - run: julia -e 'using Pkg; Pkg.add(url = "https://github.com/NVE/TuLiPa.git")' + - name: Instantiate Environment + run: julia --project=@. -e 'using Pkg; Pkg.instantiate()' + - name: Add TuLiPa from GitHub URL + run: julia --project=@. -e 'using Pkg; Pkg.develop(PackageSpec(url = "https://github.com/NVE/TuLiPa.git"))' - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 From dc0d56b0f802478ba7b1b9095ad3dfde5adb224d Mon Sep 17 00:00:00 2001 From: Julien Cabrol <40186418+cjuli1@users.noreply.github.com> Date: Tue, 10 Feb 2026 13:02:29 +0100 Subject: [PATCH 7/7] Reorder environment instantiation in testing workflow --- .github/workflows/testing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 8a26c50..4055bf5 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -34,9 +34,9 @@ jobs: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - uses: julia-actions/cache@v1 - - name: Instantiate Environment - run: julia --project=@. -e 'using Pkg; Pkg.instantiate()' - name: Add TuLiPa from GitHub URL run: julia --project=@. -e 'using Pkg; Pkg.develop(PackageSpec(url = "https://github.com/NVE/TuLiPa.git"))' + - name: Instantiate Environment + run: julia --project=@. -e 'using Pkg; Pkg.instantiate()' - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1