diff --git a/orca_python/configurations/full_functionality_test.json b/orca_python/configurations/full_functionality_test.json index fb949d5..99c8bc3 100644 --- a/orca_python/configurations/full_functionality_test.json +++ b/orca_python/configurations/full_functionality_test.json @@ -1,92 +1,76 @@ { - - - "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", + "car", + "contact-lenses", + "ERA", + "tae", + "winequality-red" + ], + "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": "rbf", + "degree": 3, + "gamma": 0.1, + "coef0": 0, + "C": 1, + "tol": 0.001, + "shrinking": 1 + } + }, + "SVOREX": { + "classifier": "orca_python.classifiers.SVOREX", + "parameters": { + "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 fd099b0..a90d9c8 100644 --- a/orca_python/configurations/nnop_mae_test.json +++ b/orca_python/configurations/nnop_mae_test.json @@ -1,34 +1,23 @@ { - "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": "orca_python/datasets/data", + "datasets": ["balance-scale"], + "hyperparam_cv_nfolds": 3, + "jobs": 10, + "input_preprocessing": "std", + "output_folder": "my_runs/", + "metrics": ["ccr", "mae", "mze"], + "cv_metric": "mae" + }, + "configurations": { + "NNOP-MAE": { + "classifier": "orca_python.classifiers.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..d6bbab3 100644 --- a/orca_python/configurations/nnop_mze_test.json +++ b/orca_python/configurations/nnop_mze_test.json @@ -1,34 +1,23 @@ { - "general_conf": { - - "basedir": "datasets", - "datasets": ["balance-scale", "contact-lenses", "tae", "car", "winequality-red", "ERA"], - "hyperparam_cv_nfolds": 5, + "basedir": "orca_python/datasets/data", + "datasets": ["balance-scale"], + "hyperparam_cv_nfolds": 3, "jobs": 10, "input_preprocessing": "std", "output_folder": "my_runs/", "metrics": ["ccr", "mae", "mze"], "cv_metric": "mze" - }, - - "configurations": { - - "nnop-mze": { - - "classifier": "NNPOM", + "NNOP-MZE": { + "classifier": "orca_python.classifiers.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] - } - } - } - } diff --git a/orca_python/configurations/nnop_test.json b/orca_python/configurations/nnop_test.json deleted file mode 100644 index cbb3522..0000000 --- a/orca_python/configurations/nnop_test.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - - "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": { - "epsilon_init": 0.5, - "n_hidden": 10, - "max_iter": 1000, - "lambda_value": 0 - - } - - } - - } - -} diff --git a/orca_python/configurations/nnpom_mae_test.json b/orca_python/configurations/nnpom_mae_test.json index 3de10e9..c73bb8d 100644 --- a/orca_python/configurations/nnpom_mae_test.json +++ b/orca_python/configurations/nnpom_mae_test.json @@ -1,33 +1,23 @@ { - "general_conf": { - - "basedir": "tests/test_datasets/test_nnpom_nnop_load_dataset", - "datasets": ["toy"], - "hyperparam_cv_nfolds": 5, + "basedir": "orca_python/datasets/data", + "datasets": ["balance-scale"], + "hyperparam_cv_nfolds": 3, "jobs": 10, + "input_preprocessing": "std", "output_folder": "my_runs/", "metrics": ["ccr", "mae", "mze"], - "cv_metric": "ccr" - + "cv_metric": "mae" }, - - "configurations": { - - "expectedPredictions0": { - - "classifier": "NNPOM", + "NNPOM-MAE": { + "classifier": "orca_python.classifiers.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 aa1fb3e..5bac5e1 100644 --- a/orca_python/configurations/nnpom_mze_test.json +++ b/orca_python/configurations/nnpom_mze_test.json @@ -1,34 +1,23 @@ { - "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": "orca_python/datasets/data", + "datasets": ["balance-scale"], + "hyperparam_cv_nfolds": 3, + "jobs": 10, + "input_preprocessing": "std", + "output_folder": "my_runs/", + "metrics": ["ccr", "mae", "mze"], + "cv_metric": "mze" + }, + "configurations": { + "NNPOM-MZE": { + "classifier": "orca_python.classifiers.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] - + "lambda_value": [0, 0.01, 1] } - - } - - } - + } + } } diff --git a/orca_python/configurations/orca_comparison.json b/orca_python/configurations/orca_comparison.json deleted file mode 100644 index d1a87aa..0000000 --- a/orca_python/configurations/orca_comparison.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - - - "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] - } - - }, - - "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] - } - - } - - } - - -} diff --git a/orca_python/configurations/redsvm_test.json b/orca_python/configurations/redsvm_test.json index f5ca72a..d3f6bb5 100644 --- a/orca_python/configurations/redsvm_test.json +++ b/orca_python/configurations/redsvm_test.json @@ -1,33 +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": { - - "redsvm": { - - "classifier": "REDSVM", - "parameters": { - "C": [0.1, 1, 10], - "gamma": [0.1, 1, 10] - } - - } - - } - - + "general_conf": { + "basedir": "orca_python/datasets/data", + "datasets": ["balance-scale"], + "hyperparam_cv_nfolds": 3, + "jobs": 10, + "input_preprocessing": "std", + "output_folder": "my_runs/", + "metrics": ["ccr", "mae", "mze"], + "cv_metric": "mae" + }, + "configurations": { + "REDSVM": { + "classifier": "orca_python.classifiers.REDSVM", + "parameters": { + "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/single_test.json b/orca_python/configurations/single_test.json deleted file mode 100644 index 6442da4..0000000 --- a/orca_python/configurations/single_test.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - - - "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"] - } - - } - } - - - - - } - - - - - -} diff --git a/orca_python/configurations/svmop_test.json b/orca_python/configurations/svmop_test.json new file mode 100644 index 0000000..229f4c9 --- /dev/null +++ b/orca_python/configurations/svmop_test.json @@ -0,0 +1,26 @@ +{ + "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" + }, + "configurations": { + "SVMOP": { + "classifier": "orca_python.classifiers.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..3f92e36 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": "orca_python/datasets/data", + "datasets": ["balance-scale"], + "hyperparam_cv_nfolds": 3, + "jobs": 10, + "input_preprocessing": "std", + "output_folder": "my_runs/", + "metrics": ["ccr", "mae", "mze"], + "cv_metric": "mae" + }, + "configurations": { + "SVOREX": { + "classifier": "orca_python.classifiers.SVOREX", + "parameters": { + "kernel": "gaussian", + "C": [0.001, 0.01, 0.1, 1, 10, 100, 1000], + "kappa": [0.001, 0.01, 0.1, 1, 10, 100, 1000] + } + } + } }