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.

Sign up for GitHub

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

Business plan plot #12

Merged
merged 41 commits into from
Nov 13, 2023
Merged

Business plan plot #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
3210afc
Initial commit
TomFer97 Jul 12, 2023
66cebd2
First dataframe function
TomFer97 Jul 12, 2023
8722f55
New yearly function split financial
TomFer97 Jul 25, 2023
eb9d12f
Fixing yearly financial terms
TomFer97 Jul 25, 2023
d89b4b2
Fixing function but problem with ann_energy-costs
TomFer97 Jul 25, 2023
795d6c8
Minor fix
TomFer97 Jul 26, 2023
f65375c
Minor fix and DenseAxisArray 2-D
TomFer97 Jul 26, 2023
c20b7ce
Final fix of split_yearly_financial function
TomFer97 Jul 26, 2023
5d14cd3
Fix but issues with get_value function
TomFer97 Jul 31, 2023
755cd6b
Final split_yearly function
TomFer97 Jul 31, 2023
1bccd4c
business_plan_plot function
TomFer97 Jul 31, 2023
200e877
Fix of business_plan_plot_function
TomFer97 Jul 31, 2023
6a143e6
Fix
TomFer97 Jul 31, 2023
c405b01
First bar plot with errors
TomFer97 Jul 31, 2023
a69e0db
Description of functions
TomFer97 Aug 21, 2023
1c20249
Fixing of tab intended
TomFer97 Aug 21, 2023
63151b1
business_plant rename function
TomFer97 Aug 21, 2023
c078743
Year 0 as star year
TomFer97 Aug 21, 2023
769f413
Fix
TomFer97 Aug 30, 2023
381c9d1
Fixing on ECModel
TomFer97 Aug 31, 2023
4a4a66a
Fixgin not working
TomFer97 Sep 1, 2023
8b86766
Next try
TomFer97 Oct 9, 2023
e1e6ec7
Fix business plot
TomFer97 Oct 12, 2023
ed08d98
Fixing
TomFer97 Oct 12, 2023
7677bac
First update
TomFer97 Oct 20, 2023
27702ab
First plot fix
TomFer97 Oct 26, 2023
f1fd371
Project.toml update
TomFer97 Oct 31, 2023
39ae9c0
Clear RunSingleModel
TomFer97 Oct 31, 2023
1e28fdd
Fixing of bar_label and values
TomFer97 Nov 2, 2023
2ca53cc
Only CO
TomFer97 Nov 2, 2023
6407d2a
Update Project.toml
TomFer97 Nov 7, 2023
60d0943
Almost last fix
TomFer97 Nov 7, 2023
458967e
Not working legend :(
TomFer97 Nov 7, 2023
2106981
Reorder plot structure in business_plan_plot
TomFer97 Nov 8, 2023
1cedff9
Finalize plot_business_plan
davide-f Nov 13, 2023
519d65d
Merge remote-tracking branch 'upstream/main' into sankey_branch
davide-f Nov 13, 2023
181b7d7
Update examples of the documentation
davide-f Nov 13, 2023
542fae0
Add test to business_plot
davide-f Nov 13, 2023
0ed794d
Revise examples: toml and environment
davide-f Nov 13, 2023
9743f12
Add cumulative discounted cash flows to yearly finantial terms
davide-f Nov 13, 2023
76cf345
Add cumulative discounted cash flows to yearly finantial terms
davide-f Nov 13, 2023
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
10 changes: 6 additions & 4 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,30 @@ DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
ExportAll = "ad2082ca-a69e-11e9-38fa-e96309a31fe4"
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0"
TheoryOfGames = "eb50afb4-6f20-4b37-9b66-473e668300bf"
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
LayeredLayouts = "f4a74d36-062a-4d48-97cd-1356bad1de4e"
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
SankeyPlots = "8fd88ec8-d95c-41fc-b299-05f2225f2cc5"
StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd"
TheoryOfGames = "eb50afb4-6f20-4b37-9b66-473e668300bf"
XLSX = "fdbf4ff8-1666-58a4-91e7-1b58723a45e0"
YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"

[compat]
julia = "1"
CSV = "0.10"
DataFrames = "1"
ExportAll = "0.1"
FileIO = "1"
Formatting = "0.4"
TheoryOfGames = "0.1"
JuMP = "1"
TomFer97 marked this conversation as resolved.
Show resolved Hide resolved
LayeredLayouts = "0.2"
MathOptInterface = "1.0"
Plots = "1"
SankeyPlots = "0.2.2"
StatsPlots = "0.15"
TheoryOfGames = "0.1"
XLSX = "0.9"
YAML = "0.4"
YAML = "0.4"
julia = "1"
8 changes: 7 additions & 1 deletion docs/src/examples/example_aggregated_non_cooperative.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,10 @@ print_summary(ANC_Model)
save_summary(ANC_Model, output_file_isolated)

# Plot the sankey plot of resources
plot_sankey(ANC_Model)
plot_sankey(ANC_Model)

# DataFrame of the business plan
business_plan(ANC_Model)

# plot business plan
business_plan_plot(ANC_Model)
8 changes: 7 additions & 1 deletion docs/src/examples/example_cooperative.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,10 @@ print_summary(CO_Model)
save_summary(CO_Model, output_file_isolated)

# Plot the sankey plot of resources
plot_sankey(CO_Model)
plot_sankey(CO_Model)

# DataFrame of the business plan
business_plan(CO_Model)

# plot business plan
business_plan_plot(CO_Model)
8 changes: 7 additions & 1 deletion docs/src/examples/example_non_cooperative.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,10 @@ print_summary(NC_Model)
save_summary(NC_Model, output_file_isolated)

# Plot the sankey plot of resources
plot_sankey(NC_Model)
plot_sankey(NC_Model)

# DataFrame of the business plan
business_plan(NC_Model)

# plot business plan
business_plan_plot(NC_Model)
16 changes: 16 additions & 0 deletions examples/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
EnergyCommunity = "2f2d8a28-e724-42c4-aa4e-51fe4e6b7a61"
ExportAll = "ad2082ca-a69e-11e9-38fa-e96309a31fe4"
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0"
TheoryOfGames = "eb50afb4-6f20-4b37-9b66-473e668300bf"
HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
SankeyPlots = "8fd88ec8-d95c-41fc-b299-05f2225f2cc5"
XLSX = "fdbf4ff8-1666-58a4-91e7-1b58723a45e0"
YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
20 changes: 16 additions & 4 deletions examples/RunSingleModel.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Run this script from EnergyCommunity.jl root!!!
using Pkg
Pkg.activate(".") # this line requires EnergyCommunity.jl to be the current directory
# # Run this script from EnergyCommunity.jl root!!!
# using Pkg
# Pkg.activate("examples")

using EnergyCommunity, JuMP
using HiGHS, Plots
Expand Down Expand Up @@ -45,6 +45,12 @@ save_summary(ECModel, output_file_combined)
# Plot sankey plot of CO model
plot_sankey(ECModel)

# DataFrame of the business plan
business_plan(ECModel)

# plot 20 years business plan of CO model
business_plan_plot(ECModel)

TomFer97 marked this conversation as resolved.
Show resolved Hide resolved
## Model NC

# create NonCooperative model
Expand All @@ -66,4 +72,10 @@ print_summary(NC_Model)
save_summary(NC_Model, output_file_isolated)

# plot Sankey plot of NC model
plot_sankey(NC_Model)
plot_sankey(NC_Model)

# DataFrame of the business plan of NC model
business_plan(NC_Model)

# plot business plan of NC model
business_plan_plot(NC_Model)
4 changes: 2 additions & 2 deletions examples/RunSingleModel_complete.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Run this script from EnergyCommunity.jl root!!!
# # Run this script from EnergyCommunity.jl root!!!
# using Pkg
# Pkg.activate(".") # this line requires EnergyCommunity.jl to be the current directory
# Pkg.activate("examples")

using EnergyCommunity, JuMP
using HiGHS, Plots
Expand Down
Loading
Loading