Merge pull request #38 from ntnu-ai-lab/fix_for_issue_36_and_37

Fix for the issue 36 and 37
ntnu-ai-lab · Feb 14, 2020 · 9cc1730 · 9cc1730
2 parents 0e77b8b + 7a4332f
commit 9cc1730
Show file tree

Hide file tree

Showing 56 changed files with 8 additions and 8 deletions.
diff --git 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 → example/mycbr_py_api.py b/help/mycbr_py_api.py → example/mycbr_py_api.py
diff --git a/help/test_mycbr_py_api.ipynb → example/test_mycbr_py_api.ipynb b/help/test_mycbr_py_api.ipynb → 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
@@ -59,26 +59,26 @@ 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\","
 	    + "\"car30\", \"car32\", \"car33\", \"car34\", \"car35\", \"car36\", \"car37\", \"car38\", \"car39\","
 	    + "\"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 → util/python/__main__.py b/example/python/__main__.py → util/python/__main__.py
diff --git a/example/python/mycbrwrapper/.DS_Store → util/python/mycbrwrapper/.DS_Store b/example/python/mycbrwrapper/.DS_Store → util/python/mycbrwrapper/.DS_Store
diff --git a/example/python/mycbrwrapper/__init__.py → util/python/mycbrwrapper/__init__.py b/example/python/mycbrwrapper/__init__.py → util/python/mycbrwrapper/__init__.py
diff --git a/example/python/mycbrwrapper/__init__.pyc → util/python/mycbrwrapper/__init__.pyc b/example/python/mycbrwrapper/__init__.pyc → util/python/mycbrwrapper/__init__.pyc
diff --git a/...apper/__pycache__/__init__.cpython-36.pyc → ...apper/__pycache__/__init__.cpython-36.pyc b/...apper/__pycache__/__init__.cpython-36.pyc → ...apper/__pycache__/__init__.cpython-36.pyc
diff --git a/...he__/amalgamationfunctions.cpython-36.pyc → ...he__/amalgamationfunctions.cpython-36.pyc b/...he__/amalgamationfunctions.cpython-36.pyc → ...he__/amalgamationfunctions.cpython-36.pyc
diff --git a/...per/__pycache__/attributes.cpython-36.pyc → ...per/__pycache__/attributes.cpython-36.pyc b/...per/__pycache__/attributes.cpython-36.pyc → ...per/__pycache__/attributes.cpython-36.pyc
diff --git a/...pper/__pycache__/casebases.cpython-36.pyc → ...pper/__pycache__/casebases.cpython-36.pyc b/...pper/__pycache__/casebases.cpython-36.pyc → ...pper/__pycache__/casebases.cpython-36.pyc
diff --git a/...rwrapper/__pycache__/cases.cpython-36.pyc → ...rwrapper/__pycache__/cases.cpython-36.pyc b/...rwrapper/__pycache__/cases.cpython-36.pyc → ...rwrapper/__pycache__/cases.cpython-36.pyc
diff --git a/...apper/__pycache__/concepts.cpython-36.pyc → ...apper/__pycache__/concepts.cpython-36.pyc b/...apper/__pycache__/concepts.cpython-36.pyc → ...apper/__pycache__/concepts.cpython-36.pyc
diff --git a/...rapper/__pycache__/dataset.cpython-36.pyc → ...rapper/__pycache__/dataset.cpython-36.pyc b/...rapper/__pycache__/dataset.cpython-36.pyc → ...rapper/__pycache__/dataset.cpython-36.pyc
diff --git a/.../__pycache__/dataset_tests.cpython-36.pyc → .../__pycache__/dataset_tests.cpython-36.pyc b/.../__pycache__/dataset_tests.cpython-36.pyc → .../__pycache__/dataset_tests.cpython-36.pyc
diff --git a/...__pycache__/dataset_to_cbr.cpython-36.pyc → ...__pycache__/dataset_to_cbr.cpython-36.pyc b/...__pycache__/dataset_to_cbr.cpython-36.pyc → ...__pycache__/dataset_to_cbr.cpython-36.pyc
diff --git a/...ycache__/dataset_to_models.cpython-36.pyc → ...ycache__/dataset_to_models.cpython-36.pyc b/...ycache__/dataset_to_models.cpython-36.pyc → ...ycache__/dataset_to_models.cpython-36.pyc
diff --git a/...cache__/dataset_to_sklearn.cpython-36.pyc → ...cache__/dataset_to_sklearn.cpython-36.pyc b/...cache__/dataset_to_sklearn.cpython-36.pyc → ...cache__/dataset_to_sklearn.cpython-36.pyc
diff --git a/...pper/__pycache__/instances.cpython-36.pyc → ...pper/__pycache__/instances.cpython-36.pyc b/...pper/__pycache__/instances.cpython-36.pyc → ...pper/__pycache__/instances.cpython-36.pyc
diff --git a/...pper/__pycache__/myCBRUtil.cpython-36.pyc → ...pper/__pycache__/myCBRUtil.cpython-36.pyc b/...pper/__pycache__/myCBRUtil.cpython-36.pyc → ...pper/__pycache__/myCBRUtil.cpython-36.pyc
diff --git a/...brwrapper/__pycache__/rest.cpython-36.pyc → ...brwrapper/__pycache__/rest.cpython-36.pyc b/...brwrapper/__pycache__/rest.cpython-36.pyc → ...brwrapper/__pycache__/rest.cpython-36.pyc
diff --git a/...rwrapper/__pycache__/rprop.cpython-36.pyc → ...rwrapper/__pycache__/rprop.cpython-36.pyc b/...rwrapper/__pycache__/rprop.cpython-36.pyc → ...rwrapper/__pycache__/rprop.cpython-36.pyc
diff --git a/...ache__/similarityfunctions.cpython-36.pyc → ...ache__/similarityfunctions.cpython-36.pyc b/...ache__/similarityfunctions.cpython-36.pyc → ...ache__/similarityfunctions.cpython-36.pyc
diff --git a/...test_amalgamationfunctions.cpython-36.pyc → ...test_amalgamationfunctions.cpython-36.pyc b/...test_amalgamationfunctions.cpython-36.pyc → ...test_amalgamationfunctions.cpython-36.pyc
diff --git a/...pper/__pycache__/test_base.cpython-36.pyc → ...pper/__pycache__/test_base.cpython-36.pyc b/...pper/__pycache__/test_base.cpython-36.pyc → ...pper/__pycache__/test_base.cpython-36.pyc
diff --git a/...r/__pycache__/test_concept.cpython-36.pyc → ...r/__pycache__/test_concept.cpython-36.pyc b/...r/__pycache__/test_concept.cpython-36.pyc → ...r/__pycache__/test_concept.cpython-36.pyc
diff --git a/...r/__pycache__/test_dataset.cpython-36.pyc → ...r/__pycache__/test_dataset.cpython-36.pyc b/...r/__pycache__/test_dataset.cpython-36.pyc → ...r/__pycache__/test_dataset.cpython-36.pyc
diff --git a/...ache__/test_dataset_to_cbr.cpython-36.pyc → ...ache__/test_dataset_to_cbr.cpython-36.pyc b/...ache__/test_dataset_to_cbr.cpython-36.pyc → ...ache__/test_dataset_to_cbr.cpython-36.pyc
diff --git a/...he__/test_dataset_to_model.cpython-36.pyc → ...he__/test_dataset_to_model.cpython-36.pyc b/...he__/test_dataset_to_model.cpython-36.pyc → ...he__/test_dataset_to_model.cpython-36.pyc
diff --git a/...__/test_dataset_to_sklearn.cpython-36.pyc → ...__/test_dataset_to_sklearn.cpython-36.pyc b/...__/test_dataset_to_sklearn.cpython-36.pyc → ...__/test_dataset_to_sklearn.cpython-36.pyc
diff --git a/..._pycache__/test_similarity.cpython-36.pyc → ..._pycache__/test_similarity.cpython-36.pyc b/..._pycache__/test_similarity.cpython-36.pyc → ..._pycache__/test_similarity.cpython-36.pyc
diff --git a/...hon/mycbrwrapper/amalgamationfunctions.py → ...hon/mycbrwrapper/amalgamationfunctions.py b/...hon/mycbrwrapper/amalgamationfunctions.py → ...hon/mycbrwrapper/amalgamationfunctions.py
diff --git a/...on/mycbrwrapper/amalgamationfunctions.pyc → ...on/mycbrwrapper/amalgamationfunctions.pyc b/...on/mycbrwrapper/amalgamationfunctions.pyc → ...on/mycbrwrapper/amalgamationfunctions.pyc
diff --git a/example/python/mycbrwrapper/attributes.py → util/python/mycbrwrapper/attributes.py b/example/python/mycbrwrapper/attributes.py → util/python/mycbrwrapper/attributes.py
diff --git a/example/python/mycbrwrapper/attributes.pyc → util/python/mycbrwrapper/attributes.pyc b/example/python/mycbrwrapper/attributes.pyc → util/python/mycbrwrapper/attributes.pyc
diff --git a/example/python/mycbrwrapper/casebases.py → util/python/mycbrwrapper/casebases.py b/example/python/mycbrwrapper/casebases.py → util/python/mycbrwrapper/casebases.py
diff --git a/example/python/mycbrwrapper/casebases.pyc → util/python/mycbrwrapper/casebases.pyc b/example/python/mycbrwrapper/casebases.pyc → util/python/mycbrwrapper/casebases.pyc
diff --git a/example/python/mycbrwrapper/concepts.py → util/python/mycbrwrapper/concepts.py b/example/python/mycbrwrapper/concepts.py → util/python/mycbrwrapper/concepts.py
diff --git a/example/python/mycbrwrapper/concepts.pyc → util/python/mycbrwrapper/concepts.pyc b/example/python/mycbrwrapper/concepts.pyc → util/python/mycbrwrapper/concepts.pyc
diff --git a/example/python/mycbrwrapper/instances.py → util/python/mycbrwrapper/instances.py b/example/python/mycbrwrapper/instances.py → util/python/mycbrwrapper/instances.py
diff --git a/example/python/mycbrwrapper/instances.pyc → util/python/mycbrwrapper/instances.pyc b/example/python/mycbrwrapper/instances.pyc → util/python/mycbrwrapper/instances.pyc
diff --git a/example/python/mycbrwrapper/myCBRUtil.py → util/python/mycbrwrapper/myCBRUtil.py b/example/python/mycbrwrapper/myCBRUtil.py → util/python/mycbrwrapper/myCBRUtil.py
diff --git a/example/python/mycbrwrapper/rest.py → util/python/mycbrwrapper/rest.py b/example/python/mycbrwrapper/rest.py → util/python/mycbrwrapper/rest.py
diff --git a/example/python/mycbrwrapper/rest.pyc → util/python/mycbrwrapper/rest.pyc b/example/python/mycbrwrapper/rest.pyc → util/python/mycbrwrapper/rest.pyc
diff --git a/...ython/mycbrwrapper/similarityfunctions.py → ...ython/mycbrwrapper/similarityfunctions.py b/...ython/mycbrwrapper/similarityfunctions.py → ...ython/mycbrwrapper/similarityfunctions.py
diff --git a/...thon/mycbrwrapper/similarityfunctions.pyc → ...thon/mycbrwrapper/similarityfunctions.pyc b/...thon/mycbrwrapper/similarityfunctions.pyc → ...thon/mycbrwrapper/similarityfunctions.pyc
diff --git a/...tests/__pycache__/__init__.cpython-36.pyc → ...tests/__pycache__/__init__.cpython-36.pyc b/...tests/__pycache__/__init__.cpython-36.pyc → ...tests/__pycache__/__init__.cpython-36.pyc
diff --git a/...test_amalgamationfunctions.cpython-36.pyc → ...test_amalgamationfunctions.cpython-36.pyc b/...test_amalgamationfunctions.cpython-36.pyc → ...test_amalgamationfunctions.cpython-36.pyc
diff --git a/...ests/__pycache__/test_base.cpython-36.pyc → ...ests/__pycache__/test_base.cpython-36.pyc b/...ests/__pycache__/test_base.cpython-36.pyc → ...ests/__pycache__/test_base.cpython-36.pyc
diff --git a/...s/__pycache__/test_concept.cpython-36.pyc → ...s/__pycache__/test_concept.cpython-36.pyc b/...s/__pycache__/test_concept.cpython-36.pyc → ...s/__pycache__/test_concept.cpython-36.pyc
diff --git a/..._pycache__/test_similarity.cpython-36.pyc → ..._pycache__/test_similarity.cpython-36.pyc b/..._pycache__/test_similarity.cpython-36.pyc → ..._pycache__/test_similarity.cpython-36.pyc
diff --git a/...apper/tests/test_amalgamationfunctions.py → ...apper/tests/test_amalgamationfunctions.py b/...apper/tests/test_amalgamationfunctions.py → ...apper/tests/test_amalgamationfunctions.py
diff --git a/...le/python/mycbrwrapper/tests/test_base.py → util/python/mycbrwrapper/tests/test_base.py b/...le/python/mycbrwrapper/tests/test_base.py → util/python/mycbrwrapper/tests/test_base.py
diff --git a/...python/mycbrwrapper/tests/test_concept.py → ...python/mycbrwrapper/tests/test_concept.py b/...python/mycbrwrapper/tests/test_concept.py → ...python/mycbrwrapper/tests/test_concept.py
diff --git a/...hon/mycbrwrapper/tests/test_similarity.py → ...hon/mycbrwrapper/tests/test_similarity.py b/...hon/mycbrwrapper/tests/test_similarity.py → ...hon/mycbrwrapper/tests/test_similarity.py