Update app.py

app.py

@@ -9,6 +9,26 @@ from collections import OrderedDict
 
 
 
+#   define variables
+
+#   distance matrices
+branch_name_dm = "graph_geometry/distance_matrix"
+commit_id_dm = "cfde6f4ba4"   # ebcfc50abe/commits/cfde6f4ba4
+dm_activityNodes = "activity_node+distance_matrix_ped_mm_noEntr"
+dm_transportStops = "an_stations+distance_matrix_ped_mm_art_noEntr"
+
+#   land use attributes
+branch_name_lu = "graph_geometry/activity_nodes_with_land_use"
+commit_id_lu = "13ae6cdd30"
+
+#   livability attributes
+notion_lu_domains = "407c2fce664f4dde8940bb416780a86d"
+notion_domain_attributes = "01401b78420f4296a2449f587d4ed9c9"
+
+
+
+
+
 
 def test(input_json):
     print("Received input")
@@ -18,11 +38,12 @@ def test(input_json):
     except json.JSONDecodeError:
         inputs = json.loads(input_json.replace("'", '"'))
 
-    # Accessing input data
+
+    
+    # Accessing input data from Grasshopper
     
     matrix = inputs['input']["matrix"]
     landuses = inputs['input']["landuse_areas"]
-    
     attributeMapperDict = inputs['input']["attributeMapperDict"]
     landuseMapperDict = inputs['input']["landuseMapperDict"]
     
@@ -37,9 +58,10 @@ def test(input_json):
     df_landuses = df_landuses.round(0).astype(int)
 
 
+
+
     
     # create a mask based on the matrix size and ids, crop activity nodes to the mask
-
     mask_connected = df_matrix.index.tolist()
 
     valid_indexes = [idx for idx in mask_connected if idx in df_landuses.index]
@@ -52,10 +74,8 @@ def test(input_json):
     df_landuses_filtered = df_landuses.loc[valid_indexes]
 
 
-    # find a set of unique domains, to which subdomains are aggregated
-    
+    # find a set of unique domains, to which subdomains are aggregated    
     temp = []
-
     for key, values in attributeMapperDict.items():
       domain = attributeMapperDict[key]['domain']
       for item in domain:
@@ -72,9 +92,7 @@ def test(input_json):
 
 
     # find a list of unique subdomains, to which land uses are aggregated
-
-    temp = []
-    
+    temp = []    
     for key, values in landuseMapperDict.items():
       subdomain = str(landuseMapperDict[key])
       if subdomain != 0: 
@@ -123,14 +141,13 @@ def test(input_json):
 
 
     WorkplacesNumber = FindWorkplaces(df_matrix,attributeMapperDict,LivabilitySubdomainsWeights,subdomainsUnique)
-
-    LivabilitySubdomainsInputs =pd.concat([LivabilitySubdomainsWeights, WorkplacesNumber], axis=1)
     
-    # make a dictionary to output in grasshopper / etc
-    LivabilitySubdomainsInputs_dictionary = LivabilitySubdomainsInputs.to_dict('index')
+    # prepare an input weights dataframe for the parameter LivabilitySubdomainsInputs
+    LivabilitySubdomainsInputs =pd.concat([LivabilitySubdomainsWeights, WorkplacesNumber], axis=1)
+
     
     
-    def computeAccessibility (DistanceMatrix,weightsNames, destinationWeights=None,alpha = 0.0038, threshold = 600):
+    def computeAccessibility (DistanceMatrix, destinationWeights=None,alpha = 0.0038, threshold = 600):
     
         decay_factors = np.exp(-alpha * DistanceMatrix) * (DistanceMatrix <= threshold)
         subdomainsAccessibility = pd.DataFrame(index=DistanceMatrix.index, columns=destinationWeights.columns)
@@ -145,10 +162,9 @@ def test(input_json):
         
         return subdomainsAccessibility
     
-    subdomainsAccessibility = computeAccessibility(df_matrix,subdomainsUnique,LivabilitySubdomainsInputs,alpha,threshold)
+    subdomainsAccessibility = computeAccessibility(df_matrix,LivabilitySubdomainsInputs,alpha,threshold)
+
 
-    # make a dictionary to output in grasshopper / etc
-    subdomainsAccessibility_dictionary = subdomainsAccessibility.to_dict('index')
 
 
     def remap(value, B_min, B_max, C_min, C_max):
@@ -203,10 +219,11 @@ def test(input_json):
     
 
     livability = accessibilityToLivability(df_matrix,subdomainsAccessibility,attributeMapperDict,domainsUnique)
-    livability_dictionary = livability.to_dict('index')
-
-    #columnList = domainsUnique+subdomainsUnique
+    
 
+    livability_dictionary = livability.to_dict('index')
+    LivabilitySubdomainsInputs_dictionary = LivabilitySubdomainsInputs.to_dict('index')
+    subdomainsAccessibility_dictionary = subdomainsAccessibility.to_dict('index')
     
     # Prepare the output
     output = {