fix appxtrue

Author: ChrisRackauckas

src/test_solution.jl

@@ -17,37 +17,39 @@ end
 function TestSolution(t,u,interp)
   T = eltype(eltype(u))
   N = length((size(u[1])..., length(u)))
-  TestSolution{T,N,length(true),typeof(t),typeof(u),typeof(interp)}(t,u,interp,true)
+  TestSolution{T,N,true,typeof(t),typeof(u),typeof(interp)}(t,u,interp,true)
 end
 TestSolution(interp::DESolution) = TestSolution{Void,0,true,Void,Void,typeof(interp)}(nothing,nothing,interp,true)
-
+hasinterp{T,N,hi,tType,uType,iType}(::TestSolution{T,N,hi,tType,uType,iType}) = hi
 """
 `appxtrue(sol::AbstractODESolution,sol2::TestSolution)`
 
 Uses the interpolant from the higher order solution sol2 to approximate
 errors for sol. If sol2 has no interpolant, only the final error is
 calculated.
 """
-function appxtrue{hasinterp}(sol::AbstractODESolution,sol2::TestSolution{hasinterp})
-  if sol2.u == nothing && hasinterp
-    sol2.u = sol2(sol.t)
-    sol2.t = sol.t
+function appxtrue(sol::AbstractODESolution,sol2::TestSolution)
+  if sol2.u == nothing && hasinterp(sol2)
+    _sol = TestSolution(sol.t,sol2(sol.t),sol2)
+  else
+    _sol = sol2
   end
-  errors = Dict(:final=>recursive_mean(abs.(sol[end]-sol2[end])))
-  if sol2.dense
-    timeseries_analytic = sol2(sol.t)
+  
+  errors = Dict(:final=>recursive_mean(abs.(sol[end]-_sol[end])))
+  if _sol.dense
+    timeseries_analytic = _sol(sol.t)
     errors[:l∞] = maximum(vecvecapply((x)->abs.(x),sol[:]-timeseries_analytic))
     errors[:l2] = sqrt(recursive_mean(vecvecapply((x)->float(x).^2,sol[:]-timeseries_analytic)))
     if !(typeof(sol) <: AbstractRODESolution) && sol.dense
       densetimes = collect(linspace(sol.t[1],sol.t[end],100))
       interp_u = sol(densetimes)
-      interp_analytic = sol2(densetimes)
+      interp_analytic = _sol(densetimes)
       interp_errors = Dict(:L∞=>maximum(vecvecapply((x)->abs.(x),interp_u-interp_analytic)),
                            :L2=>sqrt(recursive_mean(vecvecapply((x)->float(x).^2,interp_u-interp_analytic))))
       errors = merge(errors,interp_errors)
     end
   end
-  build_solution(sol,sol2.u,errors)
+  build_solution(sol,_sol.u,errors)
 end
 
 function appxtrue(sol::AbstractFEMSolution,sol2::AbstractFEMSolution)