[fixup] Missed a few things

TulipaEnergy · Nov 8, 2024 · ded14f2 · ded14f2
1 parent 1edc06e
commit ded14f2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/src/expressions/multi-year.jl b/src/expressions/multi-year.jl
@@ -1,5 +1,5 @@
-@timeit to "multi-year investment expressions" begin
-    function create_multi_year_expressions!(model, graph, sets, variables)
+function create_multi_year_expressions!(model, graph, sets, variables)
+    @timeit to "multi-year investment expressions" begin
         # Unpacking
         assets_investment = variables[:assets_investment].lookup
         assets_decommission_simple_method = variables[:assets_decommission_simple_method].lookup

diff --git a/src/io.jl b/src/io.jl
@@ -477,21 +477,20 @@ function save_solution_to_file(output_folder, graph, dataframes, solution)
     end
     CSV.write(output_file, output_table)
 
-    # TODO: Re-enable this output
-    # output_file = joinpath(output_folder, "flows-investments.csv")
-    # output_table = DataFrame(;
-    #     from_asset = String[],
-    #     to_asset = String[],
-    #     year = Int[],
-    #     InstalUnits = Float64[],
-    #     InstalCap_MW = Float64[],
-    # )
-    #
-    # for ((y, (u, v)), investment) in solution.flows_investment
-    #     capacity = graph[u, v].capacity
-    #     push!(output_table, (u, v, y, investment, capacity * investment))
-    # end
-    # CSV.write(output_file, output_table)
+    output_file = joinpath(output_folder, "flows-investments.csv")
+    output_table = DataFrame(;
+        from_asset = String[],
+        to_asset = String[],
+        year = Int[],
+        InstalUnits = Float64[],
+        InstalCap_MW = Float64[],
+    )
+
+    for ((y, (u, v)), investment) in solution.flows_investment
+        capacity = graph[u, v].capacity
+        push!(output_table, (u, v, y, investment, capacity * investment))
+    end
+    CSV.write(output_file, output_table)
 
     #=
     In both cases below, we select the relevant columns from the existing dataframes,