Skip to content

Commit e1976bb

Browse files
juhyun-kim-uclaHua-Zhou
authored andcommitted
condense fisher_B! and fisher_B
1 parent ac99a68 commit e1976bb

1 file changed

Lines changed: 4 additions & 73 deletions

File tree

src/two_variance_component.jl

Lines changed: 4 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -469,96 +469,27 @@ end
469469

470470
function fisher_B!(
471471
H::AbstractMatrix{T},
472-
vcm::VarianceComponentModel{T, 2},
473-
vcobs::VarianceComponentVariate{T, 2},
472+
vcm::Union{VarianceComponentModel{T, 2}, TwoVarCompVariateRotate{T}},
473+
vcobs::Union{TwoVarCompVariateRotate{T}, VarianceComponentVariate{T, 2}},
474474
vcaux::VarianceComponentAuxData = VarianceComponentAuxData(vcobs)
475475
) where {T <: AbstractFloat}
476476

477477
fisher_B!(H, TwoVarCompModelRotate(vcm), TwoVarCompVariateRotate(vcobs), vcaux)
478478
end
479479

480-
function fisher_B!(
481-
H::AbstractMatrix{T},
482-
vcm::TwoVarCompVariateRotate{T},
483-
vcobs::VarianceComponentVariate{T, 2},
484-
vcaux::VarianceComponentAuxData = VarianceComponentAuxData(vcobs)
485-
) where {T <: AbstractFloat}
486-
487-
fisher_B!(H, vcm, TwoVarCompVariateRotate(vcobs), vcaux)
488-
end
489-
490-
function fisher_B!(
491-
H::AbstractMatrix{T},
492-
vcm::VarianceComponentModel{T, 2},
493-
vcobs::TwoVarCompVariateRotate{T},
494-
vcaux::VarianceComponentAuxData = VarianceComponentAuxData(vcobs)
495-
) where {T <: AbstractFloat}
496-
497-
fisher_B!(H, TwoVarCompModelRotate(vcm), vcobs, vcaux)
498-
end
499-
500-
function fisher_B!(
501-
H::AbstractMatrix{T},
502-
vcm::TwoVarCompVariateRotate{T},
503-
vcobs::TwoVarCompVariateRotate{T},
504-
vcaux::VarianceComponentAuxData = VarianceComponentAuxData(vcobs)
505-
) where {T <: AbstractFloat}
506-
507-
fisher_B!(H, vcm, vcobs, vcaux)
508-
end
509-
510480
function fisher_B(
511481
vcm::T1,
512482
vcobs::T2,
513483
vcaux::T3 = VarianceComponentAuxData(vcobs)
514484
) where {
515-
T1 <: VarianceComponentModel,
516-
T2 <: VarianceComponentVariate,
485+
T1 <: Union{VarianceComponentModel, TwoVarCompModelRotate},
486+
T2 <: Union{VarianceComponentVariate, TwoVarCompVariateRotate},
517487
T3 <: VarianceComponentAuxData}
518488

519489
H = zeros(eltype(vcm), nmeanparams(vcm), nmeanparams(vcm))
520490
fisher_B!(H, TwoVarCompModelRotate(vcm), TwoVarCompVariateRotate(vcobs), vcaux)
521491
end
522492

523-
function fisher_B(
524-
vcm::T1,
525-
vcobs::T2,
526-
vcaux::T3 = VarianceComponentAuxData(vcobs)
527-
) where {
528-
T1 <: TwoVarCompModelRotate,
529-
T2 <: VarianceComponentVariate,
530-
T3 <: VarianceComponentAuxData}
531-
532-
H = zeros(eltype(vcm), nmeanparams(vcm), nmeanparams(vcm))
533-
fisher_B!(H, vcm, TwoVarCompVariateRotate(vcobs), vcaux)
534-
end
535-
536-
function fisher_B(
537-
vcm::T1,
538-
vcobs::T2,
539-
vcaux::T3 = VarianceComponentAuxData(vcobs)
540-
) where {
541-
T1 <: VarianceComponentModel,
542-
T2 <: TwoVarCompVariateRotate,
543-
T3 <: VarianceComponentAuxData}
544-
545-
H = zeros(eltype(vcm), nmeanparams(vcm), nmeanparams(vcm))
546-
fisher_B!(H, TwoVarCompModelRotate(vcm), vcobs, vcaux)
547-
end
548-
549-
function fisher_B(
550-
vcm::T1,
551-
vcobs::T2,
552-
vcaux::T3 = VarianceComponentAuxData(vcobs)
553-
) where {
554-
T1 <: TwoVarCompModelRotate,
555-
T2 <: TwoVarCompVariateRotate,
556-
T3 <: VarianceComponentAuxData}
557-
558-
H = zeros(eltype(vcm), nmeanparams(vcm), nmeanparams(vcm))
559-
fisher_B!(H, vcm, vcobs, vcaux)
560-
end
561-
562493
function fisher_B!(
563494
H::AbstractMatrix,
564495
vcm::T1,

0 commit comments

Comments
 (0)