Merge pull request #112 from bhalonen/tests_passing_fixes

Tests passing fixes

Author: ChrisRackauckas

Project.toml

@@ -29,5 +29,5 @@ ParameterizedFunctions = "65888b18-ceab-5e60-b2b9-181511a3b968"
 StochasticDiffEq = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
-[target]
+[targets]
 test = ["Test", "BlackBoxOptim", "DelayDiffEq", "LeastSquaresOptim", "NLopt", "Optim", "OrdinaryDiffEq", "ParameterizedFunctions", "StochasticDiffEq"]

src/cost_functions.jl

@@ -39,10 +39,10 @@ function (f::L2Loss)(sol::DiffEqBase.DESolution)
   colloc_grad = f.colloc_grad
   dudt = f.dudt
 
-  if sol_tmp isa DiffEqBase.AbstractEnsembleSolution
-    failure = any((s.retcode != :Success for s in sol_tmp)) && any((s.retcode != :Terminated for s in sol_tmp))
+  if sol isa DiffEqBase.AbstractEnsembleSolution
+    failure = any((s.retcode != :Success for s in sol)) && any((s.retcode != :Terminated for s in sol))
   else
-    failure = sol_tmp.retcode != :Success && sol_tmp != :Terminated
+    failure = sol.retcode != :Success && sol != :Terminated
   end
   failure && return Inf
 
@@ -127,10 +127,10 @@ LogLikeLoss(t,data_distributions,diff_distributions) = LogLikeLoss(t,matrixize(d
 
 function (f::LogLikeLoss)(sol::DESolution)
   distributions = f.data_distributions
-  if sol_tmp isa DiffEqBase.AbstractEnsembleSolution
-    failure = any((s.retcode != :Success for s in sol_tmp)) && any((s.retcode != :Terminated for s in sol_tmp))
+  if sol isa DiffEqBase.AbstractEnsembleSolution
+    failure = any((s.retcode != :Success for s in sol)) && any((s.retcode != :Terminated for s in sol))
   else
-    failure = sol_tmp.retcode != :Success && sol_tmp != :Terminated
+    failure = sol.retcode != :Success && sol != :Terminated
   end
   failure && return Inf
   ll = 0.0