Merge remote-tracking branch 'origin/developBogdan' into developBogdan

.gitignore

@@ -4,5 +4,3 @@
 *.log
 **/env
 **/venv
-
-src/data-hub/role-stage-discovery-microservice/app/resultSimilarityDictN14992C221.json

src/data-hub/role-stage-discovery-microservice/app/main.py

@@ -14,7 +14,6 @@ LOGGER = logging.getLogger(__name__)
 #############################
 import connexion
 
-
 # load swagger config 
 app = connexion.App(__name__, specification_dir='configs/')
 app.add_api('swagger.yml')

src/data-hub/role-stage-discovery-microservice/app/similarityMain.py

@@ -32,10 +32,6 @@ from processing.similarityFiles.miscFunctions import *
 from processing.similarityFiles.dataOutput import *
 
 
-#####TEST ONLY#####
-from processing.similarityFiles.testSimilarity import *
-
-
 def main():   
     print("\nEntered Main")
 
@@ -110,9 +106,6 @@ def main():
 
     return
 
-def test():
-    testInputData()
 ##########START##########
 main()
-#test()
 #########FINISH##########

src/data-hub/role-stage-discovery-microservice/app/tests/test_cluster.py

 import unittest
 import sys
-sys.path.insert(1, '../')
+for path in ['../', './']:
+    sys.path.insert(1, path)
 
 # python -m unittest discover
 from db.entities import Cluster

src/data-hub/role-stage-discovery-microservice/app/processing/similarityFiles/testSimilarity.py → src/data-hub/role-stage-discovery-microservice/app/tests/test_similarity.py

+import unittest
+
+import sys
+for path in ['../', './', '../../../modules/']:
+    sys.path.insert(1, path)
+
 from db.entities.connected_node import NodeC
 from db.entities.connected_cluster import ClusterC
 from db.entities.connected_layer import LayerC
 
-import os
-import sys
 import math
 import datetime
 from typing import Dict
@@ -12,63 +16,54 @@ from processing.similarityFiles.dataInput import *
 from processing.similarityFiles.calculateWeights import *
 from processing.similarityFiles.calculateSimilarity import *
 from processing.similarityFiles.miscFunctions import *
-from processing.similarityFiles.dataOutput import *
 
 import json
-import requests
-
-modules_path = '../../../modules/'
-if os.path.exists(modules_path):
-    sys.path.insert(1, modules_path)
-
-from db.repository import *
-repo = Repository()
-
-
 
 
+class TestSimilarity(unittest.TestCase):
+    '''Tests the similarity calculation which works without object orientation.'''
 
-def testInputData():#ONLY FOR TESTING
-    '''
-    Only for testing, can be deleted at any time.\n
-    Served as a testing example to make sure the computations are correct
-    '''
+    def test_integration_similarityCalculation(self):
+        '''
+        Only for testing, can be deleted at any time.\n
+        Served as a testing example to make sure the computations are correct
+        '''
 
-    limitNrNodes = 100000
+        limitNrNodes = 100000
 
-    layerDict = dict()
-    print("Creating Connected_cluster dict and similarity dict")
-    inputLayerLocation=getTestLocationLayerData()
-    inputLayerTime=getTestTimeLayerData()
-    inputLayerPrice=getTestPriceLayerData()
-    
-    layerDict = populateWithNewNodesSingleLayer(inputLayerLocation,layerDict,limitNrNodes)
-    layerDict = populateWithNewNodesSingleLayer(inputLayerTime,layerDict,limitNrNodes)
-    layerDict = populateWithNewNodesSingleLayer(inputLayerPrice,layerDict,limitNrNodes)
+        layerDict = dict()
+        ("Creating Connected_cluster dict and similarity dict")
+        inputLayerLocation=getTestLocationLayerData()
+        inputLayerTime=getTestTimeLayerData()
+        inputLayerPrice=getTestPriceLayerData()
+        
+        layerDict = populateWithNewNodesSingleLayer(inputLayerLocation,layerDict,limitNrNodes)
+        layerDict = populateWithNewNodesSingleLayer(inputLayerTime,layerDict,limitNrNodes)
+        layerDict = populateWithNewNodesSingleLayer(inputLayerPrice,layerDict,limitNrNodes)
 
-    layerDict = calculateWeights(layerDict)
-    similarityDict = calculateSimilarity(layerDict)
-    print("Asserting if the calculated values are true")
+        layerDict = calculateWeights(layerDict)
+        similarityDict = calculateSimilarity(layerDict)
+        ("Asserting if the calculated values are true")
 
-    #assert x == "hello"
+        #assert x == "hello"
 
-    # SYNTAX:
-    #similarityDict[(clusterLabel1,clusterLabel2,layerOfTheClusters)][layerToWhichTheClustersAreCompared] == ExpectedSimilarityValue
-    #checking if the cluster "1" and cluster "2" from the "Location" layer have the sqrt(2) similarity values for when compared with 'Price'and 'Time'layers
-    assert similarityDict[(1,2,'Location')]['Price'] == math.sqrt(2) 
-    assert similarityDict[(1,2,'Location')]['Time'] == math.sqrt(2)
-    assert similarityDict[(1,3,'Location')]['Price'] == math.sqrt(10)
-    assert similarityDict[(1,3,'Location')]['Time'] == math.sqrt(16)
-    assert similarityDict[(2,3,'Location')]['Price'] == math.sqrt(4)
-    assert similarityDict[(2,3,'Location')]['Time'] == math.sqrt(10)
-    assert similarityDict[(4,5,'Time')]['Location'] == math.sqrt(19)
-    assert similarityDict[(4,5,'Time')]['Price'] == math.sqrt(26)
-    assert similarityDict[(6,7,'Price')]['Location'] == math.sqrt(3)
-    assert similarityDict[(6,7,'Price')]['Time'] == math.sqrt(8)
-    
-   # assert similarityDict[(1,2,'Location')]
-    print("Test Passed Succesfully")
-    return layerDict
+        # SYNTAX:
+        #similarityDict[(clusterLabel1,clusterLabel2,layerOfTheClusters)][layerToWhichTheClustersAreCompared] == ExpectedSimilarityValue
+        #checking if the cluster "1" and cluster "2" from the "Location" layer have the sqrt(2) similarity values for when compared with 'Price'and 'Time'layers
+        self.assertEqual(similarityDict[(1,2,'Location')]['Price'], math.sqrt(2))
+        self.assertEqual(similarityDict[(1,2,'Location')]['Time'], math.sqrt(2))
+        self.assertEqual(similarityDict[(1,3,'Location')]['Price'], math.sqrt(10))
+        self.assertEqual(similarityDict[(1,3,'Location')]['Time'], math.sqrt(16))
+        self.assertEqual(similarityDict[(2,3,'Location')]['Price'], math.sqrt(4))
+        self.assertEqual(similarityDict[(2,3,'Location')]['Time'], math.sqrt(10))
+        self.assertEqual(similarityDict[(4,5,'Time')]['Location'], math.sqrt(19))
+        self.assertEqual(similarityDict[(4,5,'Time')]['Price'], math.sqrt(26))
+        self.assertEqual(similarityDict[(6,7,'Price')]['Location'], math.sqrt(3))
+        self.assertEqual(similarityDict[(6,7,'Price')]['Time'], math.sqrt(8))
+        
+        # assert similarityDict[(1,2,'Location')]
+        ("Test Passed Succesfully")
+        return layerDict
 
 
 
@@ -402,3 +397,5 @@ def getTestPriceLayerData():
 
 
 
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file