[FIX] Hotfix breaking tests + benchmark

Author: frapac

examples/benchmark.jl

@@ -214,16 +214,7 @@ function benchmark_sddp()
     texec = toq()
     println("Time to perform simulation: ", texec, "s")
 
-    # Get costs with deterministic solution:
-    println("Compute anticipative solution ...")
-    costs_det = zeros(n_assessments)
-    for n in 1:n_assessments
-        costs_det[n] = solve_determinist_problem(model, aleas[:, n, :])
-    end
-
-    println("SDDP cost: \t", mean(costs_sddp))
-    println("Deterministic cost: \t", mean(costs_det))
-    println("Gap: \t", mean(costs_det)/mean(costs_sddp))
+	println("SDDP cost: \t", mean(costs_sddp))
     return stocks, V
 end
 

test/runtests.jl

@@ -139,7 +139,7 @@ facts("SDDP algorithm: 1D case") do
         sddp_costs, stocks = forward_simulations(model, params, V, pbs, noise_scenarios)
 
         # Compare sddp cost with those given by extensive formulation:
-        ef_cost = StochDynamicProgramming.extensive_formulation(model,params)
+        ef_cost = StochDynamicProgramming.extensive_formulation(model,params)[1]
         @fact typeof(ef_cost) --> Float64
 
         @fact mean(sddp_costs) --> roughly(ef_cost)
@@ -253,7 +253,7 @@ facts("SDDP algorithm: 2D case") do
         sddp_costs, stocks = forward_simulations(model, params, V, pbs, noise_scenarios)
 
         # Compare sddp cost with those given by extensive formulation:
-        ef_cost = StochDynamicProgramming.extensive_formulation(model,params)
+        ef_cost = StochDynamicProgramming.extensive_formulation(model,params)[1]
         @fact typeof(ef_cost) --> Float64
 
         @fact mean(sddp_costs) --> roughly(ef_cost)