Skip to content

Commit 7c9a281

Browse files
authored
Replace Printf by Base.Ryu for Julia-1.4 (#298)
1 parent c514156 commit 7c9a281

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

.github/workflows/Tier1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ${{ matrix.os }}
2121
strategy:
2222
matrix:
23-
julia-version: [1.3]
23+
julia-version: [1.4]
2424
julia-arch: [x64]
2525
os: [ubuntu-18.04, macos-10.15, windows-2019]
2626
steps:

.github/workflows/Tier2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
julia-version: [1.3, 1.4.0-rc1]
24+
julia-version: [1.4]
2525
julia-arch: [x64, x86]
2626
os: [ubuntu-18.04, macos-10.15, windows-2019]
2727
exclude:

Project.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ NLopt = "76087f3c-5699-56af-9a33-bf431cd00edd"
1414
NamedArrays = "86f7a689-2022-50b4-a561-43c23ac3c673"
1515
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1616
PooledArrays = "2dfb63ee-cc39-5dd5-95bd-886bf059d720"
17-
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
1817
ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
1918
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
2019
Showoff = "992d4aef-0814-514b-bc4d-f2e9a6c4116f"
@@ -42,7 +41,7 @@ StatsBase = "0.31, 0.32"
4241
StatsFuns = "0.8, 0.9"
4342
StatsModels = "0.6"
4443
Tables = "1"
45-
julia = "1.3"
44+
julia = "1.4"
4645

4746
[extras]
4847
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"

src/MixedModels.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ using StatsModels
2121
using Tables
2222

2323
using LinearAlgebra: BlasFloat, BlasReal, HermOrSym, PosDefException, copytri!
24-
using Printf: @printf, @sprintf
24+
using Base: Ryu
2525
using GLM: Link, canonicallink
2626

2727
using StatsFuns: log2π

src/generalizedlinearmixedmodel.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,8 @@ function Base.show(io::IO, m::GeneralizedLinearMixedModel)
554554
println(io, " ", m.LMM.formula)
555555
println(io, " Distribution: ", Distribution(m.resp))
556556
println(io, " Link: ", GLM.Link(m.resp), "\n")
557-
println(io, string(" Deviance: ", @sprintf("%.4f", deviance(m, nAGQ))), "\n")
557+
println(io, " Deviance: ", Ryu.writefixed(deviance(m, nAGQ), 4))
558+
println(io)
558559

559560
show(io, VarCorr(m))
560561

src/likelihoodratiotest.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,16 @@ function Base.show(io::IO, lrt::LikelihoodRatioTest; digits=2)
124124

125125

126126
outrows[2, :] = ["[1]",
127-
@sprintf("%.0d", lrt.dof[1]),
128-
@sprintf("%.4f", lrt.deviance[1]),
127+
string(lrt.dof[1]),
128+
Ryu.writefixed(lrt.deviance[1], 4),
129129
" "," ", " "]
130130

131131
for i in 2:nr
132132
outrows[i+1, :] = ["[$i]",
133-
@sprintf("%.0d", lrt.dof[i]),
134-
@sprintf("%.4f", lrt.deviance[i]),
135-
@sprintf("%.4f", Δdev[i-1]),
136-
@sprintf("%.0d", Δdf[i-1]),
133+
string(lrt.dof[i]),
134+
Ryu.writefixed(lrt.deviance[i], 4),
135+
Ryu.writefixed(Δdev[i-1], 4),
136+
string(Δdf[i-1]),
137137
string(StatsBase.PValue(lrt.pvalues[i-1]))]
138138
end
139139
colwidths = length.(outrows)

src/varcorr.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function Base.show(io::IO, vc::VarCorr)
5454
for l = 1:(j-1)
5555
ρind += 1
5656
ρval = ρ[ρind]
57-
ρval === -0.0 ? write(io, " . ") : @printf(io, "%6.2f", ρval)
57+
ρval === -0.0 ? write(io, " . ") : write(io, lpad(Ryu.writefixed(ρval, 2, true), 6))
5858
end
5959
println(io)
6060
firstrow = false

0 commit comments

Comments
 (0)