Spaces:
Sleeping
Sleeping
nastasiasnk
commited on
Update app.py
Browse files
app.py
CHANGED
@@ -208,14 +208,15 @@ def test(input_json):
|
|
208 |
|
209 |
|
210 |
|
211 |
-
|
212 |
LivabilitySubdomainsWeights = landusesToSubdomains(df_dm,df_lu_filtered,landuseMapperDict,subdomainsUnique)
|
213 |
|
|
|
214 |
WorkplacesNumber = FindWorkplacesNumber(df_dm,livabilityMapperDict,LivabilitySubdomainsWeights,subdomainsUnique)
|
215 |
|
216 |
# prepare an input weights dataframe for the parameter LivabilitySubdomainsInputs
|
217 |
LivabilitySubdomainsInputs =pd.concat([LivabilitySubdomainsWeights, WorkplacesNumber], axis=1)
|
218 |
-
|
219 |
subdomainsAccessibility = computeAccessibility(df_dm,LivabilitySubdomainsInputs,alpha,threshold)
|
220 |
artAccessibility = computeAccessibility_pointOfInterest(df_art_matrix,'ART',alpha,threshold)
|
221 |
gmtAccessibility = computeAccessibility_pointOfInterest(df_gmt_matrix,'GMT+HSR',alpha,threshold)
|
@@ -241,9 +242,9 @@ def test(input_json):
|
|
241 |
output = {
|
242 |
# "subdomainsAccessibility_dictionary": subdomainsAccessibility_dictionary,
|
243 |
# "livability_dictionary": livability_dictionary,
|
244 |
-
|
245 |
"luDomainMapper": landuseMapperDict,
|
246 |
-
"attributeMapper": livabilityMapperDict
|
247 |
# "fetchDm": dm_dictionary,
|
248 |
# "landuses":df_lu_filtered_dict
|
249 |
}
|
|
|
208 |
|
209 |
|
210 |
|
211 |
+
|
212 |
LivabilitySubdomainsWeights = landusesToSubdomains(df_dm,df_lu_filtered,landuseMapperDict,subdomainsUnique)
|
213 |
|
214 |
+
|
215 |
WorkplacesNumber = FindWorkplacesNumber(df_dm,livabilityMapperDict,LivabilitySubdomainsWeights,subdomainsUnique)
|
216 |
|
217 |
# prepare an input weights dataframe for the parameter LivabilitySubdomainsInputs
|
218 |
LivabilitySubdomainsInputs =pd.concat([LivabilitySubdomainsWeights, WorkplacesNumber], axis=1)
|
219 |
+
"""
|
220 |
subdomainsAccessibility = computeAccessibility(df_dm,LivabilitySubdomainsInputs,alpha,threshold)
|
221 |
artAccessibility = computeAccessibility_pointOfInterest(df_art_matrix,'ART',alpha,threshold)
|
222 |
gmtAccessibility = computeAccessibility_pointOfInterest(df_gmt_matrix,'GMT+HSR',alpha,threshold)
|
|
|
242 |
output = {
|
243 |
# "subdomainsAccessibility_dictionary": subdomainsAccessibility_dictionary,
|
244 |
# "livability_dictionary": livability_dictionary,
|
245 |
+
"subdomainsWeights_dictionary": LivabilitySubdomainsInputs_dictionary,
|
246 |
"luDomainMapper": landuseMapperDict,
|
247 |
+
"attributeMapper": livabilityMapperDict
|
248 |
# "fetchDm": dm_dictionary,
|
249 |
# "landuses":df_lu_filtered_dict
|
250 |
}
|