From d3dbde46aeb3ef263644b34772ba6f352884dcc1 Mon Sep 17 00:00:00 2001 From: oscarddssmith Date: Thu, 13 Jul 2023 11:56:25 -0400 Subject: [PATCH] do it the other way --- src/problems/problem_utils.jl | 20 ++++++++++---------- src/solutions/solution_interface.jl | 7 ++++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/problems/problem_utils.jl b/src/problems/problem_utils.jl index 63a4114f8..83fbe6410 100644 --- a/src/problems/problem_utils.jl +++ b/src/problems/problem_utils.jl @@ -39,8 +39,8 @@ function Base.summary(io::IO, prob::AbstractLinearProblem) type_color, isinplace(prob), no_color) end -Base.show(io::IO, mime::MIME"text/plain", A::AbstractSciMLProblem) = show(io, A) -function Base.show(io::IO, A::AbstractLinearProblem) +Base.show(io::IO, A::AbstractSciMLProblem) = show(io, MIME"text/plain", A) +function Base.show(io::IO, mime::MIME"text/plain", A::AbstractLinearProblem) summary(io, A) println(io) print(io, "b: ") @@ -57,14 +57,14 @@ function Base.summary(io::IO, prob::AbstractNonlinearProblem{uType, iip}) where type_color, isinplace(prob), no_color) end -function Base.show(io::IO, A::AbstractNonlinearProblem) +function Base.show(io::IO, mime::MIME"text/plain", A::AbstractNonlinearProblem) summary(io, A) println(io) print(io, "u0: ") show(io, mime, A.u0) end -function Base.show(io::IO, A::IntervalNonlinearProblem) +function Base.show(io::IO, mime::MIME"text/plain", A::IntervalNonlinearProblem) summary(io, A) println(io) print(io, "Interval: ") @@ -79,7 +79,7 @@ function Base.summary(io::IO, prob::AbstractOptimizationProblem) type_color, isinplace(prob), no_color) end -function Base.show(io::IO, A::AbstractOptimizationProblem) +function Base.show(io::IO, mime::MIME"text/plain", A::AbstractOptimizationProblem) summary(io, A) println(io) print(io, "u0: ") @@ -94,7 +94,7 @@ function Base.summary(io::IO, prob::AbstractIntegralProblem) type_color, isinplace(prob), no_color) end -function Base.show(io::IO, A::AbstractIntegralProblem) +function Base.show(io::IO, mime::MIME"text/plain", A::AbstractIntegralProblem) summary(io, A) println(io) end @@ -104,7 +104,7 @@ function Base.summary(io::IO, prob::AbstractNoiseProblem) nameof(typeof(prob)), " with WType ", typeof(prob.noise.curW), " and tType ", typeof(prob.tspan[1]), ". In-place: ", isinplace(prob)) end -function Base.show(io::IO, A::AbstractDEProblem) +function Base.show(io::IO, mime::MIME"text/plain", A::AbstractDEProblem) summary(io, A) println(io) print(io, "timespan: ") @@ -113,14 +113,14 @@ function Base.show(io::IO, A::AbstractDEProblem) print(io, "u0: ") show(io, mime, A.u0) end -function Base.show(io::IO, A::AbstractNoiseProblem) +function Base.show(io::IO, mime::MIME"text/plain", A::AbstractNoiseProblem) summary(io, A) println(io) print(io, "timespan: ") show(io, mime, A.tspan) println(io) end -function Base.show(io::IO, A::AbstractDAEProblem) +function Base.show(io::IO, mime::MIME"text/plain", A::AbstractDAEProblem) summary(io, A) println(io) print(io, "timespan: ") @@ -170,7 +170,7 @@ function Base.iterate(::NullParameters) throw(NullParameterIndexError()) end -function Base.show(io::IO, A::AbstractPDEProblem) +function Base.show(io::IO, mime::MIME"text/plain", A::AbstractPDEProblem) summary(io, A.prob) println(io) end diff --git a/src/solutions/solution_interface.jl b/src/solutions/solution_interface.jl index c6370470c..dad9554b8 100644 --- a/src/solutions/solution_interface.jl +++ b/src/solutions/solution_interface.jl @@ -200,8 +200,9 @@ function Base.summary(io::IO, A::AbstractTimeseriesSolution) type_color, eltype(A.t), no_color) end -Base.show(io::IO, mime::MIME"text/plain", A::AbstractSciMLSolution) = show(io, A) -function Base.show(io::IO, A::AbstractTimeseriesSolution) + +Base.show(io::IO, A::AbstractSciMLProblem) = show(io, MIME"text/plain", A) +function Base.show(io::IO, m::MIME"text/plain", A::AbstractTimeseriesSolution) println(io, string("retcode: ", A.retcode)) println(io, string("Interpolation: "), interp_summary(A.interp)) print(io, "t: ") @@ -219,7 +220,7 @@ function Base.iterate(sol::AbstractTimeseriesSolution, state = 0) return (solution_new_tslocation(sol, state), state) end -function Base.show(io::IO, A::AbstractPDESolution) +function Base.show(io::IO, m::MIME"text/plain", A::AbstractPDESolution) println(io, string("retcode: ", A.retcode)) print(io, "t: ") show(io, m, A.t)