Skip to content

Commit f6091cd

Browse files
authored
Merge pull request #36 from ablaom/05-juptyer-update-re-mljlinearmodels
Update 05 Juptyer notebooks to address MLJLinearModels 0.6 update
2 parents ad0b0a5 + 94f1552 commit f6091cd

File tree

7 files changed

+194
-67
lines changed

7 files changed

+194
-67
lines changed

.gitignore

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,124 @@ sandbox/
88
/docs/site/
99
/docs/Manifest.toml
1010
.vscode
11+
12+
slides/src/AnthonyFeedback.txt
13+
slides/src/IQVIA_logo.png
14+
slides/src/MLJLogo2.svg
15+
slides/src/MLJ_as_lego.pdf
16+
slides/src/ML_packages_in_julia.png
17+
slides/src/NESI-logo.jpg
18+
slides/src/PCA.png
19+
slides/src/PCA2.png
20+
slides/src/S1.png
21+
slides/src/S10.png
22+
slides/src/S11.png
23+
slides/src/S12.png
24+
slides/src/S13.png
25+
slides/src/S14.png
26+
slides/src/S2.png
27+
slides/src/S3.png
28+
slides/src/S4.png
29+
slides/src/S5.png
30+
slides/src/S6.png
31+
slides/src/S7.png
32+
slides/src/S8.png
33+
slides/src/S9.png
34+
slides/src/Sboston.png
35+
slides/src/Sforest.png
36+
slides/src/Sforest2.png
37+
slides/src/Sforest3.png
38+
slides/src/Stree.png
39+
slides/src/Stree2.png
40+
slides/src/Turing_logo.png
41+
slides/src/Tutorials
42+
slides/src/UoA_logo.png
43+
slides/src/X.png
44+
slides/src/_region_.aux
45+
slides/src/_region_.log
46+
slides/src/_region_.nav
47+
slides/src/_region_.out
48+
slides/src/_region_.pdf
49+
slides/src/_region_.snm
50+
slides/src/_region_.tex
51+
slides/src/_region_.toc
52+
slides/src/abstract.md
53+
slides/src/all_three.png
54+
slides/src/auto/
55+
slides/src/beamercolorthemeTuring.sty
56+
slides/src/beamerinnerthemeTuring.sty
57+
slides/src/beamerouterthemeTuring.sty
58+
slides/src/beamerthemeTuringDark.sty
59+
slides/src/beamerthemeTuringLight.sty
60+
slides/src/classifier.png
61+
slides/src/classifier.xml
62+
slides/src/code.tex
63+
slides/src/composite.png
64+
slides/src/composite.xml
65+
slides/src/demo.ipynb
66+
slides/src/demo.md
67+
slides/src/demo/
68+
slides/src/dim_reducer.png
69+
slides/src/dim_reducer.xml
70+
slides/src/features.md
71+
slides/src/images/
72+
slides/src/julia.png
73+
slides/src/just_right.png
74+
slides/src/kaggle1.png
75+
slides/src/kaggle2.png
76+
slides/src/kaggle3.png
77+
slides/src/lego.pdf
78+
slides/src/model_search.ipynb
79+
slides/src/model_search.jl
80+
slides/src/model_search.md
81+
slides/src/model_search.tex
82+
slides/src/model_search1.png
83+
slides/src/model_search2.png
84+
slides/src/model_search3.md
85+
slides/src/model_search3.png
86+
slides/src/most.stars.png
87+
slides/src/most_stars.pdf
88+
slides/src/most_stars.png
89+
slides/src/other_toolboxes.png
90+
slides/src/other_toolboxes/
91+
slides/src/overfitting1.png
92+
slides/src/overfitting2.png
93+
slides/src/overfitting3.png
94+
slides/src/overfitting4.png
95+
slides/src/overfitting5.png
96+
slides/src/overfitting6.png
97+
slides/src/p66tpwz7h6ed8r339blj.pdf
98+
slides/src/packages.jpg
99+
slides/src/performance.png
100+
slides/src/pipeline.png
101+
slides/src/pipelines.xml
102+
slides/src/poly.jl
103+
slides/src/r.png
104+
slides/src/raise_hand_forbidden.png
105+
slides/src/scitypes.png
106+
slides/src/separate.png
107+
slides/src/separate.xml
108+
slides/src/sk_open_issue.png
109+
slides/src/slides.aux
110+
slides/src/slides.log
111+
slides/src/slides.nav
112+
slides/src/slides.out
113+
slides/src/slides.pdf
114+
slides/src/slides.snm
115+
slides/src/slides.toc
116+
slides/src/tables.md
117+
slides/src/tablesmap.md
118+
slides/src/tableswordcloud.png
119+
slides/src/test.aux
120+
slides/src/test.log
121+
slides/src/test.pdf
122+
slides/src/test.tex
123+
slides/src/tour-2.md
124+
slides/src/tuning/
125+
slides/src/two_model_stack.png
126+
slides/src/two_model_stack_minus1.png
127+
slides/src/two_model_stack_minus2.png
128+
slides/src/using_tasks.jl
129+
slides/src/warwick.jpg
130+
slides/src/warwick.png
131+
slides/src/y.png

notebooks/02_models/env/mandelbrot.png

Whitespace-only changes.

notebooks/05_composition/env/Manifest.toml

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
1111

1212
[[ArrayInterface]]
1313
deps = ["Compat", "IfElse", "LinearAlgebra", "Requires", "SparseArrays", "Static"]
14-
git-tree-sha1 = "1ee88c4c76caa995a885dc2f22a5d548dfbbc0ba"
14+
git-tree-sha1 = "ffc6588e17bcfcaa79dfa5b4f417025e755f83fc"
1515
uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
16-
version = "3.2.2"
16+
version = "4.0.1"
1717

1818
[[Artifacts]]
1919
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
@@ -40,9 +40,9 @@ version = "0.1.4"
4040

4141
[[ChainRulesCore]]
4242
deps = ["Compat", "LinearAlgebra", "SparseArrays"]
43-
git-tree-sha1 = "926870acb6cbcf029396f2f2de030282b6bc1941"
43+
git-tree-sha1 = "6e39c91fb4b84dcb870813c91674bdebb9145895"
4444
uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
45-
version = "1.11.4"
45+
version = "1.11.5"
4646

4747
[[ChangesOfVariables]]
4848
deps = ["ChainRulesCore", "LinearAlgebra", "Test"]
@@ -83,6 +83,12 @@ git-tree-sha1 = "52cb3ec90e8a8bea0e62e275ba577ad0f74821f7"
8383
uuid = "ed09eef8-17a6-5b46-8889-db040fac31e3"
8484
version = "0.3.2"
8585

86+
[[Contour]]
87+
deps = ["StaticArrays"]
88+
git-tree-sha1 = "9f02045d934dc030edad45944ea80dbd1f0ebea7"
89+
uuid = "d38c429a-6771-53c6-b99e-75d170b6e991"
90+
version = "0.5.7"
91+
8692
[[Crayons]]
8793
git-tree-sha1 = "b618084b49e78985ffa8422f32b9838e397b9fc2"
8894
uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"
@@ -148,9 +154,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
148154

149155
[[Distributions]]
150156
deps = ["ChainRulesCore", "DensityInterface", "FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns", "Test"]
151-
git-tree-sha1 = "6a8dc9f82e5ce28279b6e3e2cea9421154f5bd0d"
157+
git-tree-sha1 = "08f8555cb66936b871dcfdad09a4f89e754181db"
152158
uuid = "31c24e10-a181-5473-b8eb-7969acd0382f"
153-
version = "0.25.37"
159+
version = "0.25.40"
154160

155161
[[DocStringExtensions]]
156162
deps = ["LibGit2"]
@@ -182,9 +188,9 @@ version = "0.12.7"
182188

183189
[[FiniteDiff]]
184190
deps = ["ArrayInterface", "LinearAlgebra", "Requires", "SparseArrays", "StaticArrays"]
185-
git-tree-sha1 = "8b3c09b56acaf3c0e581c66638b85c8650ee9dca"
191+
git-tree-sha1 = "6eae72e9943d8992d14359c32aed5f892bda1569"
186192
uuid = "6a86dc24-6348-571c-b903-95158fe2bd41"
187-
version = "2.8.1"
193+
version = "2.10.0"
188194

189195
[[FixedPointNumbers]]
190196
deps = ["Statistics"]
@@ -200,9 +206,9 @@ version = "0.4.2"
200206

201207
[[ForwardDiff]]
202208
deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions", "StaticArrays"]
203-
git-tree-sha1 = "2b72a5624e289ee18256111657663721d59c143e"
209+
git-tree-sha1 = "1bd6fc0c344fc0cbee1f42f8d2e7ec8253dda2d2"
204210
uuid = "f6369f11-7733-5829-9624-2563aa707210"
205-
version = "0.10.24"
211+
version = "0.10.25"
206212

207213
[[Future]]
208214
deps = ["Random"]
@@ -264,9 +270,9 @@ version = "1.0.0"
264270

265271
[[JLLWrappers]]
266272
deps = ["Preferences"]
267-
git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e"
273+
git-tree-sha1 = "22df5b96feef82434b07327e2d3c770a9b21e023"
268274
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
269-
version = "1.3.0"
275+
version = "1.4.0"
270276

271277
[[JLSO]]
272278
deps = ["BSON", "CodecZlib", "FilePathsBase", "Memento", "Pkg", "Serialization"]
@@ -349,9 +355,9 @@ version = "0.17.0"
349355

350356
[[MLJBase]]
351357
deps = ["CategoricalArrays", "CategoricalDistributions", "ComputationalResources", "Dates", "DelimitedFiles", "Distributed", "Distributions", "InteractiveUtils", "InvertedIndices", "LinearAlgebra", "LossFunctions", "MLJModelInterface", "Missings", "OrderedCollections", "Parameters", "PrettyTables", "ProgressMeter", "Random", "ScientificTypes", "StatisticalTraits", "Statistics", "StatsBase", "Tables"]
352-
git-tree-sha1 = "54cae1f0bde7bbc72fe7ff42353b7880347bd0d5"
358+
git-tree-sha1 = "ebb3a834a25658ff547de621456c677abbea5d02"
353359
uuid = "a7f614a8-145f-11e9-1d2a-a57a1082229d"
354-
version = "0.19.2"
360+
version = "0.19.4"
355361

356362
[[MLJDecisionTreeInterface]]
357363
deps = ["DecisionTree", "MLJModelInterface", "Random"]
@@ -373,9 +379,9 @@ version = "0.4.1"
373379

374380
[[MLJLinearModels]]
375381
deps = ["DocStringExtensions", "IterativeSolvers", "LinearAlgebra", "LinearMaps", "MLJModelInterface", "Optim", "Parameters"]
376-
git-tree-sha1 = "dfbf4a5a8454034d21b6cfd9fd5a7960c8f7fb88"
382+
git-tree-sha1 = "6537fd96eb429c6e11a03c5910880c6da1837488"
377383
uuid = "6ee0df7b-362f-4a72-a706-9e79364fb692"
378-
version = "0.5.7"
384+
version = "0.6.0"
379385

380386
[[MLJModelInterface]]
381387
deps = ["Random", "ScientificTypesBase", "StatisticalTraits"]
@@ -385,9 +391,9 @@ version = "1.3.5"
385391

386392
[[MLJModels]]
387393
deps = ["CategoricalArrays", "CategoricalDistributions", "Dates", "Distances", "Distributions", "InteractiveUtils", "LinearAlgebra", "MLJModelInterface", "OrderedCollections", "Parameters", "Pkg", "PrettyPrinting", "REPL", "Random", "Requires", "ScientificTypes", "StatisticalTraits", "Statistics", "StatsBase", "Tables"]
388-
git-tree-sha1 = "cecd98731368f1eb46634d1476f49332560f886f"
394+
git-tree-sha1 = "90ab49d5f63b331863183dd1937e496608c72e25"
389395
uuid = "d491faf4-2d78-11e9-2867-c94bc002c0b7"
390-
version = "0.15.1"
396+
version = "0.15.2"
391397

392398
[[MLJSerialization]]
393399
deps = ["IterationControl", "JLSO", "MLJBase", "MLJModelInterface"]
@@ -494,9 +500,9 @@ version = "0.12.3"
494500

495501
[[Parsers]]
496502
deps = ["Dates"]
497-
git-tree-sha1 = "d7fa6237da8004be601e19bd6666083056649918"
503+
git-tree-sha1 = "92f91ba9e5941fc781fecf5494ac1da87bdac775"
498504
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
499-
version = "2.1.3"
505+
version = "2.2.0"
500506

501507
[[Pkg]]
502508
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
@@ -515,9 +521,9 @@ uuid = "21216c6a-2e73-6563-6e65-726566657250"
515521
version = "1.2.3"
516522

517523
[[PrettyPrinting]]
518-
git-tree-sha1 = "a5db8a42938bc65c2679406c51a8f5fe9597c6e7"
524+
git-tree-sha1 = "4be53d093e9e37772cc89e1009e8f6ad10c4681b"
519525
uuid = "54e16d92-306c-5ea0-a30b-337be88ac337"
520-
version = "0.3.2"
526+
version = "0.4.0"
521527

522528
[[PrettyTables]]
523529
deps = ["Crayons", "Formatting", "Markdown", "Reexport", "Tables"]
@@ -561,9 +567,9 @@ version = "1.2.2"
561567

562568
[[Requires]]
563569
deps = ["UUIDs"]
564-
git-tree-sha1 = "8f82019e525f4d5c669692772a6f4b0a58b06a6a"
570+
git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7"
565571
uuid = "ae029012-a4dd-5104-9daa-d747884805df"
566-
version = "1.2.0"
572+
version = "1.3.0"
567573

568574
[[Rmath]]
569575
deps = ["Random", "Rmath_jll"]
@@ -631,15 +637,15 @@ version = "1.0.0"
631637

632638
[[Static]]
633639
deps = ["IfElse"]
634-
git-tree-sha1 = "7f5a513baec6f122401abfc8e9c074fdac54f6c1"
640+
git-tree-sha1 = "b4912cd034cdf968e06ca5f943bb54b17b97793a"
635641
uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
636-
version = "0.4.1"
642+
version = "0.5.1"
637643

638644
[[StaticArrays]]
639645
deps = ["LinearAlgebra", "Random", "Statistics"]
640-
git-tree-sha1 = "88a559da57529581472320892576a486fa2377b9"
646+
git-tree-sha1 = "2ae4fe21e97cd13efd857462c1869b73c9f61be3"
641647
uuid = "90137ffa-7385-5640-81b9-e52037218182"
642-
version = "1.3.1"
648+
version = "1.3.2"
643649

644650
[[StatisticalTraits]]
645651
deps = ["ScientificTypesBase"]
@@ -720,10 +726,10 @@ version = "1.0.2"
720726
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
721727

722728
[[UnicodePlots]]
723-
deps = ["Crayons", "Dates", "SparseArrays", "StatsBase"]
724-
git-tree-sha1 = "3cb994143aba28cfe66615702505b2d294cebd3e"
729+
deps = ["Contour", "Crayons", "Dates", "SparseArrays", "StatsBase"]
730+
git-tree-sha1 = "0efb50275f42f2795b771a4ad2c339db9760fd98"
725731
uuid = "b8865327-cd53-5732-bb35-84acbb429228"
726-
version = "2.5.1"
732+
version = "2.6.0"
727733

728734
[[Zlib_jll]]
729735
deps = ["Libdl"]

notebooks/05_composition/env/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ MLJDecisionTreeInterface = "c6f25543-311c-4c74-83dc-3ea6d1015661"
44
MLJLinearModels = "6ee0df7b-362f-4a72-a706-9e79364fb692"
55

66
[compat]
7-
julia = "1.6"
7+
julia = "1.6"

0 commit comments

Comments
 (0)