From d112927858c8d24a71e789a5b105ba36f1814e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Sevilla=20Molina?= Date: Wed, 16 Jul 2025 09:04:54 +0200 Subject: [PATCH 1/8] STY: Normalize formatting in experiment config files --- .../full_functionality_test.json | 157 ++++++++---------- orca_python/configurations/nnop_mae_test.json | 52 +++--- orca_python/configurations/nnop_mze_test.json | 22 +-- orca_python/configurations/nnop_test.json | 41 ++--- .../configurations/nnpom_mae_test.json | 11 -- .../configurations/nnpom_mze_test.json | 52 +++--- .../configurations/orca_comparison.json | 74 ++++----- orca_python/configurations/redsvm_test.json | 50 +++--- orca_python/configurations/single_test.json | 65 +++----- orca_python/configurations/svorex_test.json | 52 +++--- 10 files changed, 237 insertions(+), 339 deletions(-) diff --git a/orca_python/configurations/full_functionality_test.json b/orca_python/configurations/full_functionality_test.json index fb949d5..c73c5b0 100644 --- a/orca_python/configurations/full_functionality_test.json +++ b/orca_python/configurations/full_functionality_test.json @@ -1,92 +1,69 @@ { - - - "general_conf": { - - "basedir": "orca_python/datasets/data", - "datasets": ["tae", "balance-scale", "contact-lenses"], - "hyperparam_cv_nfolds": 3, - "jobs": 10, - "input_preprocessing": "std", - "output_folder": "my_runs/", - "metrics": ["ccr", "mae", "amae", "mze"], - "cv_metric": "mae" - }, - - - "configurations": { - - "SVM": { - - "classifier": "sklearn.svm.SVC", - "parameters": { - "C": [0.001, 0.1, 1, 10, 100], - "gamma": [0.1, 1, 10] - } - }, - - - "SVMOP": { - - "classifier": "orca_python.classifiers.OrdinalDecomposition", - "parameters": { - "dtype": "ordered_partitions", - "decision_method": "frank_hall", - "base_classifier": "sklearn.svm.SVC", - "parameters": { - "C": [0.01, 0.1, 1, 10], - "gamma": [0.01, 0.1, 1, 10], - "probability": ["True"] - } - - } - }, - - - "LR": { - - "classifier": "orca_python.classifiers.OrdinalDecomposition", - "parameters": { - "dtype": ["ordered_partitions", "one_vs_next"], - "decision_method": "exponential_loss", - "base_classifier": "sklearn.linear_model.LogisticRegression", - "parameters": { - "solver": ["liblinear"], - "C": [0.01, 0.1, 1, 10], - "penalty": ["l1","l2"] - } - - } - }, - - "REDSVM": { - - "classifier": "orca_python.classifiers.REDSVM", - "parameters": { - "kernel": 2, - "degree": 3, - "gamma": 0.1, - "coef0": 0, - "C": 1, - "tol": 0.001, - "shrinking": 1 - } - - }, - - "SVOREX": { - - "classifier": "orca_python.classifiers.SVOREX", - "parameters": { - "kernel": 0, - "C": [0.1, 1, 10], - "kappa": [0.1, 1, 10], - "tol": 0.001 - } - - } - - } - - + "general_conf": { + "basedir": "orca_python/datasets/data", + "datasets": ["balance-scale", "contact-lenses", "tae"], + "hyperparam_cv_nfolds": 3, + "jobs": 10, + "input_preprocessing": "std", + "output_folder": "my_runs/", + "metrics": ["ccr", "mae", "amae", "mze"], + "cv_metric": "mae" + }, + "configurations": { + "SVM": { + "classifier": "sklearn.svm.SVC", + "parameters": { + "C": [0.001, 0.1, 1, 10, 100], + "gamma": [0.1, 1, 10] + } + }, + "SVMOP": { + "classifier": "orca_python.classifiers.OrdinalDecomposition", + "parameters": { + "dtype": "ordered_partitions", + "decision_method": "frank_hall", + "base_classifier": "sklearn.svm.SVC", + "parameters": { + "C": [0.01, 0.1, 1, 10], + "gamma": [0.01, 0.1, 1, 10], + "probability": ["True"] + } + } + }, + "LR": { + "classifier": "orca_python.classifiers.OrdinalDecomposition", + "parameters": { + "dtype": ["ordered_partitions", "one_vs_next"], + "decision_method": "exponential_loss", + "base_classifier": "sklearn.linear_model.LogisticRegression", + "parameters": { + "solver": ["liblinear"], + "C": [0.01, 0.1, 1, 10], + "penalty": ["l1","l2"] + } + + } + }, + "REDSVM": { + "classifier": "orca_python.classifiers.REDSVM", + "parameters": { + "kernel": 2, + "degree": 3, + "gamma": 0.1, + "coef0": 0, + "C": 1, + "tol": 0.001, + "shrinking": 1 + } + }, + "SVOREX": { + "classifier": "orca_python.classifiers.SVOREX", + "parameters": { + "kernel": 0, + "C": [0.1, 1, 10], + "kappa": [0.1, 1, 10], + "tol": 0.001 + } + } + } } diff --git a/orca_python/configurations/nnop_mae_test.json b/orca_python/configurations/nnop_mae_test.json index fd099b0..7f37e74 100644 --- a/orca_python/configurations/nnop_mae_test.json +++ b/orca_python/configurations/nnop_mae_test.json @@ -1,34 +1,30 @@ { - "general_conf": { - - "basedir": "datasets", - "datasets": ["balance-scale", "contact-lenses", "tae", "car", "winequality-red", "ERA"], - "hyperparam_cv_nfolds": 5, - "jobs": 10, - "input_preprocessing": "std", - "output_folder": "my_runs/", - "metrics": ["ccr", "mae", "mze"], - "cv_metric": "mae" - - }, - - - "configurations": { - - "nnop-mae": { - - "classifier": "NNOP", - "parameters": { + "basedir": "datasets", + "datasets": [ + "balance-scale", + "car", + "contact-lenses", + "ERA", + "tae", + "winequality-red" + ], + "hyperparam_cv_nfolds": 5, + "jobs": 10, + "input_preprocessing": "std", + "output_folder": "my_runs/", + "metrics": ["ccr", "mae", "mze"], + "cv_metric": "mae" + }, + "configurations": { + "nnop-mae": { + "classifier": "NNOP", + "parameters": { "epsilon_init": 0.5, - "n_hidden": [5,10,20,30,40,50], + "n_hidden": [5, 10, 20, 30, 40, 50], "max_iter": [250, 500], - "lambda_value": [0, 0.01, 1] - + "lambda_value": [0, 0.01, 1] } - - } - - } - + } + } } diff --git a/orca_python/configurations/nnop_mze_test.json b/orca_python/configurations/nnop_mze_test.json index b98f0cc..000a5bd 100644 --- a/orca_python/configurations/nnop_mze_test.json +++ b/orca_python/configurations/nnop_mze_test.json @@ -1,34 +1,30 @@ { - "general_conf": { - "basedir": "datasets", - "datasets": ["balance-scale", "contact-lenses", "tae", "car", "winequality-red", "ERA"], + "datasets": [ + "balance-scale", + "car", + "contact-lenses", + "ERA", + "tae", + "winequality-red" + ], "hyperparam_cv_nfolds": 5, "jobs": 10, "input_preprocessing": "std", "output_folder": "my_runs/", "metrics": ["ccr", "mae", "mze"], "cv_metric": "mze" - }, - - "configurations": { - "nnop-mze": { - "classifier": "NNPOM", "parameters": { "epsilon_init": 0.5, - "n_hidden": [5,10,20,30,40,50], + "n_hidden": [5, 10, 20, 30, 40, 50], "max_iter": [250, 500], "lambda_value": [0, 0.01, 1] - } - } - } - } diff --git a/orca_python/configurations/nnop_test.json b/orca_python/configurations/nnop_test.json index cbb3522..babe301 100644 --- a/orca_python/configurations/nnop_test.json +++ b/orca_python/configurations/nnop_test.json @@ -1,33 +1,22 @@ { - "general_conf": { - - "basedir": "tests/test_datasets/test_nnpom_nnop_load_dataset", - "datasets": ["toy"], - "hyperparam_cv_nfolds": 3, - "jobs": 10, - "output_folder": "my_runs/", - "metrics": ["ccr", "mae", "mze"], - "cv_metric": ["mae", "mze"] - - }, - - - "configurations": { - - "nnop": { - - "classifier": "NNOP", - "parameters": { + "basedir": "tests/test_datasets/test_nnpom_nnop_load_dataset", + "datasets": ["toy"], + "hyperparam_cv_nfolds": 3, + "jobs": 10, + "output_folder": "my_runs/", + "metrics": ["ccr", "mae", "mze"], + "cv_metric": ["mae", "mze"] + }, + "configurations": { + "nnop": { + "classifier": "NNOP", + "parameters": { "epsilon_init": 0.5, "n_hidden": 10, "max_iter": 1000, - "lambda_value": 0 - + "lambda_value": 0 } - - } - - } - + } + } } diff --git a/orca_python/configurations/nnpom_mae_test.json b/orca_python/configurations/nnpom_mae_test.json index 3de10e9..f9c8922 100644 --- a/orca_python/configurations/nnpom_mae_test.json +++ b/orca_python/configurations/nnpom_mae_test.json @@ -1,7 +1,5 @@ { - "general_conf": { - "basedir": "tests/test_datasets/test_nnpom_nnop_load_dataset", "datasets": ["toy"], "hyperparam_cv_nfolds": 5, @@ -9,25 +7,16 @@ "output_folder": "my_runs/", "metrics": ["ccr", "mae", "mze"], "cv_metric": "ccr" - }, - - "configurations": { - "expectedPredictions0": { - "classifier": "NNPOM", "parameters": { "epsilon_init": 0.5, "n_hidden": 10, "max_iter": 500, "lambda_value": 0.01 - } - } - } - } diff --git a/orca_python/configurations/nnpom_mze_test.json b/orca_python/configurations/nnpom_mze_test.json index aa1fb3e..be3ca14 100644 --- a/orca_python/configurations/nnpom_mze_test.json +++ b/orca_python/configurations/nnpom_mze_test.json @@ -1,34 +1,30 @@ { - "general_conf": { - - "basedir": "datasets", - "datasets": ["balance-scale", "contact-lenses", "tae", "car", "winequality-red", "ERA"], - "hyperparam_cv_nfolds": 5, - "jobs": 10, - "input_preprocessing": "std", - "output_folder": "my_runs/", - "metrics": ["ccr", "mae", "mze"], - "cv_metric": "mze" - - }, - - - "configurations": { - - "nnop-mze": { - - "classifier": "NNOP", - "parameters": { + "basedir": "datasets", + "datasets": [ + "balance-scale", + "car", + "contact-lenses", + "ERA", + "tae", + "winequality-red" + ], + "hyperparam_cv_nfolds": 5, + "jobs": 10, + "input_preprocessing": "std", + "output_folder": "my_runs/", + "metrics": ["ccr", "mae", "mze"], + "cv_metric": "mze" + }, + "configurations": { + "nnop-mze": { + "classifier": "NNOP", + "parameters": { "epsilon_init": 0.5, - "n_hidden": [5,10,20,30,40,50], + "n_hidden": [5, 10, 20, 30, 40, 50], "max_iter": [250, 500], - "lambda_value": [0, 0.01, 1] - + "lambda_value": [0, 0.01, 1] } - - } - - } - + } + } } diff --git a/orca_python/configurations/orca_comparison.json b/orca_python/configurations/orca_comparison.json index d1a87aa..841dfc3 100644 --- a/orca_python/configurations/orca_comparison.json +++ b/orca_python/configurations/orca_comparison.json @@ -1,43 +1,39 @@ { - - - "general_conf": { - - "basedir": "datasets/", - "datasets": ["balance-scale", "calhousing-5", "calhousing-10", "car", "census2-5", "census2-10", "contact-lenses", "ERA", "tae", "winequality-red"], - "input_preprocessing": "std", - "hyperparam_cv_nfolds": 5, - "jobs": -1, - "output_folder": "my_runs/", - "metrics": ["ccr", "mae", "mze"], - "cv_metric": "mae" - - }, - - - "configurations": { - - "redsvm": { - - "classifier": "REDSVM", - "parameters": { - "C": [0.001, 0.01, 0.1, 1, 10, 100, 1000], - "gamma": [0.001, 0.01, 0.1, 1, 10, 100, 1000] - } - + "general_conf": { + "basedir": "datasets/", + "datasets": [ + "balance-scale", + "calhousing-5", + "calhousing-10", + "car", + "census2-5", + "census2-10", + "contact-lenses", + "ERA", + "tae", + "winequality-red" + ], + "hyperparam_cv_nfolds": 5, + "jobs": -1, + "input_preprocessing": "std", + "output_folder": "my_runs/", + "metrics": ["ccr", "mae", "mze"], + "cv_metric": "mae" + }, + "configurations": { + "redsvm": { + "classifier": "REDSVM", + "parameters": { + "C": [0.001, 0.01, 0.1, 1, 10, 100, 1000], + "gamma": [0.001, 0.01, 0.1, 1, 10, 100, 1000] + } }, - "svorex": { - - "classifier": "SVOREX", - "parameters": { - "C": [0.001, 0.01, 0.1, 1, 10, 100, 1000], - "kappa": [0.001, 0.01, 0.1, 1, 10, 100, 1000] - } - - } - - } - - + "classifier": "SVOREX", + "parameters": { + "C": [0.001, 0.01, 0.1, 1, 10, 100, 1000], + "kappa": [0.001, 0.01, 0.1, 1, 10, 100, 1000] + } + } + } } diff --git a/orca_python/configurations/redsvm_test.json b/orca_python/configurations/redsvm_test.json index f5ca72a..cbc0793 100644 --- a/orca_python/configurations/redsvm_test.json +++ b/orca_python/configurations/redsvm_test.json @@ -1,33 +1,21 @@ { - - - "general_conf": { - - "basedir": "datasets/", - "datasets": ["tae", "balance-scale", "contact-lenses"], - "input_preprocessing": "std", - "hyperparam_cv_nfolds": 3, - "jobs": 10, - "output_folder": "my_runs/", - "metrics": ["ccr", "mae", "mze"], - "cv_metric": "mae" - - }, - - - "configurations": { - - "redsvm": { - - "classifier": "REDSVM", - "parameters": { - "C": [0.1, 1, 10], - "gamma": [0.1, 1, 10] - } - - } - - } - - + "general_conf": { + "basedir": "datasets/", + "datasets": ["balance-scale", "contact-lenses", "tae"], + "input_preprocessing": "std", + "hyperparam_cv_nfolds": 3, + "jobs": 10, + "output_folder": "my_runs/", + "metrics": ["ccr", "mae", "mze"], + "cv_metric": "mae" + }, + "configurations": { + "redsvm": { + "classifier": "REDSVM", + "parameters": { + "C": [0.1, 1, 10], + "gamma": [0.1, 1, 10] + } + } + } } diff --git a/orca_python/configurations/single_test.json b/orca_python/configurations/single_test.json index 6442da4..fa17a34 100644 --- a/orca_python/configurations/single_test.json +++ b/orca_python/configurations/single_test.json @@ -1,43 +1,26 @@ { - - - "general_conf": { - - "basedir": "datasets/", - "datasets": ["tae", "balance-scale", "contact-lenses"], - "hyperparam_cv_nfolds": 3, - "jobs": 10, - "output_folder": "my_runs/", - "metrics": ["ccr", "mae", "mze"], - "cv_metric": "mae" - }, - - - "configurations": { - - "SVMOP": { - - "classifier": "OrdinalDecomposition", - "parameters": { - "dtype": "ordered_partitions", - "decision_method": "frank_hall", - "base_classifier": "sklearn.svm.SVC", - "parameters": { - "C": [0.1, 1, 10], - "gamma": [0.1, 1, 10], - "probability": ["True"] - } - - } - } - - - - - } - - - - - + "general_conf": { + "basedir": "datasets/", + "datasets": ["balance-scale", "contact-lenses", "tae"], + "hyperparam_cv_nfolds": 3, + "jobs": 10, + "output_folder": "my_runs/", + "metrics": ["ccr", "mae", "mze"], + "cv_metric": "mae" + }, + "configurations": { + "SVMOP": { + "classifier": "OrdinalDecomposition", + "parameters": { + "dtype": "ordered_partitions", + "decision_method": "frank_hall", + "base_classifier": "sklearn.svm.SVC", + "parameters": { + "C": [0.1, 1, 10], + "gamma": [0.1, 1, 10], + "probability": ["True"] + } + } + } + } } diff --git a/orca_python/configurations/svorex_test.json b/orca_python/configurations/svorex_test.json index 0d29374..b16df06 100644 --- a/orca_python/configurations/svorex_test.json +++ b/orca_python/configurations/svorex_test.json @@ -1,34 +1,22 @@ { - - - "general_conf": { - - "basedir": "datasets/", - "datasets": ["tae", "balance-scale", "contact-lenses"], - "input_preprocessing": "std", - "hyperparam_cv_nfolds": 3, - "jobs": 10, - "output_folder": "my_runs/", - "metrics": ["ccr", "mae", "mze"], - "cv_metric": "mae" - - }, - - - "configurations": { - - "svorex": { - - "classifier": "SVOREX", - "parameters": { - "kernel": 0, - "C": [0.1, 1, 10], - "kappa": [0.1, 1, 10] - } - - } - - } - - + "general_conf": { + "basedir": "datasets/", + "datasets": ["balance-scale", "contact-lenses", "tae"], + "hyperparam_cv_nfolds": 3, + "jobs": 10, + "input_preprocessing": "std", + "output_folder": "my_runs/", + "metrics": ["ccr", "mae", "mze"], + "cv_metric": "mae" + }, + "configurations": { + "svorex": { + "classifier": "SVOREX", + "parameters": { + "kernel": 0, + "C": [0.1, 1, 10], + "kappa": [0.1, 1, 10] + } + } + } } From f0b2e4c1a156d5851d67ead7e1c1f172bd5093a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Sevilla=20Molina?= Date: Wed, 16 Jul 2025 09:45:18 +0200 Subject: [PATCH 2/8] REF: Fix dataset paths and update dataset list --- .../configurations/full_functionality_test.json | 9 ++++++++- orca_python/configurations/nnop_mae_test.json | 11 ++--------- orca_python/configurations/nnop_mze_test.json | 11 ++--------- orca_python/configurations/nnop_test.json | 4 ++-- orca_python/configurations/nnpom_mae_test.json | 4 ++-- orca_python/configurations/nnpom_mze_test.json | 11 ++--------- orca_python/configurations/orca_comparison.json | 6 +----- orca_python/configurations/redsvm_test.json | 4 ++-- orca_python/configurations/single_test.json | 4 ++-- orca_python/configurations/svorex_test.json | 4 ++-- 10 files changed, 25 insertions(+), 43 deletions(-) diff --git a/orca_python/configurations/full_functionality_test.json b/orca_python/configurations/full_functionality_test.json index c73c5b0..86404db 100644 --- a/orca_python/configurations/full_functionality_test.json +++ b/orca_python/configurations/full_functionality_test.json @@ -1,7 +1,14 @@ { "general_conf": { "basedir": "orca_python/datasets/data", - "datasets": ["balance-scale", "contact-lenses", "tae"], + "datasets": [ + "balance-scale", + "car", + "contact-lenses", + "ERA", + "tae", + "winequality-red" + ], "hyperparam_cv_nfolds": 3, "jobs": 10, "input_preprocessing": "std", diff --git a/orca_python/configurations/nnop_mae_test.json b/orca_python/configurations/nnop_mae_test.json index 7f37e74..d81055a 100644 --- a/orca_python/configurations/nnop_mae_test.json +++ b/orca_python/configurations/nnop_mae_test.json @@ -1,14 +1,7 @@ { "general_conf": { - "basedir": "datasets", - "datasets": [ - "balance-scale", - "car", - "contact-lenses", - "ERA", - "tae", - "winequality-red" - ], + "basedir": "orca_python/datasets/data", + "datasets": ["balance-scale"], "hyperparam_cv_nfolds": 5, "jobs": 10, "input_preprocessing": "std", diff --git a/orca_python/configurations/nnop_mze_test.json b/orca_python/configurations/nnop_mze_test.json index 000a5bd..c1d8e6d 100644 --- a/orca_python/configurations/nnop_mze_test.json +++ b/orca_python/configurations/nnop_mze_test.json @@ -1,14 +1,7 @@ { "general_conf": { - "basedir": "datasets", - "datasets": [ - "balance-scale", - "car", - "contact-lenses", - "ERA", - "tae", - "winequality-red" - ], + "basedir": "orca_python/datasets/data", + "datasets": ["balance-scale"], "hyperparam_cv_nfolds": 5, "jobs": 10, "input_preprocessing": "std", diff --git a/orca_python/configurations/nnop_test.json b/orca_python/configurations/nnop_test.json index babe301..c03bede 100644 --- a/orca_python/configurations/nnop_test.json +++ b/orca_python/configurations/nnop_test.json @@ -1,7 +1,7 @@ { "general_conf": { - "basedir": "tests/test_datasets/test_nnpom_nnop_load_dataset", - "datasets": ["toy"], + "basedir": "orca_python/datasets/data", + "datasets": ["balance-scale"], "hyperparam_cv_nfolds": 3, "jobs": 10, "output_folder": "my_runs/", diff --git a/orca_python/configurations/nnpom_mae_test.json b/orca_python/configurations/nnpom_mae_test.json index f9c8922..b356664 100644 --- a/orca_python/configurations/nnpom_mae_test.json +++ b/orca_python/configurations/nnpom_mae_test.json @@ -1,7 +1,7 @@ { "general_conf": { - "basedir": "tests/test_datasets/test_nnpom_nnop_load_dataset", - "datasets": ["toy"], + "basedir": "orca_python/datasets/data", + "datasets": ["balance-scale"], "hyperparam_cv_nfolds": 5, "jobs": 10, "output_folder": "my_runs/", diff --git a/orca_python/configurations/nnpom_mze_test.json b/orca_python/configurations/nnpom_mze_test.json index be3ca14..2d1e826 100644 --- a/orca_python/configurations/nnpom_mze_test.json +++ b/orca_python/configurations/nnpom_mze_test.json @@ -1,14 +1,7 @@ { "general_conf": { - "basedir": "datasets", - "datasets": [ - "balance-scale", - "car", - "contact-lenses", - "ERA", - "tae", - "winequality-red" - ], + "basedir": "orca_python/datasets/data", + "datasets": ["balance-scale"], "hyperparam_cv_nfolds": 5, "jobs": 10, "input_preprocessing": "std", diff --git a/orca_python/configurations/orca_comparison.json b/orca_python/configurations/orca_comparison.json index 841dfc3..f331214 100644 --- a/orca_python/configurations/orca_comparison.json +++ b/orca_python/configurations/orca_comparison.json @@ -1,13 +1,9 @@ { "general_conf": { - "basedir": "datasets/", + "basedir": "orca_python/datasets/data", "datasets": [ "balance-scale", - "calhousing-5", - "calhousing-10", "car", - "census2-5", - "census2-10", "contact-lenses", "ERA", "tae", diff --git a/orca_python/configurations/redsvm_test.json b/orca_python/configurations/redsvm_test.json index cbc0793..1b3f1ef 100644 --- a/orca_python/configurations/redsvm_test.json +++ b/orca_python/configurations/redsvm_test.json @@ -1,7 +1,7 @@ { "general_conf": { - "basedir": "datasets/", - "datasets": ["balance-scale", "contact-lenses", "tae"], + "basedir": "orca_python/datasets/data", + "datasets": ["balance-scale"], "input_preprocessing": "std", "hyperparam_cv_nfolds": 3, "jobs": 10, diff --git a/orca_python/configurations/single_test.json b/orca_python/configurations/single_test.json index fa17a34..1b2887f 100644 --- a/orca_python/configurations/single_test.json +++ b/orca_python/configurations/single_test.json @@ -1,7 +1,7 @@ { "general_conf": { - "basedir": "datasets/", - "datasets": ["balance-scale", "contact-lenses", "tae"], + "basedir": "orca_python/datasets/data", + "datasets": ["balance-scale"], "hyperparam_cv_nfolds": 3, "jobs": 10, "output_folder": "my_runs/", diff --git a/orca_python/configurations/svorex_test.json b/orca_python/configurations/svorex_test.json index b16df06..4189a42 100644 --- a/orca_python/configurations/svorex_test.json +++ b/orca_python/configurations/svorex_test.json @@ -1,7 +1,7 @@ { "general_conf": { - "basedir": "datasets/", - "datasets": ["balance-scale", "contact-lenses", "tae"], + "basedir": "orca_python/datasets/data", + "datasets": ["balance-scale"], "hyperparam_cv_nfolds": 3, "jobs": 10, "input_preprocessing": "std", From e9c0447357537e02ed2be8f687a009f595d7ffdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Sevilla=20Molina?= Date: Wed, 16 Jul 2025 09:47:11 +0200 Subject: [PATCH 3/8] REF: Rename SVMOP config file --- orca_python/configurations/{single_test.json => svmop_test.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename orca_python/configurations/{single_test.json => svmop_test.json} (100%) diff --git a/orca_python/configurations/single_test.json b/orca_python/configurations/svmop_test.json similarity index 100% rename from orca_python/configurations/single_test.json rename to orca_python/configurations/svmop_test.json From 9f541c6e48528ef54e9b691e0bef0669cfe67a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Sevilla=20Molina?= Date: Wed, 16 Jul 2025 09:52:46 +0200 Subject: [PATCH 4/8] FIX: Correct classifier names, config keys and cv_metric in config JSONs --- orca_python/configurations/nnop_mze_test.json | 2 +- orca_python/configurations/nnpom_mae_test.json | 4 ++-- orca_python/configurations/nnpom_mze_test.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/orca_python/configurations/nnop_mze_test.json b/orca_python/configurations/nnop_mze_test.json index c1d8e6d..4685436 100644 --- a/orca_python/configurations/nnop_mze_test.json +++ b/orca_python/configurations/nnop_mze_test.json @@ -11,7 +11,7 @@ }, "configurations": { "nnop-mze": { - "classifier": "NNPOM", + "classifier": "NNOP", "parameters": { "epsilon_init": 0.5, "n_hidden": [5, 10, 20, 30, 40, 50], diff --git a/orca_python/configurations/nnpom_mae_test.json b/orca_python/configurations/nnpom_mae_test.json index b356664..c431358 100644 --- a/orca_python/configurations/nnpom_mae_test.json +++ b/orca_python/configurations/nnpom_mae_test.json @@ -6,10 +6,10 @@ "jobs": 10, "output_folder": "my_runs/", "metrics": ["ccr", "mae", "mze"], - "cv_metric": "ccr" + "cv_metric": "mae" }, "configurations": { - "expectedPredictions0": { + "nnpom-mae": { "classifier": "NNPOM", "parameters": { "epsilon_init": 0.5, diff --git a/orca_python/configurations/nnpom_mze_test.json b/orca_python/configurations/nnpom_mze_test.json index 2d1e826..ad1e0b7 100644 --- a/orca_python/configurations/nnpom_mze_test.json +++ b/orca_python/configurations/nnpom_mze_test.json @@ -10,8 +10,8 @@ "cv_metric": "mze" }, "configurations": { - "nnop-mze": { - "classifier": "NNOP", + "nnpom-mze": { + "classifier": "NNPOM", "parameters": { "epsilon_init": 0.5, "n_hidden": [5, 10, 20, 30, 40, 50], From aa0bca61434d2f10a896f11247c7ff5652d70ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Sevilla=20Molina?= Date: Wed, 16 Jul 2025 10:06:17 +0200 Subject: [PATCH 5/8] MNT: Remove obsolote experiment config --- orca_python/configurations/nnop_test.json | 22 ------------ .../configurations/orca_comparison.json | 35 ------------------- 2 files changed, 57 deletions(-) delete mode 100644 orca_python/configurations/nnop_test.json delete mode 100644 orca_python/configurations/orca_comparison.json diff --git a/orca_python/configurations/nnop_test.json b/orca_python/configurations/nnop_test.json deleted file mode 100644 index c03bede..0000000 --- a/orca_python/configurations/nnop_test.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "general_conf": { - "basedir": "orca_python/datasets/data", - "datasets": ["balance-scale"], - "hyperparam_cv_nfolds": 3, - "jobs": 10, - "output_folder": "my_runs/", - "metrics": ["ccr", "mae", "mze"], - "cv_metric": ["mae", "mze"] - }, - "configurations": { - "nnop": { - "classifier": "NNOP", - "parameters": { - "epsilon_init": 0.5, - "n_hidden": 10, - "max_iter": 1000, - "lambda_value": 0 - } - } - } -} diff --git a/orca_python/configurations/orca_comparison.json b/orca_python/configurations/orca_comparison.json deleted file mode 100644 index f331214..0000000 --- a/orca_python/configurations/orca_comparison.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "general_conf": { - "basedir": "orca_python/datasets/data", - "datasets": [ - "balance-scale", - "car", - "contact-lenses", - "ERA", - "tae", - "winequality-red" - ], - "hyperparam_cv_nfolds": 5, - "jobs": -1, - "input_preprocessing": "std", - "output_folder": "my_runs/", - "metrics": ["ccr", "mae", "mze"], - "cv_metric": "mae" - }, - "configurations": { - "redsvm": { - "classifier": "REDSVM", - "parameters": { - "C": [0.001, 0.01, 0.1, 1, 10, 100, 1000], - "gamma": [0.001, 0.01, 0.1, 1, 10, 100, 1000] - } - }, - "svorex": { - "classifier": "SVOREX", - "parameters": { - "C": [0.001, 0.01, 0.1, 1, 10, 100, 1000], - "kappa": [0.001, 0.01, 0.1, 1, 10, 100, 1000] - } - } - } -} From 27bcaa16a225ac68061d2067b53800eae9ac21fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Sevilla=20Molina?= Date: Wed, 16 Jul 2025 10:13:25 +0200 Subject: [PATCH 6/8] REF: Update classifier parameters and hyperparameters --- orca_python/configurations/full_functionality_test.json | 6 +++--- orca_python/configurations/nnop_mae_test.json | 2 +- orca_python/configurations/nnop_mze_test.json | 2 +- orca_python/configurations/nnpom_mae_test.json | 9 +++++---- orca_python/configurations/nnpom_mze_test.json | 2 +- orca_python/configurations/redsvm_test.json | 7 ++++--- orca_python/configurations/svorex_test.json | 6 +++--- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/orca_python/configurations/full_functionality_test.json b/orca_python/configurations/full_functionality_test.json index 86404db..99c8bc3 100644 --- a/orca_python/configurations/full_functionality_test.json +++ b/orca_python/configurations/full_functionality_test.json @@ -46,7 +46,7 @@ "parameters": { "solver": ["liblinear"], "C": [0.01, 0.1, 1, 10], - "penalty": ["l1","l2"] + "penalty": ["l1", "l2"] } } @@ -54,7 +54,7 @@ "REDSVM": { "classifier": "orca_python.classifiers.REDSVM", "parameters": { - "kernel": 2, + "kernel": "rbf", "degree": 3, "gamma": 0.1, "coef0": 0, @@ -66,7 +66,7 @@ "SVOREX": { "classifier": "orca_python.classifiers.SVOREX", "parameters": { - "kernel": 0, + "kernel": "gaussian", "C": [0.1, 1, 10], "kappa": [0.1, 1, 10], "tol": 0.001 diff --git a/orca_python/configurations/nnop_mae_test.json b/orca_python/configurations/nnop_mae_test.json index d81055a..3645b75 100644 --- a/orca_python/configurations/nnop_mae_test.json +++ b/orca_python/configurations/nnop_mae_test.json @@ -2,7 +2,7 @@ "general_conf": { "basedir": "orca_python/datasets/data", "datasets": ["balance-scale"], - "hyperparam_cv_nfolds": 5, + "hyperparam_cv_nfolds": 3, "jobs": 10, "input_preprocessing": "std", "output_folder": "my_runs/", diff --git a/orca_python/configurations/nnop_mze_test.json b/orca_python/configurations/nnop_mze_test.json index 4685436..bda1c20 100644 --- a/orca_python/configurations/nnop_mze_test.json +++ b/orca_python/configurations/nnop_mze_test.json @@ -2,7 +2,7 @@ "general_conf": { "basedir": "orca_python/datasets/data", "datasets": ["balance-scale"], - "hyperparam_cv_nfolds": 5, + "hyperparam_cv_nfolds": 3, "jobs": 10, "input_preprocessing": "std", "output_folder": "my_runs/", diff --git a/orca_python/configurations/nnpom_mae_test.json b/orca_python/configurations/nnpom_mae_test.json index c431358..1a78c14 100644 --- a/orca_python/configurations/nnpom_mae_test.json +++ b/orca_python/configurations/nnpom_mae_test.json @@ -2,8 +2,9 @@ "general_conf": { "basedir": "orca_python/datasets/data", "datasets": ["balance-scale"], - "hyperparam_cv_nfolds": 5, + "hyperparam_cv_nfolds": 3, "jobs": 10, + "input_preprocessing": "std", "output_folder": "my_runs/", "metrics": ["ccr", "mae", "mze"], "cv_metric": "mae" @@ -13,9 +14,9 @@ "classifier": "NNPOM", "parameters": { "epsilon_init": 0.5, - "n_hidden": 10, - "max_iter": 500, - "lambda_value": 0.01 + "n_hidden": [5, 10, 20, 30, 40, 50], + "max_iter": [250, 500], + "lambda_value": [0, 0.01, 1] } } } diff --git a/orca_python/configurations/nnpom_mze_test.json b/orca_python/configurations/nnpom_mze_test.json index ad1e0b7..2165b53 100644 --- a/orca_python/configurations/nnpom_mze_test.json +++ b/orca_python/configurations/nnpom_mze_test.json @@ -2,7 +2,7 @@ "general_conf": { "basedir": "orca_python/datasets/data", "datasets": ["balance-scale"], - "hyperparam_cv_nfolds": 5, + "hyperparam_cv_nfolds": 3, "jobs": 10, "input_preprocessing": "std", "output_folder": "my_runs/", diff --git a/orca_python/configurations/redsvm_test.json b/orca_python/configurations/redsvm_test.json index 1b3f1ef..dde4b1e 100644 --- a/orca_python/configurations/redsvm_test.json +++ b/orca_python/configurations/redsvm_test.json @@ -2,9 +2,9 @@ "general_conf": { "basedir": "orca_python/datasets/data", "datasets": ["balance-scale"], - "input_preprocessing": "std", "hyperparam_cv_nfolds": 3, "jobs": 10, + "input_preprocessing": "std", "output_folder": "my_runs/", "metrics": ["ccr", "mae", "mze"], "cv_metric": "mae" @@ -13,8 +13,9 @@ "redsvm": { "classifier": "REDSVM", "parameters": { - "C": [0.1, 1, 10], - "gamma": [0.1, 1, 10] + "kernel": "rbf", + "C": [0.001, 0.01, 0.1, 1, 10, 100, 1000], + "gamma": [0.001, 0.01, 0.1, 1, 10, 100, 1000] } } } diff --git a/orca_python/configurations/svorex_test.json b/orca_python/configurations/svorex_test.json index 4189a42..bc990cd 100644 --- a/orca_python/configurations/svorex_test.json +++ b/orca_python/configurations/svorex_test.json @@ -13,9 +13,9 @@ "svorex": { "classifier": "SVOREX", "parameters": { - "kernel": 0, - "C": [0.1, 1, 10], - "kappa": [0.1, 1, 10] + "kernel": "gaussian", + "C": [0.001, 0.01, 0.1, 1, 10, 100, 1000], + "kappa": [0.001, 0.01, 0.1, 1, 10, 100, 1000] } } } From 7e721f0f387319298d6c625665c62eccf7bc00f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Sevilla=20Molina?= Date: Wed, 16 Jul 2025 10:15:39 +0200 Subject: [PATCH 7/8] REF: Update configuration names --- orca_python/configurations/nnop_mae_test.json | 2 +- orca_python/configurations/nnop_mze_test.json | 2 +- orca_python/configurations/nnpom_mze_test.json | 2 +- orca_python/configurations/redsvm_test.json | 2 +- orca_python/configurations/svorex_test.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/orca_python/configurations/nnop_mae_test.json b/orca_python/configurations/nnop_mae_test.json index 3645b75..08174f7 100644 --- a/orca_python/configurations/nnop_mae_test.json +++ b/orca_python/configurations/nnop_mae_test.json @@ -10,7 +10,7 @@ "cv_metric": "mae" }, "configurations": { - "nnop-mae": { + "NNOP-MAE": { "classifier": "NNOP", "parameters": { "epsilon_init": 0.5, diff --git a/orca_python/configurations/nnop_mze_test.json b/orca_python/configurations/nnop_mze_test.json index bda1c20..5d9bba6 100644 --- a/orca_python/configurations/nnop_mze_test.json +++ b/orca_python/configurations/nnop_mze_test.json @@ -10,7 +10,7 @@ "cv_metric": "mze" }, "configurations": { - "nnop-mze": { + "NNOP-MZE": { "classifier": "NNOP", "parameters": { "epsilon_init": 0.5, diff --git a/orca_python/configurations/nnpom_mze_test.json b/orca_python/configurations/nnpom_mze_test.json index 2165b53..35cf41b 100644 --- a/orca_python/configurations/nnpom_mze_test.json +++ b/orca_python/configurations/nnpom_mze_test.json @@ -10,7 +10,7 @@ "cv_metric": "mze" }, "configurations": { - "nnpom-mze": { + "NNPOM-MZE": { "classifier": "NNPOM", "parameters": { "epsilon_init": 0.5, diff --git a/orca_python/configurations/redsvm_test.json b/orca_python/configurations/redsvm_test.json index dde4b1e..2bcdbe0 100644 --- a/orca_python/configurations/redsvm_test.json +++ b/orca_python/configurations/redsvm_test.json @@ -10,7 +10,7 @@ "cv_metric": "mae" }, "configurations": { - "redsvm": { + "REDSVM": { "classifier": "REDSVM", "parameters": { "kernel": "rbf", diff --git a/orca_python/configurations/svorex_test.json b/orca_python/configurations/svorex_test.json index bc990cd..101dc16 100644 --- a/orca_python/configurations/svorex_test.json +++ b/orca_python/configurations/svorex_test.json @@ -10,7 +10,7 @@ "cv_metric": "mae" }, "configurations": { - "svorex": { + "SVOREX": { "classifier": "SVOREX", "parameters": { "kernel": "gaussian", From c2d823d8b450eb88684c3be53f3150acc09515ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Sevilla=20Molina?= Date: Wed, 16 Jul 2025 10:19:10 +0200 Subject: [PATCH 8/8] REF: Update classifier paths --- orca_python/configurations/nnop_mae_test.json | 2 +- orca_python/configurations/nnop_mze_test.json | 2 +- orca_python/configurations/nnpom_mae_test.json | 4 ++-- orca_python/configurations/nnpom_mze_test.json | 2 +- orca_python/configurations/redsvm_test.json | 2 +- orca_python/configurations/svmop_test.json | 2 +- orca_python/configurations/svorex_test.json | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/orca_python/configurations/nnop_mae_test.json b/orca_python/configurations/nnop_mae_test.json index 08174f7..a90d9c8 100644 --- a/orca_python/configurations/nnop_mae_test.json +++ b/orca_python/configurations/nnop_mae_test.json @@ -11,7 +11,7 @@ }, "configurations": { "NNOP-MAE": { - "classifier": "NNOP", + "classifier": "orca_python.classifiers.NNOP", "parameters": { "epsilon_init": 0.5, "n_hidden": [5, 10, 20, 30, 40, 50], diff --git a/orca_python/configurations/nnop_mze_test.json b/orca_python/configurations/nnop_mze_test.json index 5d9bba6..d6bbab3 100644 --- a/orca_python/configurations/nnop_mze_test.json +++ b/orca_python/configurations/nnop_mze_test.json @@ -11,7 +11,7 @@ }, "configurations": { "NNOP-MZE": { - "classifier": "NNOP", + "classifier": "orca_python.classifiers.NNOP", "parameters": { "epsilon_init": 0.5, "n_hidden": [5, 10, 20, 30, 40, 50], diff --git a/orca_python/configurations/nnpom_mae_test.json b/orca_python/configurations/nnpom_mae_test.json index 1a78c14..c73bb8d 100644 --- a/orca_python/configurations/nnpom_mae_test.json +++ b/orca_python/configurations/nnpom_mae_test.json @@ -10,8 +10,8 @@ "cv_metric": "mae" }, "configurations": { - "nnpom-mae": { - "classifier": "NNPOM", + "NNPOM-MAE": { + "classifier": "orca_python.classifiers.NNPOM", "parameters": { "epsilon_init": 0.5, "n_hidden": [5, 10, 20, 30, 40, 50], diff --git a/orca_python/configurations/nnpom_mze_test.json b/orca_python/configurations/nnpom_mze_test.json index 35cf41b..5bac5e1 100644 --- a/orca_python/configurations/nnpom_mze_test.json +++ b/orca_python/configurations/nnpom_mze_test.json @@ -11,7 +11,7 @@ }, "configurations": { "NNPOM-MZE": { - "classifier": "NNPOM", + "classifier": "orca_python.classifiers.NNPOM", "parameters": { "epsilon_init": 0.5, "n_hidden": [5, 10, 20, 30, 40, 50], diff --git a/orca_python/configurations/redsvm_test.json b/orca_python/configurations/redsvm_test.json index 2bcdbe0..d3f6bb5 100644 --- a/orca_python/configurations/redsvm_test.json +++ b/orca_python/configurations/redsvm_test.json @@ -11,7 +11,7 @@ }, "configurations": { "REDSVM": { - "classifier": "REDSVM", + "classifier": "orca_python.classifiers.REDSVM", "parameters": { "kernel": "rbf", "C": [0.001, 0.01, 0.1, 1, 10, 100, 1000], diff --git a/orca_python/configurations/svmop_test.json b/orca_python/configurations/svmop_test.json index 1b2887f..229f4c9 100644 --- a/orca_python/configurations/svmop_test.json +++ b/orca_python/configurations/svmop_test.json @@ -10,7 +10,7 @@ }, "configurations": { "SVMOP": { - "classifier": "OrdinalDecomposition", + "classifier": "orca_python.classifiers.OrdinalDecomposition", "parameters": { "dtype": "ordered_partitions", "decision_method": "frank_hall", diff --git a/orca_python/configurations/svorex_test.json b/orca_python/configurations/svorex_test.json index 101dc16..3f92e36 100644 --- a/orca_python/configurations/svorex_test.json +++ b/orca_python/configurations/svorex_test.json @@ -11,7 +11,7 @@ }, "configurations": { "SVOREX": { - "classifier": "SVOREX", + "classifier": "orca_python.classifiers.SVOREX", "parameters": { "kernel": "gaussian", "C": [0.001, 0.01, 0.1, 1, 10, 100, 1000],