nastasiasnk commited on
Commit
c1893ae
·
verified ·
1 Parent(s): 975b5cb

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +4 -4
app.py CHANGED
@@ -127,7 +127,7 @@ def test(input_json):
127
  LivabilitySubdomainsInputs =pd.concat([LivabilitySubdomainsWeights, WorkplacesNumber], axis=1)
128
 
129
  # make a dictionary to output in grasshopper / etc
130
- LivabilitySubdomainsWeights_dictionary = LivabilitySubdomainsWeights.to_dict('index')
131
 
132
 
133
  def computeAccessibility (DistanceMatrix,weightsNames, destinationWeights=None,alpha = 0.0038, threshold = 600):
@@ -176,8 +176,8 @@ def test(input_json):
176
 
177
  for key, values in SubdomainAttributeDict.items():
178
  if key == 'commercial':
179
- threshold = float(SubdomainAttributeDict['commercial']['thresholds'])
180
- max_livability = float(SubdomainAttributeDict['commercial']['max_points'])
181
  livability_score = remap(subdomainsAccessibility['jobs'], 0, threshold, 0, max_livability)
182
  livability.loc[subdomainsAccessibility['jobs'] >= threshold, 'Workplaces'] = max_livability
183
  livability.loc[subdomainsAccessibility['jobs'] < threshold, 'Workplaces'] = livability_score
@@ -212,7 +212,7 @@ def test(input_json):
212
  output = {
213
  "subdomainsAccessibility_dictionary": subdomainsAccessibility_dictionary,
214
  "livability_dictionary": livability_dictionary,
215
- "subdomainsArea_dictionary": LivabilitySubdomainsWeights_dictionary
216
  }
217
 
218
 
 
127
  LivabilitySubdomainsInputs =pd.concat([LivabilitySubdomainsWeights, WorkplacesNumber], axis=1)
128
 
129
  # make a dictionary to output in grasshopper / etc
130
+ LivabilitySubdomainsInputs_dictionary = LivabilitySubdomainsInputs.to_dict('index')
131
 
132
 
133
  def computeAccessibility (DistanceMatrix,weightsNames, destinationWeights=None,alpha = 0.0038, threshold = 600):
 
176
 
177
  for key, values in SubdomainAttributeDict.items():
178
  if key == 'commercial':
179
+ threshold = float(SubdomainAttributeDict[key]['thresholds'])
180
+ max_livability = float(SubdomainAttributeDict[key]['max_points'])
181
  livability_score = remap(subdomainsAccessibility['jobs'], 0, threshold, 0, max_livability)
182
  livability.loc[subdomainsAccessibility['jobs'] >= threshold, 'Workplaces'] = max_livability
183
  livability.loc[subdomainsAccessibility['jobs'] < threshold, 'Workplaces'] = livability_score
 
212
  output = {
213
  "subdomainsAccessibility_dictionary": subdomainsAccessibility_dictionary,
214
  "livability_dictionary": livability_dictionary,
215
+ "subdomainsWeights_dictionary": LivabilitySubdomainsInputs_dictionary
216
  }
217
 
218