Skip to content

Commit d95b87b

Browse files
authored
Merge pull request #119 from SciML/printio
add io to all prints
2 parents 2fbd961 + d462cef commit d95b87b

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

src/basis.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ Base.show(io::IO, x::Basis) = print(io, "$(length(x.basis)) dimensional basis in
1717

1818
@inline function Base.print(io::IO, x::Basis)
1919
show(io, x)
20-
println()
20+
println(io)
2121
if length(x.variables) == length(x.basis)
2222
for (i, bi) in enumerate(x.basis)
23-
println("d$(x.variables[i]) = $bi")
23+
println(io,"d$(x.variables[i]) = $bi")
2424
end
2525
else
2626
for (i, bi) in enumerate(x.basis)
27-
println("f_$i = $bi")
27+
println(io,"f_$i = $bi")
2828
end
2929
end
3030
end

src/sindy/results.jl

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,44 +21,47 @@ end
2121
Base.show(io::IO, x::SparseIdentificationResult) = print(io, "Sparse Identification Result with $(sum(x.sparsity)) active terms.")
2222

2323
@inline function Base.print(io::IO, x::SparseIdentificationResult)
24-
println("Sparse Identification Result")
25-
println("No. of Parameters : $(length(x.parameters))")
26-
println("Active terms : $(sum(x.sparsity))")
24+
println(io,"Sparse Identification Result")
25+
println(io,"No. of Parameters : $(length(x.parameters))")
26+
println(io,"Active terms : $(sum(x.sparsity))")
2727
for (i, si) in enumerate(x.sparsity)
28-
println(" Equation $i : $si")
28+
println(io," Equation $i : $si")
2929
end
30-
println("Overall error (L2-Norm) : $(sum(x.error))")
30+
println(io,"Overall error (L2-Norm) : $(sum(x.error))")
3131
for (i, ei) in enumerate(x.error)
32-
println(" Equation $i : $ei")
32+
println(io," Equation $i : $ei")
3333
end
34-
println("AICC :")
34+
println(io,"AICC :")
3535
for (i, ai) in enumerate(x.aicc)
36-
println(" Equation $i : $ai")
36+
println(io," Equation $i : $ai")
3737
end
3838

39-
print("\n$(x.opt)")
39+
print(io,"\n$(x.opt)")
4040
if x.converged
41-
println(" converged after $(x.iterations) iterations.")
41+
println(io," converged after $(x.iterations) iterations.")
4242
else
43-
println(" did not converge after $(x.iterations) iterations.")
43+
println(io," did not converge after $(x.iterations) iterations.")
4444
end
4545
end
4646

4747

4848
"""
49-
print_equations(res; show_parameter)
49+
print_equations([io,] res; show_parameter)
5050
5151
Print the equations stored inside the `SparseIdentificationResult` `res`. If `show_parameter` is set
5252
to true, the numerical values will be used. Otherwise, the symbolic form will appear.
5353
"""
54-
function print_equations(r::SparseIdentificationResult; show_parameter::Bool = false)
54+
print_equations(r::SparseIdentificationResult;kwargs...) = print_equations(stdout,r;kwargs...)
55+
function print_equations(io::IO, r::SparseIdentificationResult;
56+
show_parameter::Bool = false)
57+
5558
if show_parameter
5659
eqs = r.equations(variables(r.equations), parameters(r), independent_variable(r.equations))
5760
for (i, eq) in enumerate(eqs)
58-
println("f_$i = ", eq)
61+
println(io,"f_$i = ", eq)
5962
end
6063
else
61-
print(r.equations)
64+
println(io,r.equations)
6265
end
6366
end
6467

0 commit comments

Comments
 (0)