diff --git a/assets/clut/hosek/datasetXYZ1.bin b/assets/clut/hosek/datasetXYZ1.bin new file mode 100644 index 000000000..819912ce5 Binary files /dev/null and b/assets/clut/hosek/datasetXYZ1.bin differ diff --git a/assets/clut/hosek/datasetXYZ2.bin b/assets/clut/hosek/datasetXYZ2.bin new file mode 100644 index 000000000..c15de128e Binary files /dev/null and b/assets/clut/hosek/datasetXYZ2.bin differ diff --git a/assets/clut/hosek/datasetXYZ3.bin b/assets/clut/hosek/datasetXYZ3.bin new file mode 100644 index 000000000..fc448abd6 Binary files /dev/null and b/assets/clut/hosek/datasetXYZ3.bin differ diff --git a/assets/clut/hosek/datasetXYZRad1.bin b/assets/clut/hosek/datasetXYZRad1.bin new file mode 100644 index 000000000..0f8e5d170 Binary files /dev/null and b/assets/clut/hosek/datasetXYZRad1.bin differ diff --git a/assets/clut/hosek/datasetXYZRad2.bin b/assets/clut/hosek/datasetXYZRad2.bin new file mode 100644 index 000000000..c7d2bdc77 Binary files /dev/null and b/assets/clut/hosek/datasetXYZRad2.bin differ diff --git a/assets/clut/hosek/datasetXYZRad3.bin b/assets/clut/hosek/datasetXYZRad3.bin new file mode 100644 index 000000000..bc30e27c1 Binary files /dev/null and b/assets/clut/hosek/datasetXYZRad3.bin differ diff --git a/src/net/torvald/parametricsky/datasets/DatasetCIEXYZ.kt b/src/net/torvald/parametricsky/datasets/DatasetCIEXYZ.kt index 993b2348d..0d7da948d 100644 --- a/src/net/torvald/parametricsky/datasets/DatasetCIEXYZ.kt +++ b/src/net/torvald/parametricsky/datasets/DatasetCIEXYZ.kt @@ -107,13 +107,13 @@ import kotlin.test.assertEquals object DatasetCIEXYZ { - val datasetXYZ1 = DatasetOp.readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetXYZ1.bin") - val datasetXYZ2 = DatasetOp.readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetXYZ2.bin") - val datasetXYZ3 = DatasetOp.readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetXYZ3.bin") + val datasetXYZ1 = DatasetOp.readDatasetFromFile("./assets/clut/hosek/datasetXYZ1.bin") + val datasetXYZ2 = DatasetOp.readDatasetFromFile("./assets/clut/hosek/datasetXYZ2.bin") + val datasetXYZ3 = DatasetOp.readDatasetFromFile("./assets/clut/hosek/datasetXYZ3.bin") - val datasetXYZRad1 = DatasetOp.readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetXYZRad1.bin") - val datasetXYZRad2 = DatasetOp.readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetXYZRad2.bin") - val datasetXYZRad3 = DatasetOp.readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetXYZRad3.bin") + val datasetXYZRad1 = DatasetOp.readDatasetFromFile("./assets/clut/hosek/datasetXYZRad1.bin") + val datasetXYZRad2 = DatasetOp.readDatasetFromFile("./assets/clut/hosek/datasetXYZRad2.bin") + val datasetXYZRad3 = DatasetOp.readDatasetFromFile("./assets/clut/hosek/datasetXYZRad3.bin") init { assertEquals(1080, datasetXYZ2.size, "Dataset size mismatch: expected 1080, got ${datasetXYZ2.size}") diff --git a/src/net/torvald/parametricsky/datasets/DatasetRGB.kt b/src/net/torvald/parametricsky/datasets/DatasetRGB.kt index e2d6bf07a..92a704aa5 100644 --- a/src/net/torvald/parametricsky/datasets/DatasetRGB.kt +++ b/src/net/torvald/parametricsky/datasets/DatasetRGB.kt @@ -107,13 +107,13 @@ import kotlin.test.assertEquals object DatasetRGB { - val datasetRGB1 = DatasetOp.readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRGB1.bin") - val datasetRGB2 = DatasetOp.readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRGB2.bin") - val datasetRGB3 = DatasetOp.readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRGB3.bin") + val datasetRGB1 = DatasetOp.readDatasetFromFile("./assets/clut/hosek/datasetRGB1.bin") + val datasetRGB2 = DatasetOp.readDatasetFromFile("./assets/clut/hosek/datasetRGB2.bin") + val datasetRGB3 = DatasetOp.readDatasetFromFile("./assets/clut/hosek/datasetRGB3.bin") - val datasetRGBRad1 = DatasetOp.readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRGBRad1.bin") - val datasetRGBRad2 = DatasetOp.readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRGBRad2.bin") - val datasetRGBRad3 = DatasetOp.readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRGBRad3.bin") + val datasetRGBRad1 = DatasetOp.readDatasetFromFile("./assets/clut/hosek/datasetRGBRad1.bin") + val datasetRGBRad2 = DatasetOp.readDatasetFromFile("./assets/clut/hosek/datasetRGBRad2.bin") + val datasetRGBRad3 = DatasetOp.readDatasetFromFile("./assets/clut/hosek/datasetRGBRad3.bin") init { assertEquals(1080, datasetRGB2.size, "Dataset size mismatch: expected 1080, got ${datasetRGB2.size}") diff --git a/src/net/torvald/parametricsky/datasets/DatasetSpectral.kt b/src/net/torvald/parametricsky/datasets/DatasetSpectral.kt index 1a39e2dd5..d5cba8ef6 100644 --- a/src/net/torvald/parametricsky/datasets/DatasetSpectral.kt +++ b/src/net/torvald/parametricsky/datasets/DatasetSpectral.kt @@ -108,41 +108,41 @@ import kotlin.test.assertEquals object DatasetSpectral { - val dataset320 = readDatasetFromFile("./work_files/skylight/hosek_model_source/dataset320.bin") - val dataset360 = readDatasetFromFile("./work_files/skylight/hosek_model_source/dataset360.bin") - val dataset400 = readDatasetFromFile("./work_files/skylight/hosek_model_source/dataset400.bin") - val dataset440 = readDatasetFromFile("./work_files/skylight/hosek_model_source/dataset440.bin") - val dataset480 = readDatasetFromFile("./work_files/skylight/hosek_model_source/dataset480.bin") - val dataset520 = readDatasetFromFile("./work_files/skylight/hosek_model_source/dataset520.bin") - val dataset560 = readDatasetFromFile("./work_files/skylight/hosek_model_source/dataset560.bin") - val dataset600 = readDatasetFromFile("./work_files/skylight/hosek_model_source/dataset600.bin") - val dataset640 = readDatasetFromFile("./work_files/skylight/hosek_model_source/dataset640.bin") - val dataset680 = readDatasetFromFile("./work_files/skylight/hosek_model_source/dataset680.bin") - val dataset720 = readDatasetFromFile("./work_files/skylight/hosek_model_source/dataset720.bin") + val dataset320 = readDatasetFromFile("./assets/clut/hosek/dataset320.bin") + val dataset360 = readDatasetFromFile("./assets/clut/hosek/dataset360.bin") + val dataset400 = readDatasetFromFile("./assets/clut/hosek/dataset400.bin") + val dataset440 = readDatasetFromFile("./assets/clut/hosek/dataset440.bin") + val dataset480 = readDatasetFromFile("./assets/clut/hosek/dataset480.bin") + val dataset520 = readDatasetFromFile("./assets/clut/hosek/dataset520.bin") + val dataset560 = readDatasetFromFile("./assets/clut/hosek/dataset560.bin") + val dataset600 = readDatasetFromFile("./assets/clut/hosek/dataset600.bin") + val dataset640 = readDatasetFromFile("./assets/clut/hosek/dataset640.bin") + val dataset680 = readDatasetFromFile("./assets/clut/hosek/dataset680.bin") + val dataset720 = readDatasetFromFile("./assets/clut/hosek/dataset720.bin") - val datasetRad320 = readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRad320.bin") - val datasetRad360 = readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRad360.bin") - val datasetRad400 = readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRad400.bin") - val datasetRad440 = readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRad440.bin") - val datasetRad480 = readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRad480.bin") - val datasetRad520 = readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRad520.bin") - val datasetRad560 = readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRad560.bin") - val datasetRad600 = readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRad600.bin") - val datasetRad640 = readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRad640.bin") - val datasetRad680 = readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRad680.bin") - val datasetRad720 = readDatasetFromFile("./work_files/skylight/hosek_model_source/datasetRad720.bin") + val datasetRad320 = readDatasetFromFile("./assets/clut/hosek/datasetRad320.bin") + val datasetRad360 = readDatasetFromFile("./assets/clut/hosek/datasetRad360.bin") + val datasetRad400 = readDatasetFromFile("./assets/clut/hosek/datasetRad400.bin") + val datasetRad440 = readDatasetFromFile("./assets/clut/hosek/datasetRad440.bin") + val datasetRad480 = readDatasetFromFile("./assets/clut/hosek/datasetRad480.bin") + val datasetRad520 = readDatasetFromFile("./assets/clut/hosek/datasetRad520.bin") + val datasetRad560 = readDatasetFromFile("./assets/clut/hosek/datasetRad560.bin") + val datasetRad600 = readDatasetFromFile("./assets/clut/hosek/datasetRad600.bin") + val datasetRad640 = readDatasetFromFile("./assets/clut/hosek/datasetRad640.bin") + val datasetRad680 = readDatasetFromFile("./assets/clut/hosek/datasetRad680.bin") + val datasetRad720 = readDatasetFromFile("./assets/clut/hosek/datasetRad720.bin") - val solarDataset320 = readDatasetFromFile("./work_files/skylight/hosek_model_source/solarDataset320.bin") - val solarDataset360 = readDatasetFromFile("./work_files/skylight/hosek_model_source/solarDataset360.bin") - val solarDataset400 = readDatasetFromFile("./work_files/skylight/hosek_model_source/solarDataset400.bin") - val solarDataset440 = readDatasetFromFile("./work_files/skylight/hosek_model_source/solarDataset440.bin") - val solarDataset480 = readDatasetFromFile("./work_files/skylight/hosek_model_source/solarDataset480.bin") - val solarDataset520 = readDatasetFromFile("./work_files/skylight/hosek_model_source/solarDataset520.bin") - val solarDataset560 = readDatasetFromFile("./work_files/skylight/hosek_model_source/solarDataset560.bin") - val solarDataset600 = readDatasetFromFile("./work_files/skylight/hosek_model_source/solarDataset600.bin") - val solarDataset640 = readDatasetFromFile("./work_files/skylight/hosek_model_source/solarDataset640.bin") - val solarDataset680 = readDatasetFromFile("./work_files/skylight/hosek_model_source/solarDataset680.bin") - val solarDataset720 = readDatasetFromFile("./work_files/skylight/hosek_model_source/solarDataset720.bin") + val solarDataset320 = readDatasetFromFile("./assets/clut/hosek/solarDataset320.bin") + val solarDataset360 = readDatasetFromFile("./assets/clut/hosek/solarDataset360.bin") + val solarDataset400 = readDatasetFromFile("./assets/clut/hosek/solarDataset400.bin") + val solarDataset440 = readDatasetFromFile("./assets/clut/hosek/solarDataset440.bin") + val solarDataset480 = readDatasetFromFile("./assets/clut/hosek/solarDataset480.bin") + val solarDataset520 = readDatasetFromFile("./assets/clut/hosek/solarDataset520.bin") + val solarDataset560 = readDatasetFromFile("./assets/clut/hosek/solarDataset560.bin") + val solarDataset600 = readDatasetFromFile("./assets/clut/hosek/solarDataset600.bin") + val solarDataset640 = readDatasetFromFile("./assets/clut/hosek/solarDataset640.bin") + val solarDataset680 = readDatasetFromFile("./assets/clut/hosek/solarDataset680.bin") + val solarDataset720 = readDatasetFromFile("./assets/clut/hosek/solarDataset720.bin") init { assertEquals(1080, dataset600.size, "Dataset size mismatch - expected 1080, got ${dataset600.size}")