Skip to content
This repository was archived by the owner on Apr 26, 2021. It is now read-only.

Commit 02b2ca9

Browse files
xiaodaighxiaodaigh
committed
updated supported for ScientificTypes v1
1 parent 1c4911e commit 02b2ca9

File tree

3 files changed

+57
-68
lines changed

3 files changed

+57
-68
lines changed

‎Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "JLBoostMLJ"
22
uuid = "8b86df2c-1bc3-481d-95df-1c4d5a20ed95"
33
authors = ["Dai ZJ <zhuojia.dai@gmail.com>"]
4-
version = "0.1.6"
4+
version = "0.1.7"
55

66
[deps]
77
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
@@ -17,7 +17,7 @@ JLBoost = "^0.1.8"
1717
LossFunctions = "0.5, 0.6"
1818
MLJ = "0.10, 0.11, 0.12"
1919
MLJBase = "0.12, 0.13, 0.14"
20-
ScientificTypes = "0.7, 0.8"
20+
ScientificTypes = "0.7, 0.8, 1.0"
2121
julia = "1"
2222

2323
[extras]

‎README.md

Lines changed: 53 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ JLBoostClassifier(
2828
min_child_weight = 1.0,
2929
lambda = 0.0,
3030
gamma = 0.0,
31-
colsample_bytree = 1) @130
31+
colsample_bytree = 1) @813
3232
````
3333

3434

@@ -45,11 +45,10 @@ mljmachine = machine(model, X, y)
4545

4646

4747
````
48-
Machine{JLBoostClassifier} @173 trained 0 times.
48+
Machine{JLBoostClassifier} @138 trained 0 times.
4949
args:
50-
1: Source @921 ⏎ `ScientificTypes.Table{AbstractArray{ScientificTypes.C
51-
ontinuous,1}}`
52-
2: Source @216 ⏎ `AbstractArray{ScientificTypes.Count,1}`
50+
1: Source @021 ⏎ `Table{AbstractArray{Continuous,1}}`
51+
2: Source @672 ⏎ `AbstractArray{Count,1}`
5352
````
5453

5554

@@ -78,11 +77,10 @@ Choosing a split on SepalLength
7877
Choosing a split on SepalWidth
7978
Choosing a split on PetalLength
8079
Choosing a split on PetalWidth
81-
Machine{JLBoostClassifier} @173 trained 1 time.
80+
Machine{JLBoostClassifier} @138 trained 1 time.
8281
args:
83-
1: Source @921 ⏎ `ScientificTypes.Table{AbstractArray{ScientificTypes.C
84-
ontinuous,1}}`
85-
2: Source @216 ⏎ `AbstractArray{ScientificTypes.Count,1}`
82+
1: Source @021 ⏎ `Table{AbstractArray{Continuous,1}}`
83+
2: Source @672 ⏎ `AbstractArray{Count,1}`
8684
````
8785

8886

@@ -97,28 +95,27 @@ predict(mljmachine, X)
9795

9896

9997
````
100-
150-element Array{MLJBase.UnivariateFinite{ScientificTypes.Multiclass{2},Bo
101-
ol,UInt32,Float64},1}:
102-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
103-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
104-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
105-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
106-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
107-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
108-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
109-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
110-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
111-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
98+
150-element Array{UnivariateFinite{Multiclass{2},Bool,UInt32,Float64},1}:
99+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
100+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
101+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
102+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
103+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
104+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
105+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
106+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
107+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
108+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
112109
⋮
113-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
114-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
115-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
116-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
117-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
118-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
119-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
120-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
121-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
110+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
111+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
112+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
113+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
114+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
115+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
116+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
117+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
118+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
122119
````
123120

124121

@@ -208,11 +205,10 @@ m = machine(tm, X, y_cate)
208205

209206

210207
````
211-
Machine{ProbabilisticTunedModel{Grid,…}} @902 trained 0 times.
208+
Machine{ProbabilisticTunedModel{Grid,…}} @666 trained 0 times.
212209
args:
213-
1: Source @376 ⏎ `ScientificTypes.Table{AbstractArray{ScientificTypes.C
214-
ontinuous,1}}`
215-
2: Source @912 ⏎ `AbstractArray{ScientificTypes.Multiclass{2},1}`
210+
1: Source @209 ⏎ `Table{AbstractArray{Continuous,1}}`
211+
2: Source @449 ⏎ `AbstractArray{Multiclass{2},1}`
216212
````
217213

218214

@@ -226,11 +222,10 @@ fit!(m)
226222

227223

228224
````
229-
Machine{ProbabilisticTunedModel{Grid,…}} @902 trained 1 time.
225+
Machine{ProbabilisticTunedModel{Grid,…}} @666 trained 1 time.
230226
args:
231-
1: Source @376 ⏎ `ScientificTypes.Table{AbstractArray{ScientificTypes.C
232-
ontinuous,1}}`
233-
2: Source @912 ⏎ `AbstractArray{ScientificTypes.Multiclass{2},1}`
227+
1: Source @209 ⏎ `Table{AbstractArray{Continuous,1}}`
228+
2: Source @449 ⏎ `AbstractArray{Multiclass{2},1}`
234229
````
235230

236231

@@ -306,28 +301,27 @@ predict(model, mljmodel.fitresult, X)
306301

307302

308303
````
309-
150-element Array{MLJBase.UnivariateFinite{ScientificTypes.Multiclass{2},Bo
310-
ol,UInt32,Float64},1}:
311-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
312-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
313-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
314-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
315-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
316-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
317-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
318-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
319-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
320-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.881, true=>0.119)
304+
150-element Array{UnivariateFinite{Multiclass{2},Bool,UInt32,Float64},1}:
305+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
306+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
307+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
308+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
309+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
310+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
311+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
312+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
313+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
314+
UnivariateFinite{Multiclass{2}}(false=>0.881, true=>0.119)
321315
⋮
322-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
323-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
324-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
325-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
326-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
327-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
328-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
329-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
330-
UnivariateFinite{ScientificTypes.Multiclass{2}}(false=>0.119, true=>0.881)
316+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
317+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
318+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
319+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
320+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
321+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
322+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
323+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
324+
UnivariateFinite{Multiclass{2}}(false=>0.119, true=>0.881)
331325
````
332326

333327

‎build-readme.jl

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
# Weave readme
22
using Pkg
33
cd("c:/git/JLBoostMLJ")
4-
# Pkg.activate("c:/git/JLBoostMLJ")
4+
Pkg.activate("c:/git/JLBoostMLJ/jlboost-test")
55

6-
Pkg.add("RDatasets")
7-
Pkg.add("Weave")
86
using Weave
97

108
weave("c:/git/JLBoostMLJ/README.jmd", out_path="c:/git/JLBoostMLJ", doctype="github")
119

12-
Pkg.rm("Weave")
13-
Pkg.rm("RDatasets")
14-
1510

1611
if false
17-
tangle("c:/git/JLBoostMLJ/README.jmd")
12+
tangle("c:/git/JLBoostMLJ/README.jmd")
1813
end

0 commit comments

Comments
 (0)