Skip to content

Commit 3b8ec9b

Browse files
leburgelJutho
andauthored
Update src/OptimKit.jl
Co-authored-by: Jutho <Jutho@users.noreply.github.com>
1 parent 69d7f9b commit 3b8ec9b

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

src/OptimKit.jl

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,17 @@ Also see [`GradientDescent`](@ref), [`ConjugateGradient`](@ref), [`LBFGS`](@ref)
105105
function optimize end
106106

107107
function format_time(t::Float64)
108-
return t < 60 ? @sprintf("%.2f s", t) :
109-
t < 2600 ? @sprintf("%.2f m", t / 60) :
110-
@sprintf("%.2f h", t / 3600)
108+
if t < 1e-3
109+
return @sprintf("%5.1f μs", 1e6*t)
110+
elseif t < 1
111+
return @sprintf("%5.1f ms", 1e3*t)
112+
elseif t < 60
113+
return @sprintf("%5.2f s", t)
114+
elseif t < 3600
115+
return @sprintf("%5.2f m", t / 60)
116+
else
117+
return @sprintf("%.2f h", t / 3600)
118+
end
111119
end
112120

113121
include("linesearches.jl")

0 commit comments

Comments
 (0)