removed indentation

migrated to JSON3

Author: racinmat

Project.toml

@@ -9,7 +9,7 @@ DataDeps = "124859b0-ceae-595e-8997-d05f6a7a8dfe"
 DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
 GZip = "92fee26a-97fe-5a0c-ad85-20a5f3185b63"
-JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
 MAT = "23992714-dd62-5051-b70f-ba57cb901cac"
 PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
@@ -20,7 +20,6 @@ ColorTypes = "0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.10, 0.11"
 DataDeps = "0.3, 0.4, 0.5, 0.6, 0.7"
 FixedPointNumbers = "0.3, 0.4, 0.5, 0.6, 0.7, 0.8"
 GZip = "0.5"
-ImageCore = "0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8"
 MAT = "0.7, 0.8, 0.9, 0.10"
 PyCall = "1"
 Requires = "1"

src/Mutagenesis/Mutagenesis.jl

@@ -1,63 +1,62 @@
 export Mutagenesis
 module Mutagenesis
 
-    using DataDeps, JSON
-    using ..MLDatasets: datafile
-
-    const DEPNAME = "Mutagenesis"
-    const DATA = "data.json"
-    const METADATA = "meta.json"
-
-    function __init__()
-        ORIGINAL_LINK = "https://relational.fit.cvut.cz/dataset/Mutagenesis"
-        DATA_LINK = "https://raw.githubusercontent.com/CTUAvastLab/datasets/main/mutagenesis"
-
-        register(DataDep(
-            DEPNAME,
-            """
-            Dataset: The $DEPNAME dataset.
-            Website: $ORIGINAL_LINK
-            License: CC0
-            """,
-            "$DATA_LINK/" .* [DATA, METADATA],
-        ))
-    end
-
-    traindata(; dir = nothing) = traindata(dir)
-    testdata(; dir = nothing) = testdata(dir)
-    valdata(; dir = nothing) = valdata(dir)
-
-    function traindata(dir)
-        samples, targets, train_idxs, val_idxs, test_idxs = load_data(dir)
-        samples[train_idxs], targets[train_idxs]
-    end
-
-    function testdata(dir)
-        samples, targets, train_idxs, val_idxs, test_idxs = load_data(dir)
-        samples[test_idxs], targets[test_idxs]
-    end
-
-    function valdata(dir)
-        samples, targets, train_idxs, val_idxs, test_idxs = load_data(dir)
-        samples[val_idxs], targets[val_idxs]
-    end
-
-    function load_data(dir)
-        data_path = datafile(DEPNAME, DATA, dir)
-        metadata_path = datafile(DEPNAME, METADATA, dir)
-        samples = read_data(data_path)
-        metadata = read_metadata(metadata_path)
-        labelkey = metadata["label"]
-        targets = map(i -> i[labelkey], samples)
-        val_num = metadata["val_samples"]
-        test_num = metadata["test_samples"]
-        train_idxs = 1:length(samples)-val_num-test_num
-        val_idxs = length(samples)-val_num-test_num+1:length(samples)-test_num
-        test_idxs = length(samples)-test_num+1:length(samples)
-        samples, targets, train_idxs, val_idxs, test_idxs
-    end
-
-    read_data(path) = Vector{Dict}(open(JSON.parse, path))
-    read_metadata(path) = open(JSON.parse, path)
+using DataDeps, JSON3
+using ..MLDatasets: datafile
+
+const DEPNAME = "Mutagenesis"
+const DATA = "data.json"
+const METADATA = "meta.json"
+
+function __init__()
+    ORIGINAL_LINK = "https://relational.fit.cvut.cz/dataset/Mutagenesis"
+    DATA_LINK = "https://raw.githubusercontent.com/CTUAvastLab/datasets/main/mutagenesis"
+
+    register(DataDep(
+        DEPNAME,
+        """
+        Dataset: The $DEPNAME dataset.
+        Website: $ORIGINAL_LINK
+        License: CC0
+        """,
+        "$DATA_LINK/" .* [DATA, METADATA],
+    ))
+end
+
+traindata(; dir = nothing) = traindata(dir)
+testdata(; dir = nothing) = testdata(dir)
+valdata(; dir = nothing) = valdata(dir)
+
+function traindata(dir)
+    samples, targets, train_idxs, val_idxs, test_idxs = load_data(dir)
+    samples[train_idxs], targets[train_idxs]
+end
+
+function testdata(dir)
+    samples, targets, train_idxs, val_idxs, test_idxs = load_data(dir)
+    samples[test_idxs], targets[test_idxs]
+end
+
+function valdata(dir)
+    samples, targets, train_idxs, val_idxs, test_idxs = load_data(dir)
+    samples[val_idxs], targets[val_idxs]
+end
+
+function load_data(dir)
+    data_path = datafile(DEPNAME, DATA, dir)
+    metadata_path = datafile(DEPNAME, METADATA, dir)
+    samples = read_data(data_path)
+    metadata = read_data(metadata_path)
+    labelkey = metadata["label"]
+    targets = map(i -> i[labelkey], samples)
+    val_num = metadata["val_samples"]
+    test_num = metadata["test_samples"]
+    train_idxs = 1:length(samples)-val_num-test_num
+    val_idxs = length(samples)-val_num-test_num+1:length(samples)-test_num
+    test_idxs = length(samples)-test_num+1:length(samples)
+    samples, targets, train_idxs, val_idxs, test_idxs
+end
+
+read_data(path) = open(JSON3.read, path)
 
 end # module