Merge fa779cc into 31e63e2

JuliaStats · Sep 28, 2019 · f44b17b · f44b17b
2 parents 31e63e2 + fa779cc
commit f44b17b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/src/StatsModels.jl b/src/StatsModels.jl
@@ -58,8 +58,8 @@ export
 include("traits.jl")
 include("contrasts.jl")
 include("terms.jl")
-include("temporal_terms.jl")
 include("schema.jl")
+include("temporal_terms.jl")
 include("formula.jl")
 include("modelframe.jl")
 include("statsmodel.jl")

diff --git a/src/temporal_terms.jl b/src/temporal_terms.jl
@@ -26,7 +26,7 @@ struct LeadLagTerm{T<:AbstractTerm, F<:Union{typeof(lead), typeof(lag)}} <: Abst
     nsteps::Int
 end
 
-function apply_schema(t::FunctionTerm{F}, sch, ctx::Type) where F<:Union{typeof(lead), typeof(lag)}
+function apply_schema(t::FunctionTerm{F}, sch::Schema, ctx::Type) where F<:Union{typeof(lead), typeof(lag)}
     opname = string(nameof(F.instance))
     if length(t.args_parsed) == 1  # lag(term)
         term_parsed = first(t.args_parsed)

diff --git a/test/ambiguity.jl b/test/ambiguity.jl
@@ -0,0 +1,3 @@
+@testset "Ambiguity detection" begin
+    @test isempty(Test.detect_ambiguities(StatsModels))
+end
diff --git a/test/extension.jl b/test/extension.jl
@@ -93,4 +93,9 @@ end
     @testset "Fallback" begin
         @test_throws ArgumentError modelcols(DummyTerm(), (a=[1], ))
     end
+
+    @testset "Ambiguity detection" begin
+        # ambiguities are introduced by adding additional methods here
+        @test_broken isempty(Test.detect_ambiguities(StatsModels))
+    end
 end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -8,7 +8,8 @@ using StatsBase
 
 using StatsModels: ContrastsMatrix
 
-my_tests = ["formula.jl",
+my_tests = ["ambiguity.jl",
+            "formula.jl",
             "terms.jl",
             "temporal_terms.jl",
             "schema.jl",