Skip to content

Commit

Permalink
Merge pull request #229 from alan-turing-institute/dev
Browse files Browse the repository at this point in the history
extend [compat] StatsBase = "^0.32,^0.33"
  • Loading branch information
ablaom authored Mar 27, 2020
2 parents 5a58800 + 2e86918 commit 049c13a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "MLJBase"
uuid = "a7f614a8-145f-11e9-1d2a-a57a1082229d"
authors = ["Anthony D. Blaom <[email protected]>"]
version = "0.12.4"
version = "0.12.5"

[deps]
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
Expand Down Expand Up @@ -46,7 +46,7 @@ Parameters = "^0.12"
PrettyTables = "^0.8"
ProgressMeter = "^1.1"
ScientificTypes = "^0.7"
StatsBase = "^0.32"
StatsBase = "^0.32,^0.33"
Tables = "^0.2,^1.0"
julia = "1"

Expand Down
7 changes: 4 additions & 3 deletions src/MLJBase.jl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import MLJModelInterface: fit, update, update_data, transform,
inverse_transform, fitted_params, predict,
predict_mode, predict_mean, predict_median,
evaluate, clean!, is_same_except,
save, restore
save, restore, is_same_except

# Containers & data manipulation
using Tables
Expand Down Expand Up @@ -262,8 +262,9 @@ include("composition/networks.jl")
include("composition/composites.jl")
include("composition/pipelines.jl")
include("composition/pipeline_static.jl")
VERSION v"1.3.0-" && include("composition/arrows.jl")

@static if VERSION v"1.3.0-"
include("composition/arrows.jl")
end
include("operations.jl")

include("resampling.jl")
Expand Down
10 changes: 8 additions & 2 deletions src/hyperparam/one_dimensional_range_methods.jl
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ end

### Fallback and docstring


"""
Distributions.fit(D, r::MLJBase.NumericRange)
Expand Down Expand Up @@ -292,9 +293,14 @@ The argument `probs` can be any probability vector with the same
length as `r.values`. The second `sampler` method above calls the
first with a uniform `probs` vector.
The argument `d`, can be either an arbitrary instance of
The argument `d` can be either an arbitrary instance of
`UnivariateDistribution` from the Distributions.jl package, or one of
the Distributions.jl types specified in the table below.
a Distributions.jl *types* for which `fit(d, ::NumericRange)` is
defined. These include: `Arcsine`, `Uniform`, `Biweight`, `Cosine`,
`Epanechnikov`, `SymTriangularDist`, `Triweight`, `Normal`, `Gamma`,
`InverseGaussian`, `Logistic`, `LogNormal`, `Cauchy`, `Gumbel`,
`Laplace`, and `Poisson`; but see the doc-string for
[`Distributions.fit`](@ref) for an up-to-date list.
If `d` is an *instance*, then sampling is from a truncated form of the
supplied distribution `d`, the truncation bounds being `r.lower` and
Expand Down

0 comments on commit 049c13a

Please sign in to comment.