Skip to content

Commit

Permalink
Merge branch 'main' into mljflux-update
Browse files Browse the repository at this point in the history
  • Loading branch information
pat-alt authored Sep 14, 2023
2 parents 1aca391 + b9e2498 commit 4b1b87b
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 379 deletions.
4 changes: 1 addition & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ConformalPrediction"
uuid = "98bfc277-1877-43dc-819b-a3e38c30242f"
authors = ["Patrick Altmeyer"]
version = "0.1.10"
version = "0.1.12"

[deps]
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
Expand All @@ -16,7 +16,6 @@ MLJFlux = "094fc8d1-fd35-5302-93ea-dabda2abf845"
MLJModelInterface = "e80e1ace-859a-464e-9ed9-23947d8ae3ea"
MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54"
NaturalSort = "c020b1a1-e9b0-503a-9c33-f039bfc54a85"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
Expand All @@ -34,7 +33,6 @@ MLJFlux = "0.2.10, 0.3"
MLJModelInterface = "1"
MLUtils = "0.4.2"
NaturalSort = "1"
Plots = "1"
ProgressMeter = "1"
StatsBase = "0.33, 0.34.0"
Tables = "1"
Expand Down
1 change: 0 additions & 1 deletion src/conformal_models/conformal_models.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const ConformalModel = Union{

include("utils.jl")
include("heuristics.jl")
include("plotting.jl")

# Main API call to wrap model:
"""
Expand Down
322 changes: 0 additions & 322 deletions src/conformal_models/plotting.jl

This file was deleted.

30 changes: 0 additions & 30 deletions test/classification.jl
Original file line number Diff line number Diff line change
Expand Up @@ -51,36 +51,6 @@ conformal_models = merge(values(available_models[:classification])...)
@test !isnothing(conf_model.scores)
predict(mach, selectrows(X, test))

# Plotting:
@test isplot(bar(mach.model, mach.fitresult, X))
@test isplot(areaplot(mach.model, mach.fitresult, X, y))
@test isplot(
areaplot(mach.model, mach.fitresult, X, y; input_var=1)
)
@test isplot(
areaplot(mach.model, mach.fitresult, X, y; input_var=:x1)
)
if data_set[:specs][1] != 2
@test_throws AssertionError contourf(
mach.model, mach.fitresult, X, y
)
else
@test isplot(contourf(mach.model, mach.fitresult, X, y))
@test isplot(
contourf(
mach.model,
mach.fitresult,
X,
y;
zoom=-1,
plot_set_size=true,
),
)
@test isplot(
contourf(mach.model, mach.fitresult, X, y; target=1)
)
end

# Evaluation:
# Evaluation takes some time, so only testing for one method.
if _method == :simple_inductive && data_set[:specs][1] > 1
Expand Down
Loading

0 comments on commit 4b1b87b

Please sign in to comment.