Skip to content

Commit 2788980

Browse files
authored
Merge pull request #953 from JuliaAI/dev
For a 1.1.0 release
2 parents e81cebc + 193ad67 commit 2788980

File tree

8 files changed

+23
-30
lines changed

8 files changed

+23
-30
lines changed

.github/codecov.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
coverage:
2+
status:
3+
project:
4+
default:
5+
threshold: 0.5%

Project.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "MLJBase"
22
uuid = "a7f614a8-145f-11e9-1d2a-a57a1082229d"
33
authors = ["Anthony D. Blaom <anthony.blaom@gmail.com>"]
4-
version = "1.0.1"
4+
version = "1.1.0"
55

66
[deps]
77
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
@@ -22,6 +22,7 @@ Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
2222
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
2323
ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
2424
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
25+
RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
2526
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
2627
ScientificTypes = "321657f4-b219-11e9-178b-2701a2544e81"
2728
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
@@ -52,11 +53,13 @@ OrderedCollections = "1.1"
5253
Parameters = "0.12"
5354
PrettyTables = "1, 2"
5455
ProgressMeter = "1.7.1"
56+
RecipesBase = "1"
5557
Reexport = "1.2"
5658
ScientificTypes = "3"
5759
StatisticalMeasures = "0.1.1"
5860
StatisticalMeasuresBase = "0.1.1"
5961
StatisticalTraits = "3.2"
62+
Statistics = "1"
6063
StatsBase = "0.32, 0.33, 0.34"
6164
Tables = "0.2, 1.0"
6265
julia = "1.6"

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## MLJBase
1+
## MLJBase
22

33
Repository for developers that provides core functionality for the
44
[MLJ](https://github.com/alan-turing-institute/MLJ.jl) machine

docs/make.jl

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ makedocs(;
88
format=Documenter.HTML(prettyurls = get(ENV, "CI", nothing) == "true"),
99
pages=[
1010
"Home" => "index.md",
11-
"Measures" => "measures.md",
1211
"Resampling" => "resampling.md",
1312
"Composition" => "composition.md",
1413
"Datasets" => "datasets.md",

docs/src/measures.md

-25
This file was deleted.

src/MLJBase.jl

+5
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ const Dist = Distributions
9191
# Measures
9292
import StatisticalMeasuresBase
9393

94+
# Plots
95+
using RecipesBase: RecipesBase, @recipe
96+
9497
# from Standard Library:
9598
using Statistics, LinearAlgebra, Random, InteractiveUtils
9699

@@ -172,6 +175,8 @@ include("data/datasets_synthetic.jl")
172175

173176
include("default_measures.jl")
174177

178+
include("plots.jl")
179+
175180
include("composition/models/stacking.jl")
176181

177182
const EXTENDED_ABSTRACT_MODEL_TYPES = vcat(

src/machines.jl

+3-2
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,9 @@ function check(model::Model, scitype_check_level, args...)
218218
return is_okay
219219
end
220220

221-
# we use `elscitype` here instead of `scitype` because the data is
222-
# wrapped in source nodes:
221+
# Sometimes (X, ) is a table, when X is a table, which leads to scitype((X,)) =
222+
# Table(...) where `Tuple{scitype(X)}` is wanted. Also, we use `elscitype` here
223+
# instead of `scitype` because the data is wrapped in source nodes;
223224
S = Tuple{elscitype.(args)...}
224225
if !(S <: F)
225226
is_okay = false

src/plots.jl

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@recipe function default_machine_plot(mach::Machine)
2+
# Allow downstream packages to define plotting recipes
3+
# for their own machine types.
4+
mach.fitresult
5+
end

0 commit comments

Comments
 (0)