[UPD] Change default parameters for compute_ub

Author: frapac

src/SDDPoptimize.jl

@@ -143,13 +143,13 @@ function run_SDDP!(model::SPModel,
         end
 
     end
-    
+
     ##########
     # Estimate final upper bound with a great number of simulations:
-    if (verbose>0) && (param.compute_upper_bound != 0)
+    if (verbose>0) && (param.compute_upper_bound != -1)
         V0 = get_bellman_value(model, param, 1, V[1], model.initialState)
 
-        if param.compute_upper_bound == -1
+        if param.compute_upper_bound == 0
             println("Estimate upper-bound with Monte-Carlo ...")
             upb, costs = estimate_upper_bound(model, param, V, problems)
         end

src/objects.jl

@@ -188,7 +188,7 @@ type SDDPparameters
     monteCarloSize::Int64
 
     function SDDPparameters(solver, passnumber=10, gap=0.,
-                            max_iterations=20, prune_cuts=0, compute_ub=0, montecarlo=10000)
+                            max_iterations=20, prune_cuts=0, compute_ub=-1, montecarlo=10000)
         return new(solver, passnumber, gap, max_iterations, prune_cuts, compute_ub, montecarlo)
     end
 end