[UPD] small refactoring of code

Author: frapac

src/SDDPoptimize.jl

@@ -108,7 +108,7 @@ function run_SDDP!(model::SPModel,
 
     #Initialization of the counter
     stats = SDDPStat()
-    territory = (param.pruning[:type]=="territory")? [Territories(model.dimStates) for i in 1:model.stageNumber-1]: nothing
+    territory = (param.pruning[:type] ∈ ["territory", "mixed"])? [Territories(model.dimStates) for i in 1:model.stageNumber-1]: nothing
     (verbose > 0) && println("Initialize cuts")
 
     # If computation of upper-bound is needed, a set of scenarios is built
@@ -142,9 +142,11 @@ function run_SDDP!(model::SPModel,
 
         ####################
         # cut pruning
-        (param.pruning[:pruning]) && prune_cuts!(model, param, V, stockTrajectories, territory, stats.niterations, verbose)
-        if param.pruning[:pruning] && (stats.niterations%param.pruning[:period]==0)
-            problems = hotstart_SDDP(model, param, V)
+        if param.pruning[:pruning]
+            prune_cuts!(model, param, V, stockTrajectories, territory, stats.niterations, verbose)
+            if (stats.niterations%param.pruning[:period]==0)
+                problems = hotstart_SDDP(model, param, V)
+            end
         end
 
         ####################

src/objects.jl

@@ -166,13 +166,14 @@ type SDDPparameters
 
     function SDDPparameters(solver; passnumber=10, gap=0.,
                             max_iterations=20, prune_cuts=0,
-                            pruning_algo="exact",
+                            pruning_algo="none",
                             compute_ub=-1, montecarlo_final=10000, montecarlo_in_iter = 100,
                             mipsolver=nothing,
                             rho0=0., alpha=1.)
         is_acc = (rho0 > 0.)
         accparams = is_acc? Dict(:ρ0=>rho0, :alpha=>alpha, :rho=>rho0): Dict()
 
+        pruning_algo = (prune_cuts>0)? pruning_algo: "none"
         prune_cuts = Dict(:pruning=>prune_cuts>0, :period=>prune_cuts, :type=>pruning_algo)
         return new(solver, mipsolver, passnumber, gap,
                    max_iterations, prune_cuts, compute_ub,