export Faceted, Revised, ThreeItem

simonsteiger · Jul 29, 2024 · a1bbf18 · a1bbf18
1 parent a422e2f
commit a1bbf18
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/RheumaComposites.jl b/src/RheumaComposites.jl
@@ -15,9 +15,9 @@ export DAS28
 export DAS28ESR
 export DAS28CRP
 export SDAI
-export faceted
+export faceted, Faceted
 export BooleanRemission
-export revised, threeitem
+export revised, Revised, threeitem, ThreeItem
 export t28, s28, pga, apr, ega, crp
 export weight
 export score

diff --git a/test/types/boolean.jl b/test/types/boolean.jl
@@ -14,6 +14,7 @@ end
 
 @testset "Revised BoolRem" begin
     @test revised(boolrem) isa ModifiedComposite
+    @test revised(boolrem) isa Revised{<:BooleanComposite}
     @test try weight(revised(boolrem)) catch e; e isa ErrorException end
     # should we add a scoring style?
     @test isremission(revised(boolrem))
@@ -24,8 +25,8 @@ end
 end
 
 @testset "Three-item BoolRem" begin
-    @test threeitem(boolrem) isa AbstractComposite
     @test threeitem(boolrem) isa ModifiedComposite
+    @test threeitem(boolrem) isa ThreeItem{<:BooleanComposite}
     @test try weight(threeitem(boolrem)) catch e; e isa ErrorException end
     # should we add a scoring style?
     @test isremission(threeitem(boolrem))

diff --git a/test/types/das28.jl b/test/types/das28.jl
@@ -45,6 +45,7 @@ end
 end
 
 @testset "Faceted DAS28ESR" begin
+    @test faceted(das28e, facets) isa ModifiedComposite
     @test faceted(das28e, facets) isa Faceted{<:ContinuousComposite}
     @test score(faceted(das28e, facets)) == score(das28e)
     @test sum(decompose(faceted(das28e, facets), digits=5)) ≈ 1.0 atol = 1e-5
@@ -76,6 +77,7 @@ end
 end
 
 @testset "Faceted DAS28CRP" begin
+    @test faceted(das28c, facets) isa ModifiedComposite
     @test faceted(das28c, facets) isa Faceted{<:ContinuousComposite}
     @test score(faceted(das28c, facets)) == score(das28c)
     @test sum(decompose(faceted(das28c, facets), digits=5)) ≈ 1.0 atol = 1e-5