Update app.py

app.py

@@ -13,12 +13,14 @@ def test(input_json):
     except json.JSONDecodeError:
         inputs = json.loads(input_json.replace("'", '"'))
 
-    # Accessing the 'a_list' string and converting it to a list of integers
+    # Accessing the 'a_list' string 
     ids_index = inputs['input']['ids_list']
-
+    weightsNames = inputs['input']["weights_names"]
+    
     # Extract the datatree part which is a list of dictionaries
     matrix = inputs['input']["matrix"]
     weights = inputs['input']["weights"]
+    
 
     alpha = inputs['input']["alpha"]
     alpha = float(alpha)
@@ -31,25 +33,25 @@ def test(input_json):
     df_matrix = df_matrix.round(0).astype(int)
     df_weights = df_weights.round(0).astype(int)
     
-    def computeAccessibility (DistanceMatrix,destinationWeights, alpha = 0.0038, threshold = 600):
+    def computeAccessibility (DistanceMatrix,destinationWeights,weightsNames, alpha = 0.0038, threshold = 600):
     
         decay_factors = np.exp(-alpha * DistanceMatrix) * (DistanceMatrix <= threshold)
-        subdomainsAccessibility = pd.DataFrame(index=DistanceMatrix.index, columns=destinationWeights.columns)
+        subdomainsAccessibility = pd.DataFrame(index=DistanceMatrix.index, columns=weightsNames) #destinationWeights.columns)
                
-        for col in destinationWeights.columns:
-            subdomainsAccessibility[col] = (decay_factors * destinationWeights[col].values).sum(axis=1)
+        for col,columnName in zip(destinationWeights.columns, weightsNames):
+            subdomainsAccessibility[columnName] = (decay_factors * destinationWeights[col].values).sum(axis=1)
       
         #subdomainsAccessibility.drop(columns='commercial', inplace=True)
           
         return subdomainsAccessibility
     
-    subdomainsAccessibility = computeAccessibility(df_matrix,df_weights,alpha,threshold)
+    subdomainsAccessibility = computeAccessibility(df_matrix,df_weights,weightsNames,alpha,threshold)
     #subdomainsAccessibility.columns = [int(col) for col in subdomainsAccessibility.columns]
     #subdomainsAccessibility_sorted = subdomainsAccessibility.sort_index(axis=1)
     subdomainsAccessibility_dictionary = subdomainsAccessibility.to_dict('index')
     
-    subdomainsAccessibility_dictionary = {outer_key: dict(sorted(inner_dict.items(), key=lambda x: int(x[0])))
-        for outer_key, inner_dict in subdomainsAccessibility_dictionary.items()}
+    #subdomainsAccessibility_dictionary = {outer_key: dict(sorted(inner_dict.items(), key=lambda x: int(x[0])))
+    #    for outer_key, inner_dict in subdomainsAccessibility_dictionary.items()}
     #        subdomainsAccessibility.columns = [int(col) for col in subdomainsAccessibility.columns]
     #    subdomainsAccessibility = subdomainsAccessibility.sort_index(axis=1)
 
@@ -59,9 +61,12 @@ def test(input_json):
         "subdomainsAccessibility_dictionary": subdomainsAccessibility_dictionary
     }
 
+    """
     for key, subdict in output['subdomainsAccessibility_dictionary'].items():
         ordered = OrderedDict(sorted(subdict.items(), key=lambda x: int(x[0])))
         output['subdomainsAccessibility_dictionary'][key] = ordered
+
+    """
     
     return json.dumps(output)