diff --git a/.gitignore b/.gitignore index 994fe4a..0877d1d 100644 --- a/.gitignore +++ b/.gitignore @@ -47,5 +47,5 @@ hs_err_pid* # Ignore Python files -help/.ipynb_checkpoints/ -help/__pycache__/ +**.ipynb_checkpoints/ +**__pycache__/ diff --git a/help/mycbr_py_api.py b/example/mycbr_py_api.py similarity index 100% rename from help/mycbr_py_api.py rename to example/mycbr_py_api.py diff --git a/help/test_mycbr_py_api.ipynb b/example/test_mycbr_py_api.ipynb similarity index 100% rename from help/test_mycbr_py_api.ipynb rename to example/test_mycbr_py_api.ipynb diff --git a/src/test/java/no/ntnu/mycbr/rest/controller/EphemeralControllerTest.java b/src/test/java/no/ntnu/mycbr/rest/controller/EphemeralControllerTest.java index 8f8a01a..a4cbaa6 100644 --- a/src/test/java/no/ntnu/mycbr/rest/controller/EphemeralControllerTest.java +++ b/src/test/java/no/ntnu/mycbr/rest/controller/EphemeralControllerTest.java @@ -59,18 +59,18 @@ public class EphemeralControllerTest implements RetrievalCustomer { private final static String URL_PATH = "/ephemeral" + "/concepts/" + TEST_CONCEPT_ID + "/casebases/" + TEST_CASEBASE_ID + "/amalgamationFunctions/" + TEST_AMAL_FUNC_ID + "/retrievalByCaseIDs?k=-1"; - private final static String TEST_API_POST_BODY_10_CASES = "{ " + "\"query_case_id_list\": [ " + private final static String TEST_API_POST_BODY_10_CASES = "{ " + "\"queryCaseIDs\": [ " + "\"car0\", \"car2\", \"car3\", \"car4\", \"car5\", \"car6\", \"car7\", \"car8\", \"car9\"" + "], " - + "\"casebase_case_id_list\": [ " + + "\"ephemeralCaseIDs\": [ " + "\"car0\", \"car2\", \"car3\", \"car4\", \"car5\", \"car6\", \"car7\", \"car8\", \"car9\"" + "]}"; - private final static String TEST_API_POST_BODY_50_CASES = "{ " + "\"query_case_id_list\": [ " + private final static String TEST_API_POST_BODY_50_CASES = "{ " + "\"queryCaseIDs\": [ " + "\"car0\", \"car2\", \"car3\", \"car4\", \"car5\", \"car6\", \"car7\", \"car8\", \"car9\"," + "\"car10\", \"car12\", \"car13\", \"car14\", \"car15\", \"car16\", \"car17\", \"car18\", \"car19\"," + "\"car20\", \"car22\", \"car23\", \"car24\", \"car25\", \"car26\", \"car27\", \"car28\", \"car29\"," + "\"car30\", \"car32\", \"car33\", \"car34\", \"car35\", \"car36\", \"car37\", \"car38\", \"car39\"," + "\"car40\", \"car42\", \"car43\", \"car44\", \"car45\", \"car46\", \"car47\", \"car48\", \"car49\"" - + "], " + "\"casebase_case_id_list\": [ " + + "], " + "\"ephemeralCaseIDs\": [ " + "\"car0\", \"car2\", \"car3\", \"car4\", \"car5\", \"car6\", \"car7\", \"car8\", \"car9\"," + "\"car10\", \"car12\", \"car13\", \"car14\", \"car15\", \"car16\", \"car17\", \"car18\", \"car19\"," + "\"car20\", \"car22\", \"car23\", \"car24\", \"car25\", \"car26\", \"car27\", \"car28\", \"car29\"," @@ -78,7 +78,7 @@ public class EphemeralControllerTest implements RetrievalCustomer { + "\"car40\", \"car42\", \"car43\", \"car44\", \"car45\", \"car46\", \"car47\", \"car48\", \"car49\"" + "]}"; - private final static String TEST_API_POST_BODY_100_CASES = "{ " + "\"query_case_id_list\": [ " + private final static String TEST_API_POST_BODY_100_CASES = "{ " + "\"queryCaseIDs\": [ " + "\"car0\", \"car2\", \"car3\", \"car4\", \"car5\", \"car6\", \"car7\", \"car8\", \"car9\"," + "\"car10\", \"car12\", \"car13\", \"car14\", \"car15\", \"car16\", \"car17\", \"car18\", \"car19\"," + "\"car20\", \"car22\", \"car23\", \"car24\", \"car25\", \"car26\", \"car27\", \"car28\", \"car29\"," @@ -89,7 +89,7 @@ public class EphemeralControllerTest implements RetrievalCustomer { + "\"car70\", \"car72\", \"car73\", \"car74\", \"car75\", \"car76\", \"car77\", \"car78\", \"car79\"," + "\"car80\", \"car82\", \"car83\", \"car84\", \"car85\", \"car86\", \"car87\", \"car88\", \"car89\"," + "\"car90\", \"car92\", \"car93\", \"car94\", \"car95\", \"car96\", \"car97\", \"car98\", \"car99\"" - + "], " + "\"casebase_case_id_list\": [ " + + "], " + "\"ephemeralCaseIDs\": [ " + "\"car0\", \"car2\", \"car3\", \"car4\", \"car5\", \"car6\", \"car7\", \"car8\", \"car9\"," + "\"car10\", \"car12\", \"car13\", \"car14\", \"car15\", \"car16\", \"car17\", \"car18\", \"car19\"," + "\"car20\", \"car22\", \"car23\", \"car24\", \"car25\", \"car26\", \"car27\", \"car28\", \"car29\"," diff --git a/example/python/__main__.py b/util/python/__main__.py similarity index 100% rename from example/python/__main__.py rename to util/python/__main__.py diff --git a/example/python/mycbrwrapper/.DS_Store b/util/python/mycbrwrapper/.DS_Store similarity index 100% rename from example/python/mycbrwrapper/.DS_Store rename to util/python/mycbrwrapper/.DS_Store diff --git a/example/python/mycbrwrapper/__init__.py b/util/python/mycbrwrapper/__init__.py similarity index 100% rename from example/python/mycbrwrapper/__init__.py rename to util/python/mycbrwrapper/__init__.py diff --git a/example/python/mycbrwrapper/__init__.pyc b/util/python/mycbrwrapper/__init__.pyc similarity index 100% rename from example/python/mycbrwrapper/__init__.pyc rename to util/python/mycbrwrapper/__init__.pyc diff --git a/example/python/mycbrwrapper/__pycache__/__init__.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/__init__.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/__init__.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/amalgamationfunctions.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/amalgamationfunctions.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/amalgamationfunctions.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/amalgamationfunctions.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/attributes.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/attributes.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/attributes.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/attributes.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/casebases.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/casebases.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/casebases.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/casebases.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/cases.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/cases.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/cases.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/cases.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/concepts.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/concepts.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/concepts.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/concepts.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/dataset.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/dataset.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/dataset.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/dataset.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/dataset_tests.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/dataset_tests.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/dataset_tests.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/dataset_tests.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/dataset_to_cbr.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/dataset_to_cbr.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/dataset_to_cbr.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/dataset_to_cbr.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/dataset_to_models.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/dataset_to_models.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/dataset_to_models.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/dataset_to_models.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/dataset_to_sklearn.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/dataset_to_sklearn.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/dataset_to_sklearn.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/dataset_to_sklearn.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/instances.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/instances.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/instances.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/instances.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/myCBRUtil.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/myCBRUtil.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/myCBRUtil.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/myCBRUtil.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/rest.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/rest.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/rest.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/rest.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/rprop.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/rprop.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/rprop.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/rprop.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/similarityfunctions.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/similarityfunctions.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/similarityfunctions.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/similarityfunctions.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/test_amalgamationfunctions.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/test_amalgamationfunctions.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/test_amalgamationfunctions.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/test_amalgamationfunctions.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/test_base.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/test_base.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/test_base.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/test_base.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/test_concept.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/test_concept.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/test_concept.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/test_concept.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/test_dataset.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/test_dataset.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/test_dataset.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/test_dataset.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/test_dataset_to_cbr.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/test_dataset_to_cbr.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/test_dataset_to_cbr.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/test_dataset_to_cbr.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/test_dataset_to_model.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/test_dataset_to_model.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/test_dataset_to_model.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/test_dataset_to_model.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/test_dataset_to_sklearn.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/test_dataset_to_sklearn.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/test_dataset_to_sklearn.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/test_dataset_to_sklearn.cpython-36.pyc diff --git a/example/python/mycbrwrapper/__pycache__/test_similarity.cpython-36.pyc b/util/python/mycbrwrapper/__pycache__/test_similarity.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/__pycache__/test_similarity.cpython-36.pyc rename to util/python/mycbrwrapper/__pycache__/test_similarity.cpython-36.pyc diff --git a/example/python/mycbrwrapper/amalgamationfunctions.py b/util/python/mycbrwrapper/amalgamationfunctions.py similarity index 100% rename from example/python/mycbrwrapper/amalgamationfunctions.py rename to util/python/mycbrwrapper/amalgamationfunctions.py diff --git a/example/python/mycbrwrapper/amalgamationfunctions.pyc b/util/python/mycbrwrapper/amalgamationfunctions.pyc similarity index 100% rename from example/python/mycbrwrapper/amalgamationfunctions.pyc rename to util/python/mycbrwrapper/amalgamationfunctions.pyc diff --git a/example/python/mycbrwrapper/attributes.py b/util/python/mycbrwrapper/attributes.py similarity index 100% rename from example/python/mycbrwrapper/attributes.py rename to util/python/mycbrwrapper/attributes.py diff --git a/example/python/mycbrwrapper/attributes.pyc b/util/python/mycbrwrapper/attributes.pyc similarity index 100% rename from example/python/mycbrwrapper/attributes.pyc rename to util/python/mycbrwrapper/attributes.pyc diff --git a/example/python/mycbrwrapper/casebases.py b/util/python/mycbrwrapper/casebases.py similarity index 100% rename from example/python/mycbrwrapper/casebases.py rename to util/python/mycbrwrapper/casebases.py diff --git a/example/python/mycbrwrapper/casebases.pyc b/util/python/mycbrwrapper/casebases.pyc similarity index 100% rename from example/python/mycbrwrapper/casebases.pyc rename to util/python/mycbrwrapper/casebases.pyc diff --git a/example/python/mycbrwrapper/concepts.py b/util/python/mycbrwrapper/concepts.py similarity index 100% rename from example/python/mycbrwrapper/concepts.py rename to util/python/mycbrwrapper/concepts.py diff --git a/example/python/mycbrwrapper/concepts.pyc b/util/python/mycbrwrapper/concepts.pyc similarity index 100% rename from example/python/mycbrwrapper/concepts.pyc rename to util/python/mycbrwrapper/concepts.pyc diff --git a/example/python/mycbrwrapper/instances.py b/util/python/mycbrwrapper/instances.py similarity index 100% rename from example/python/mycbrwrapper/instances.py rename to util/python/mycbrwrapper/instances.py diff --git a/example/python/mycbrwrapper/instances.pyc b/util/python/mycbrwrapper/instances.pyc similarity index 100% rename from example/python/mycbrwrapper/instances.pyc rename to util/python/mycbrwrapper/instances.pyc diff --git a/example/python/mycbrwrapper/myCBRUtil.py b/util/python/mycbrwrapper/myCBRUtil.py similarity index 100% rename from example/python/mycbrwrapper/myCBRUtil.py rename to util/python/mycbrwrapper/myCBRUtil.py diff --git a/example/python/mycbrwrapper/rest.py b/util/python/mycbrwrapper/rest.py similarity index 100% rename from example/python/mycbrwrapper/rest.py rename to util/python/mycbrwrapper/rest.py diff --git a/example/python/mycbrwrapper/rest.pyc b/util/python/mycbrwrapper/rest.pyc similarity index 100% rename from example/python/mycbrwrapper/rest.pyc rename to util/python/mycbrwrapper/rest.pyc diff --git a/example/python/mycbrwrapper/similarityfunctions.py b/util/python/mycbrwrapper/similarityfunctions.py similarity index 100% rename from example/python/mycbrwrapper/similarityfunctions.py rename to util/python/mycbrwrapper/similarityfunctions.py diff --git a/example/python/mycbrwrapper/similarityfunctions.pyc b/util/python/mycbrwrapper/similarityfunctions.pyc similarity index 100% rename from example/python/mycbrwrapper/similarityfunctions.pyc rename to util/python/mycbrwrapper/similarityfunctions.pyc diff --git a/example/python/mycbrwrapper/tests/__pycache__/__init__.cpython-36.pyc b/util/python/mycbrwrapper/tests/__pycache__/__init__.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/tests/__pycache__/__init__.cpython-36.pyc rename to util/python/mycbrwrapper/tests/__pycache__/__init__.cpython-36.pyc diff --git a/example/python/mycbrwrapper/tests/__pycache__/test_amalgamationfunctions.cpython-36.pyc b/util/python/mycbrwrapper/tests/__pycache__/test_amalgamationfunctions.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/tests/__pycache__/test_amalgamationfunctions.cpython-36.pyc rename to util/python/mycbrwrapper/tests/__pycache__/test_amalgamationfunctions.cpython-36.pyc diff --git a/example/python/mycbrwrapper/tests/__pycache__/test_base.cpython-36.pyc b/util/python/mycbrwrapper/tests/__pycache__/test_base.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/tests/__pycache__/test_base.cpython-36.pyc rename to util/python/mycbrwrapper/tests/__pycache__/test_base.cpython-36.pyc diff --git a/example/python/mycbrwrapper/tests/__pycache__/test_concept.cpython-36.pyc b/util/python/mycbrwrapper/tests/__pycache__/test_concept.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/tests/__pycache__/test_concept.cpython-36.pyc rename to util/python/mycbrwrapper/tests/__pycache__/test_concept.cpython-36.pyc diff --git a/example/python/mycbrwrapper/tests/__pycache__/test_similarity.cpython-36.pyc b/util/python/mycbrwrapper/tests/__pycache__/test_similarity.cpython-36.pyc similarity index 100% rename from example/python/mycbrwrapper/tests/__pycache__/test_similarity.cpython-36.pyc rename to util/python/mycbrwrapper/tests/__pycache__/test_similarity.cpython-36.pyc diff --git a/example/python/mycbrwrapper/tests/test_amalgamationfunctions.py b/util/python/mycbrwrapper/tests/test_amalgamationfunctions.py similarity index 100% rename from example/python/mycbrwrapper/tests/test_amalgamationfunctions.py rename to util/python/mycbrwrapper/tests/test_amalgamationfunctions.py diff --git a/example/python/mycbrwrapper/tests/test_base.py b/util/python/mycbrwrapper/tests/test_base.py similarity index 100% rename from example/python/mycbrwrapper/tests/test_base.py rename to util/python/mycbrwrapper/tests/test_base.py diff --git a/example/python/mycbrwrapper/tests/test_concept.py b/util/python/mycbrwrapper/tests/test_concept.py similarity index 100% rename from example/python/mycbrwrapper/tests/test_concept.py rename to util/python/mycbrwrapper/tests/test_concept.py diff --git a/example/python/mycbrwrapper/tests/test_similarity.py b/util/python/mycbrwrapper/tests/test_similarity.py similarity index 100% rename from example/python/mycbrwrapper/tests/test_similarity.py rename to util/python/mycbrwrapper/tests/test_similarity.py