Merge remote-tracking branch 'refs/remotes/origin/main'

Conflicts: examples/unitCommitment.jl
ChrisFuelOR · Oct 22, 2021 · 4153010 · 4153010
2 parents 008693c + ee25450
commit 4153010
Show file tree

Hide file tree

Showing 58 changed files with 6,569 additions and 10,883 deletions.
diff --git a/Manifest.toml b/Manifest.toml
diff --git a/PreparationPackage.jl b/PreparationPackage.jl
@@ -0,0 +1,13 @@
+tpl = Template(;
+    user="ChrisFuelOR",
+    authors=["Christian Fuellner"],
+    julia=v"1.5",
+    plugins=[
+        Git(; manifest=true),
+        Codecov(),
+        TravisCI(; x86=true),
+        Documenter{TravisCI}(),
+    ],
+)
+
+tpl("DynamicSDDiP")
diff --git a/Project.toml b/Project.toml
@@ -3,6 +3,19 @@ uuid = "13dd0c9c-319d-47c7-ae8d-0241c720e43f"
 authors = ["Christian Fuellner"]
 version = "0.1.0"
 
+[deps]
+Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
+GAMS = "1ca51c6a-1b4d-4546-9ae1-53e0a243ab12"
+Gurobi = "2e9cd046-0924-5485-92f1-d5272153d98b"
+Infiltrator = "5903a43b-9cc3-4c30-8d17-598619ec4e9b"
+JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
+MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
+Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
+Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
+SDDP = "f4570300-c277-11e8-125c-4912f86ce65d"
+TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
+
 [compat]
 julia = "1.5"
 

diff --git a/examples/Others/Ex_3.jl b/examples/Others/Ex_3.jl
diff --git a/examples/Others/GAMS_test.jl b/examples/Others/GAMS_test.jl