Move out Monte Solve

SciML · Apr 7, 2017 · 6146d23 · 6146d23
1 parent 04ea538
commit 6146d23
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 41 deletions.
diff --git a/src/DiffEqBase.jl b/src/DiffEqBase.jl
@@ -68,9 +68,11 @@ export DEAlgorithm, AbstractODEAlgorithm, AbstractSDEAlgorithm,
 
 # Monte Carlo Simulations
 @compat abstract type AbstractMonteCarloProblem <: DEProblem end
+@compat abstract type AbstractMonteCarloEstimator <: DEProblem end
 
 export AbstractMonteCarloProblem, MonteCarloProblem
 export MonteCarloSolution, MonteCarloTestSolution
+export AbstractMonteCarloEstimator
 
 @compat abstract type DEOptions end
 @compat abstract type DECache end

diff --git a/src/solutions/monte_solutions.jl b/src/solutions/monte_solutions.jl
@@ -24,15 +24,6 @@ function calculate_monte_errors(sim::AbstractMonteCarloSolution)
   return MonteCarloTestSolution(solution_data,errors,error_means,error_medians,sim.elapsedTime)
 end
 
-function solve(prob::AbstractMonteCarloProblem,alg;num_monte=10000,kwargs...)
-  elapsedTime = @elapsed solution_data = pmap((i)-> begin
-    new_prob = prob.prob_func(deepcopy(prob.prob),i)
-    prob.output_func(solve(new_prob,alg;kwargs...))
-  end,1:num_monte)
-  solution_data = convert(Array{typeof(solution_data[1])},solution_data)
-  return(MonteCarloSolution(solution_data,elapsedTime))
-end
-
 Base.length(sim::AbstractMonteCarloSolution) = length(sim.solution_data)
 Base.endof( sim::AbstractMonteCarloSolution) = length(sim)
 Base.getindex(sim::AbstractMonteCarloSolution,i::Int) = sim.solution_data[i]

diff --git a/test/monte.jl b/test/monte.jl
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -5,6 +5,5 @@ using Base.Test
 @time @testset "Solution Interface" begin include("solution_get_tests.jl") end
 @time @testset "Extended Functions" begin include("extended_function_tests.jl") end
 @time @testset "Callbacks" begin include("callbacks.jl") end
-@time @testset "Monte Carlo Simulations" begin include("monte.jl") end
 @time @testset "Constructed Parameterized Functions" begin include("constructed_pf_test.jl") end
 @time @testset "Plot Variables" begin include("plot_vars.jl") end