added MLBaste for confusion matrix, f1, roc, must still remove freq tables

quietlight

Mar 3, 2024, 12:45 AM

QPBH7QWC56HIYUJCCHKDNBN2D346UN3IOXDCIKSAATLIATLSW3YQC

Dependencies

[2] 4BTZNCRM catch up commit before starting work
[3] ZGLDIQ4G rolled back reduced and bifurcated training set used to test models before going away
[4] 3FAESP6N catch up with changes, mainly construct primary dataset
[5] NMQCXLNG catch up commit, about to do some work on prediction loop
[6] OFTU77S5 first commit
[7] E3Y55MPR added perceptual colour maps and changed get_image_from_sample
[8] NV7FXZ5Q first commit
[9] RBXUHIO2 made somn small changes and reverted them mostly

Change contents

replacement in src/Train.jl at line 27

[4.336198]→[4.6:122](∅→∅),[4.122]→[2.6:61](∅→∅)

glob_pattern = "kiwi_set_*/*/[K]/*.png" #from SSD2/PrimaryDataset 7758648 hard coded a random selection of not, 1:1
train("K1-8_Colour", 20, glob_pattern, true, 0.90, 64)

[4.336198]

[4.0]

glob_pattern = "original_set/*/[N,K]/*.png" #from SSD2/PrimaryDataset 7758648 hard coded a random selection of not, 1:1
train("K1-9_original_set", 20, glob_pattern, true, 0.90, 64)
replacement in src/Train.jl at line 51

[4.336948]→[3.6:69](∅→∅),[3.69]→[4.493:494](∅→∅),[4.493]→[4.493:494](∅→∅),[4.494]→[3.70:206](∅→∅)

images = glob(glob_pattern) |> shuffle! #|> x -> x[1:1000]

#images2 = glob("kiwi_set_*/*/N/*.png") |> shuffle! |> x -> x[1:(length(images1))]
#images = vcat(images1, images2) |> shuffle!

[4.336948]

[4.337010]

images = glob(glob_pattern) #|> shuffle! |> x -> x[1:1000]
replacement in src/Train.jl at line 256

[4.343261]→[4.343261:343285](∅→∅)

function evaluate(m, d)

[4.343261]

[4.343285]

function evaluate(m, d, c=classes)
replacement in src/Train.jl at line 270

[4.343579]→[4.343579:343702](∅→∅)

freqtable(DataFrame(targets = actual, predicts = pred), :targets, :predicts)
return accuracy, confusion_matrix

[4.343579]

[4.343702]

MLBase.confusmat(c, actual, pred)
#freqtable(DataFrame(targets = actual, predicts = pred), :targets, :predicts)
r=roc(actual, pred)
return accuracy, confusion_matrix, r
replacement in src/Train.jl at line 304

[4.344368]→[4.344368:344472](∅→∅)

@time eval, vcm = evaluate(model, test)
@info "warm up" accuracy = eval
@info "warm up" vcm

[4.344368]

[4.344472]

@time eval, vcm, vroc = evaluate(model, test)
@info "warm up accuracy" accuracy = eval
@info "warm up confusion matrix" vcm
@info "warm up f1" MLBase.f1score(vroc)
@info "warm up roc" vroc
replacement in src/Train.jl at line 316

[4.344691]→[4.344691:344774](∅→∅)

@time metric_train, train_confusion_matrix = evaluate(model, train_sample)

[4.344691]

[4.344774]

@time metric_train, train_confusion_matrix, train_roc = evaluate(model, train_sample)
edit in src/Train.jl at line 320

[4.344895]

[4.344895]

@info "warm up f1" MLBase.f1score(train_roc)
@info "warm up roc" train_roc
replacement in src/Train.jl at line 323

[4.344896]→[4.344896:344969](∅→∅)

@time metric_test, test_confusion_matrix = evaluate(model, test)

[4.344896]

[4.344969]

@time metric_test, test_confusion_matrix, test_roc = evaluate(model, test)
edit in src/Train.jl at line 326

[4.345056]

[4.345056]

f_metric = MLBase.f1score(train_roc)
@info "warm up f1" f_metric
@info "warm up roc" train_roc
replacement in src/Train.jl at line 330

[4.345057]→[4.345057:345118](∅→∅)

metric_test > a && begin
a = metric_test

[4.345057]

[4.345118]

f_metric > a && begin
a = f_metric
edit in Project.toml at line 24

[4.386213]

[4.386213]

MLBase = "f0e99cf1-93fa-52ec-9ecc-5026115318e0"
replacement in Manifest.toml at line 5

[4.10259938]→[4.2121:2179](∅→∅)

project_hash = "202275c7aad89ac52ca5906438f1043e7751e564"

[4.10259938]

[4.1017]

project_hash = "812b8675adee92e263362ac5fdcc45ef3e56ed90"
replacement in Manifest.toml at line 19

[4.2200]→[4.2200:2375](∅→∅)

deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "LinearAlgebra", "MacroTools", "Test"]
git-tree-sha1 = "cb96992f1bec110ad211b7e410e57ddf7944c16f"

[4.2200]

[4.2375]

deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "LinearAlgebra", "MacroTools", "Markdown", "Test"]
git-tree-sha1 = "c0d491ef0b135fd7d63cbc6404286bc633329425"
replacement in Manifest.toml at line 22

[4.2421]→[4.2421:2440](∅→∅)

version = "0.1.35"

[4.2421]

[4.1348]

version = "0.1.36"
edit in Manifest.toml at line 29

[4.2649]

[4.2649]

AccessorsUnitfulExt = "Unitful"
edit in Manifest.toml at line 37

[4.2962]

[4.2962]

Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
replacement in Manifest.toml at line 136

[4.10260707]→[4.5414:5473](∅→∅)

git-tree-sha1 = "679e69c611fff422038e9e21e270c4197d49d918"

[4.10260707]

[4.10260766]

git-tree-sha1 = "a44910ceb69b0d44fe262dd451ab11ead3ed0be8"
replacement in Manifest.toml at line 138

[4.10260812]→[4.5474:5494](∅→∅)

version = "0.10.12"

[4.10260812]

[4.5494]

version = "0.10.13"
replacement in Manifest.toml at line 212

[4.8476]→[4.4125:4184](∅→∅)

git-tree-sha1 = "ad25e7d21ce10e01de973cdc68ad0f850a953c52"

[4.8476]

[4.8535]

git-tree-sha1 = "575cd02e080939a33b6df6c5853d14924c08e35b"
replacement in Manifest.toml at line 214

[4.8581]→[4.4185:4204](∅→∅)

version = "1.21.1"

[4.8581]

[4.8600]

version = "1.23.0"
replacement in Manifest.toml at line 269

[4.10536]→[4.4552:4611](∅→∅)

git-tree-sha1 = "75bd5b6fc5089df449b5d35fa501c846c9b6549b"

[4.10536]

[4.10261249]

git-tree-sha1 = "c955881e3c981181362ae4088b35995446298b80"
replacement in Manifest.toml at line 271

[4.10261295]→[4.4612:4631](∅→∅)

version = "4.12.0"

[4.10261295]

[4.10261314]

version = "4.14.0"
replacement in Manifest.toml at line 342

[4.10262389]→[4.10262389:10262448](∅→∅)

git-tree-sha1 = "9b0dc525a052b9269ccc5f7f04d5b3639c65bca5"

[4.10262389]

[4.10262448]

git-tree-sha1 = "6f93ab5557fa0ffd02e3d751186f329ac21da791"
replacement in Manifest.toml at line 344

[4.10262494]→[4.10262494:10262512](∅→∅)

version = "2.5.0"

[4.10262494]

[4.10262512]

version = "2.6.0"
replacement in Manifest.toml at line 371

[4.10263456]→[4.12133:12192](∅→∅)

git-tree-sha1 = "ac67408d9ddf207de5cfa9a97e114352430f01ed"

[4.10263456]

[4.10263515]

git-tree-sha1 = "1fb174f0d48fe7d142e1109a10636bc1d14f5ac2"
replacement in Manifest.toml at line 373

[4.10263561]→[4.12193:12213](∅→∅)

version = "0.18.16"

[4.10263561]

[4.10263581]

version = "0.18.17"
replacement in Manifest.toml at line 435

[4.13365]→[4.13365:13424](∅→∅)

git-tree-sha1 = "01826e41eabf087414b1075e22395c87b2f2c97b"

[4.13365]

[4.10264953]

git-tree-sha1 = "66d082ffb6d95653b10463c3a5316f2b720adf63"
replacement in Manifest.toml at line 437

[4.10264999]→[4.13425:13443](∅→∅)

version = "0.9.1"

[4.10264999]

[4.10265017]

version = "0.10.0"
replacement in Manifest.toml at line 441

[4.10265083]→[4.13444:13503](∅→∅)

git-tree-sha1 = "08f5e30dd60123ec5e665018ed2a0b1120be448f"

[4.10265083]

[4.10265142]

git-tree-sha1 = "6e84609071cd63aa1853912c3e33c52adda0c3d8"
replacement in Manifest.toml at line 443

[4.10265188]→[4.13504:13524](∅→∅)

version = "0.9.2+0"

[4.10265188]

[4.10265208]

version = "0.10.0+0"
replacement in Manifest.toml at line 537

[4.10266231]→[4.15851:15910](∅→∅)

git-tree-sha1 = "94751652e8a52946b2d1a4646bdfc5202e71f964"

[4.10266231]

[4.10266290]

git-tree-sha1 = "cd96db4ebe96ee1063ee1deddef318c6d5844cff"
replacement in Manifest.toml at line 539

[4.10266336]→[4.15911:15929](∅→∅)

version = "0.4.4"

[4.10266336]

[4.10266354]

version = "0.5.2"
replacement in Manifest.toml at line 549

[4.16371]→[4.5259:5318](∅→∅)

git-tree-sha1 = "39a9e46b4e92d5b56c0712adeb507555a2327240"

[4.16371]

[4.16430]

git-tree-sha1 = "fd7b23aa8013a7528563d429f6eaf406f60364ed"
replacement in Manifest.toml at line 551

[4.16476]→[4.5319:5339](∅→∅)

version = "0.14.11"

[4.16476]

[4.16495]

version = "0.14.12"
edit in Manifest.toml at line 609

[4.18353]

[4.18353]

[[deps.Ghostscript_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
git-tree-sha1 = "43ba3d3c82c18d88471cfd2924931658838c9d8f"
uuid = "61579ee1-b43e-5ca0-a5da-69d92c66a64b"
version = "9.55.0+4"
replacement in Manifest.toml at line 634

[4.10267421]→[4.18987:19046](∅→∅)

git-tree-sha1 = "abbbb9ec3afd783a7cbd82ef01dcd088ea051398"

[4.10267421]

[4.10267480]

git-tree-sha1 = "ac7b73d562b8f4287c3b67b4c66a5395a19c1ae8"
replacement in Manifest.toml at line 636

[4.10267526]→[4.19047:19066](∅→∅)

version = "1.10.1"

[4.10267526]

[4.19275]

version = "1.10.2"
replacement in Manifest.toml at line 687

[4.22176]→[4.22176:22305](∅→∅)

deps = ["FileIO", "ImageCore", "ImageMagick_jll", "InteractiveUtils"]
git-tree-sha1 = "b0b765ff0b4c3ee20ce6740d843be8dfce48487c"

[4.22176]

[4.22305]

deps = ["FileIO", "ImageCore", "ImageMagick_jll", "InteractiveUtils", "Libdl", "Pkg", "Random"]
git-tree-sha1 = "5bc1cb62e0c5f1005868358db0692c994c3a13c6"
replacement in Manifest.toml at line 690

[4.22351]→[4.22351:22369](∅→∅)

version = "1.3.0"

[4.22351]

[4.22369]

version = "1.2.1"
replacement in Manifest.toml at line 693

[4.22395]→[4.22395:22536](∅→∅)

deps = ["JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pkg", "Zlib_jll", "libpng_jll"]
git-tree-sha1 = "1c0a2295cca535fabaf2029062912591e9b61987"

[4.22395]

[4.22536]

deps = ["Artifacts", "Ghostscript_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "OpenJpeg_jll", "Zlib_jll", "libpng_jll"]
git-tree-sha1 = "d65554bad8b16d9562050c67e7223abf91eaba2f"
replacement in Manifest.toml at line 696

[4.22582]→[4.22582:22606](∅→∅)

version = "6.9.10-12+3"

[4.22582]

[4.22606]

version = "6.9.13+0"
replacement in Manifest.toml at line 790

[4.26450]→[4.7282:7341](∅→∅)

git-tree-sha1 = "581191b15bcb56a2aa257e9c160085d0f128a380"

[4.26450]

[4.26536]

git-tree-sha1 = "dba9ddf07f77f60450fe5d2e2beb9854d9a49bd0"
replacement in Manifest.toml at line 792

[4.26582]→[4.7342:7396](∅→∅)

version = "0.7.9"
weakdeps = ["Random", "Statistics"]

[4.26582]

[4.26626]

version = "0.7.10"
weakdeps = ["Random", "RecipesBase", "Statistics"]
edit in Manifest.toml at line 797

[4.7434]

[4.26662]

IntervalSetsRecipesBaseExt = "RecipesBase"
replacement in Manifest.toml at line 828

[4.27021]→[4.7603:7662](∅→∅)

git-tree-sha1 = "7c0008f0b7622c6c0ee5c65cbc667b69f8a65672"

[4.27021]

[4.27080]

git-tree-sha1 = "5ea6acdd53a51d897672edb694e3cc2912f3f8a7"
replacement in Manifest.toml at line 830

[4.27126]→[4.7663:7682](∅→∅)

version = "0.4.45"

[4.27126]

[4.10268687]

version = "0.4.46"
replacement in Manifest.toml at line 852

[4.27423]→[4.27423:27482](∅→∅)

git-tree-sha1 = "60b1194df0a3298f460063de985eae7b01bc011a"

[4.27423]

[4.27482]

git-tree-sha1 = "3336abae9a713d2210bb57ab484b1e065edd7d23"
replacement in Manifest.toml at line 854

[4.27528]→[4.27528:27548](∅→∅)

version = "3.0.1+0"

[4.27528]

[4.10269054]

version = "3.0.2+0"
replacement in Manifest.toml at line 870

[4.28160]→[4.7683:7742](∅→∅)

git-tree-sha1 = "4e0cb2f5aad44dcfdc91088e85dee4ecb22c791c"

[4.28160]

[4.28219]

git-tree-sha1 = "c7753cc3febe006708ce6798482004241f7d890b"
replacement in Manifest.toml at line 872

[4.28265]→[4.7743:7762](∅→∅)

version = "0.9.16"

[4.28265]

[4.28284]

version = "0.9.17"
replacement in Manifest.toml at line 888

[4.28753]→[4.7763:7822](∅→∅)

git-tree-sha1 = "9e70165cca7459d25406367f0c55e517a9a7bfe7"

[4.28753]

[4.28812]

git-tree-sha1 = "ddab4d40513bce53c8e3157825e245224f74fae7"
replacement in Manifest.toml at line 890

[4.28858]→[4.7823:7841](∅→∅)

version = "6.5.0"

[4.28858]

[4.28876]

version = "6.6.0"
replacement in Manifest.toml at line 898

[4.29054]→[4.7842:7901](∅→∅)

git-tree-sha1 = "114e3a48f13d4c18ddd7fd6a00107b4b96f60f9c"

[4.29054]

[4.29113]

git-tree-sha1 = "88b916503aac4fb7f701bb625cd84ca5dd1677bc"
replacement in Manifest.toml at line 900

[4.29159]→[4.7902:7923](∅→∅)

version = "0.0.28+0"

[4.29159]

[4.29180]

version = "0.0.29+0"
replacement in Manifest.toml at line 955

[4.29946]→[4.29946:30110](∅→∅)

deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"]
git-tree-sha1 = "3eb79b0ca5764d4799c06699573fd8f533259713"

[4.29946]

[4.30110]

deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"]
git-tree-sha1 = "2da088d113af58221c52828a80378e16be7d037a"
replacement in Manifest.toml at line 958

[4.30156]→[4.30156:30176](∅→∅)

version = "4.4.0+0"

[4.30156]

[4.10270485]

version = "4.5.1+1"
edit in Manifest.toml at line 963

[4.10270613]

[4.10271015]

[[deps.LittleCMS_jll]]
deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll"]
git-tree-sha1 = "08ed30575ffc5651a50d3291beaf94c3e7996e55"
uuid = "d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f"
version = "2.15.0+0"
replacement in Manifest.toml at line 972

[4.10271112]→[4.10271112:10271171](∅→∅)

git-tree-sha1 = "7d6dd4e9212aebaeed356de34ccf262a3cd415aa"

[4.10271112]

[4.10271171]

git-tree-sha1 = "18144f3e9cbe9b15b070288eef858f71b291ce37"
replacement in Manifest.toml at line 974

[4.10271217]→[4.10271217:10271236](∅→∅)

version = "0.3.26"

[4.10271217]

[4.10271236]

version = "0.3.27"
edit in Manifest.toml at line 1001

[4.31082]

[4.31082]

[[deps.MLBase]]
deps = ["IterTools", "Random", "Reexport", "StatsBase"]
git-tree-sha1 = "ac79beff4257e6e80004d5aee25ffeee79d91263"
uuid = "f0e99cf1-93fa-52ec-9ecc-5026115318e0"
version = "0.9.2"
replacement in Manifest.toml at line 1093

[4.33221]→[4.8083:8142](∅→∅)

git-tree-sha1 = "d2811b435d2f571bdfdfa644bb806a66b458e186"

[4.33221]

[4.33280]

git-tree-sha1 = "877f15c331337d54cf24c797d5bcb2e48ce21221"
replacement in Manifest.toml at line 1095

[4.33326]→[4.8143:8162](∅→∅)

version = "0.9.11"

[4.33326]

[4.33345]

version = "0.9.12"
edit in Manifest.toml at line 1199

[4.10273680]

[4.10273680]

[[deps.OpenJpeg_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Libtiff_jll", "LittleCMS_jll", "libpng_jll"]
git-tree-sha1 = "8d4c87ffaf09dbdd82bcf8c939843e94dd424df2"
uuid = "643b3616-a352-519d-856d-80112ee9badc"
version = "2.5.0+0"
replacement in Manifest.toml at line 1324

[4.10276133]→[4.10276133:10276192](∅→∅)

git-tree-sha1 = "00805cd429dcb4870060ff49ef443486c262e38e"

[4.10276133]

[4.10276192]

git-tree-sha1 = "9e8fed0505b0c15b4c1295fd59ea47b411c019cf"
replacement in Manifest.toml at line 1326

[4.10276238]→[4.10276238:10276256](∅→∅)

version = "1.4.1"

[4.10276238]

[4.10276256]

version = "1.4.2"
replacement in Manifest.toml at line 1389

[4.39388]→[4.39388:39447](∅→∅)

git-tree-sha1 = "c860e84651f58ce240dd79e5d9e055d55234c35a"

[4.39388]

[4.39447]

git-tree-sha1 = "4743b43e5a9c4a2ede372de7061eed81795b12e7"
replacement in Manifest.toml at line 1391

[4.39493]→[4.39493:39511](∅→∅)

version = "1.6.2"

[4.39493]

[4.39511]

version = "1.7.0"
replacement in Manifest.toml at line 1560

[4.43518]→[4.9621:9680](∅→∅)

git-tree-sha1 = "7b0e9c14c624e435076d19aea1e5cbdec2b9ca37"

[4.43518]

[4.43577]

git-tree-sha1 = "bf074c045d3d5ffd956fa0a461da38a44685d6b2"
replacement in Manifest.toml at line 1562

[4.43623]→[4.9681:9699](∅→∅)

version = "1.9.2"

[4.43623]

[4.43641]

version = "1.9.3"
replacement in Manifest.toml at line 1598

[4.44324]→[4.44324:44419](∅→∅),[4.44419]→[4.9700:9759](∅→∅)

deps = ["Adapt", "ConstructionBase", "DataAPI", "GPUArraysCore", "StaticArraysCore", "Tables"]
git-tree-sha1 = "1b0b1205a56dc288b71b1961d48e351520702e24"

[4.44324]

[4.44478]

deps = ["ConstructionBase", "DataAPI", "Tables"]
git-tree-sha1 = "f4dc295e983502292c4c3f951dbb4e985e35b3be"
replacement in Manifest.toml at line 1601

[4.44524]→[4.9760:9779](∅→∅)

version = "0.6.17"

[4.44524]

[4.44543]

version = "0.6.18"
weakdeps = ["Adapt", "GPUArraysCore", "SparseArrays", "StaticArrays"]

[deps.StructArrays.extensions]
StructArraysAdaptExt = "Adapt"
StructArraysGPUArraysCoreExt = "GPUArraysCore"
StructArraysSparseArraysExt = "SparseArrays"
StructArraysStaticArraysExt = "StaticArrays"
replacement in Manifest.toml at line 1778

[4.48323]→[4.48323:48382](∅→∅)

git-tree-sha1 = "801cbe47eae69adc50f36c3caec4758d2650741b"

[4.48323]

[4.48382]

git-tree-sha1 = "07e470dabc5a6a4254ffebc29a1b3fc01464e105"
replacement in Manifest.toml at line 1780

[4.48428]→[4.48428:48449](∅→∅)

version = "2.12.2+0"

[4.48428]

[4.48449]

version = "2.12.5+0"
edit in Manifest.toml at line 1787

[4.48642]

[4.10284099]

[[deps.XZ_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
git-tree-sha1 = "37195dcb94a5970397ad425b95a9a26d0befce3a"
uuid = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800"
version = "5.6.0+0"
replacement in Manifest.toml at line 1840

[4.50100]→[4.50100:50159](∅→∅)

git-tree-sha1 = "93284c28274d9e75218a416c65ec49d0e0fcdf3d"

[4.50100]

[4.50159]

git-tree-sha1 = "1ea2ebe8ffa31f9c324e8c1d6e86b4165b84a024"
replacement in Manifest.toml at line 1842

[4.50205]→[4.50205:50226](∅→∅)

version = "1.6.40+0"

[4.50205]

[4.50226]

version = "1.6.43+0"