Skip to content

Commit b5a291e

Browse files
committed
formatting fixes
1 parent 46ed716 commit b5a291e

8 files changed

Lines changed: 16 additions & 54 deletions

File tree

src/additional_functions/helper.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function get_observed(rowind, data, semobserved; args = (), kwargs = NamedTuple(
4141
return observed_vec
4242
end
4343

44-
skipmissing_mean(mat::AbstractMatrix) =
44+
skipmissing_mean(mat::AbstractMatrix) =
4545
[mean(skipmissing(coldata)) for coldata in eachcol(mat)]
4646

4747
function F_one_person(imp_mean, meandiff, inverse, data, logdet)

src/frontend/fit/summary.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ function sem_summary(
138138
),
139139
)
140140

141-
sorted_columns =
142-
[:from, :parameter_type, :to, :estimate, :param, :value_fixed, :start]
141+
sorted_columns = [:from, :parameter_type, :to, :estimate, :param, :value_fixed, :start]
143142
regression_columns = sort_partially(sorted_columns, columns)
144143

145144
regression_array = reduce(
@@ -166,8 +165,7 @@ function sem_summary(
166165
(partable.columns[:to] .== partable.columns[:from]),
167166
)
168167

169-
sorted_columns =
170-
[:from, :parameter_type, :to, :estimate, :param, :value_fixed, :start]
168+
sorted_columns = [:from, :parameter_type, :to, :estimate, :param, :value_fixed, :start]
171169
variance_columns = sort_partially(sorted_columns, columns)
172170

173171
variance_array = reduce(
@@ -194,8 +192,7 @@ function sem_summary(
194192
(partable.columns[:to] .!= partable.columns[:from]),
195193
)
196194

197-
sorted_columns =
198-
[:from, :parameter_type, :to, :estimate, :param, :value_fixed, :start]
195+
sorted_columns = [:from, :parameter_type, :to, :estimate, :param, :value_fixed, :start]
199196
variance_columns = sort_partially(sorted_columns, columns)
200197

201198
variance_array = reduce(

src/frontend/specification/ParameterTable.jl

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,8 @@ end
5959
############################################################################################
6060

6161
function Base.show(io::IO, partable::ParameterTable)
62-
relevant_columns = [
63-
:from,
64-
:parameter_type,
65-
:to,
66-
:free,
67-
:value_fixed,
68-
:start,
69-
:estimate,
70-
:se,
71-
:param,
72-
]
62+
relevant_columns =
63+
[:from, :parameter_type, :to, :free, :value_fixed, :start, :estimate, :se, :param]
7364
shown_columns = filter!(
7465
col -> haskey(partable.columns, col) && length(partable.columns[col]) > 0,
7566
relevant_columns,
@@ -126,6 +117,7 @@ params(partable::ParameterTable) =
126117

127118

128119
# Sorting ----------------------------------------------------------------------------------
120+
129121
struct CyclicModelError <: Exception
130122
msg::AbstractString
131123
end
@@ -150,8 +142,8 @@ function sort_vars!(partable::ParameterTable)
150142
]
151143

152144
is_regression = [
153-
(partype == :) && (from != Symbol("1")) for
154-
(partype, from) in zip(partable.columns[:parameter_type], partable.columns[:from])
145+
(partype == :) && (from != Symbol("1")) for (partype, from) in
146+
zip(partable.columns[:parameter_type], partable.columns[:from])
155147
]
156148

157149
to = partable.columns[:to][is_regression]

src/frontend/specification/RAMMatrices.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ function RAMMatrices(
147147
# F indices
148148
F_ind =
149149
length(partable.sorted_vars) != 0 ?
150-
findall((Set(partable.observed_vars)), partable.sorted_vars) :
151-
1:n_observed
150+
findall((Set(partable.observed_vars)), partable.sorted_vars) : 1:n_observed
152151

153152
# indices of the colnames
154153
colnames =

src/imply/RAM/generic.jl

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,26 +65,8 @@ Additional interfaces
6565
Only available in gradient! calls:
6666
- `I_A⁻¹(::RAM)` -> ``(I-A)^{-1}``
6767
"""
68-
mutable struct RAM{
69-
A1,
70-
A2,
71-
A3,
72-
A4,
73-
A5,
74-
A6,
75-
V2,
76-
I1,
77-
I2,
78-
I3,
79-
M1,
80-
M2,
81-
M3,
82-
M4,
83-
S1,
84-
S2,
85-
S3,
86-
B,
87-
} <: SemImply
68+
mutable struct RAM{A1, A2, A3, A4, A5, A6, V2, I1, I2, I3, M1, M2, M3, M4, S1, S2, S3, B} <:
69+
SemImply
8870
Σ::A1
8971
A::A2
9072
S::A3

src/loss/ML/FIML.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,5 +255,4 @@ end
255255

256256
get_n_nodes(specification::RAMMatrices) = specification.size_F[2]
257257
get_n_nodes(specification::ParameterTable) =
258-
length(specification.observed_vars) +
259-
length(specification.latent_vars)
258+
length(specification.observed_vars) + length(specification.latent_vars)

src/objective_gradient_hessian.jl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,7 @@ function gradient_hessian!(gradient, hessian, model::AbstractSemSingle, params)
3838
gradient_hessian!(gradient, hessian, loss(model), params, model)
3939
end
4040

41-
function objective_gradient_hessian!(
42-
gradient,
43-
hessian,
44-
model::AbstractSemSingle,
45-
params,
46-
)
41+
function objective_gradient_hessian!(gradient, hessian, model::AbstractSemSingle, params)
4742
fill!(gradient, zero(eltype(gradient)))
4843
fill!(hessian, zero(eltype(hessian)))
4944
objective_gradient_hessian!(imply(model), params, model)

test/examples/helper.jl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
function test_gradient(model, params; rtol = 1e-10, atol = 0)
2-
true_grad =
3-
FiniteDiff.finite_difference_gradient(Base.Fix1(objective!, model), params)
2+
true_grad = FiniteDiff.finite_difference_gradient(Base.Fix1(objective!, model), params)
43
gradient = similar(params)
54

65
# F and G
@@ -250,8 +249,7 @@ function compare_estimates(
250249
if type == :
251250
type = "~~"
252251
elseif type == :
253-
if (from partable.latent_vars) &&
254-
(to partable.observed_vars)
252+
if (from partable.latent_vars) && (to partable.observed_vars)
255253
type = "=~"
256254
else
257255
type = "~"

0 commit comments

Comments
 (0)