Export Benders #47 (#49)

Author: blegat

src/Benders_pmap.jl

@@ -19,9 +19,7 @@
 
  call with: julia -p <num_threads> <myscript>
 ================================================================#
-@everywhere using JuMP
-
-@everywhere begin
+using JuMP
 
 # this function loads and solves a conic problem and returns its dual
 function loadAndSolveConicProblem(c, A, b, K, C, solver)
@@ -43,8 +41,6 @@ function loadAndSolveConicProblem(c, A, b, K, C, solver)
     return status, MathProgBase.getdual(model)
 end
 
-end
-
 function loadMasterProblem(c, A, b, K, C, v, num_scen, solver)
     num_var = length(c)
     # load master problem

src/StructJuMP.jl

@@ -11,7 +11,8 @@ import ReverseDiffSparse
 # import MPI
 
 export StructuredModel, getStructure, getparent, getchildren, getProcIdxSet,
-       num_scenarios, @second_stage, getprobability, getMyRank
+       num_scenarios, @second_stage, getprobability, getMyRank,
+       BendersBridge, DLP, loadAndSolveConicProblem
 # Macro to exportall
 macro exportall(pkg)
     Expr(:export, names(JuMP)...)
@@ -189,4 +190,6 @@ end
 
 include("nlp.jl")
 
+include("BendersBridge.jl")
+
 end

test/benderstest.jl

@@ -4,8 +4,6 @@ using ECOS
 using Cbc
 using Base.Test
 
-include("../src/BendersBridge.jl")
-
 misocp_solver = CbcSolver()
 socp_solver = ECOS.ECOSSolver(verbose=false)
 

test/farmer.jl

@@ -2,8 +2,6 @@ using Base.Test
 
 using Clp
 
-include("../src/BendersBridge.jl")
-
 @testset "farmer" begin
     include("../examples/farmer.jl")
     status, objval, soln = DLP(m, ClpSolver())

test/runtests.jl

@@ -5,4 +5,3 @@ include("benderstest.jl")
 include("farmer.jl")
 
 include("examples_smoketest.jl")
-