Spaces:
Running
Running
Update app.py
Browse files
app.py
CHANGED
@@ -245,17 +245,15 @@ def create_random_portfolio(Total_Sample_Size, raw_baselines, field_growth):
|
|
245 |
if max_var <= 10:
|
246 |
ranges_dict['g_range'] = round(max_var)
|
247 |
elif max_var > 10 and max_var <= 16:
|
248 |
-
ranges_dict['
|
249 |
elif max_var > 16:
|
250 |
-
ranges_dict['
|
251 |
|
252 |
# Generate random portfolios
|
253 |
rng = np.random.default_rng()
|
254 |
total_elements = [2, 3, 2, 1, 1]
|
255 |
keys = ['c', 'w', 'd', 'g', 'util']
|
256 |
|
257 |
-
st.write(max_var)
|
258 |
-
|
259 |
all_choices = [rng.choice(ranges_dict[f"{key}_range"], size=(Total_Sample_Size, elem)) for key, elem in zip(keys, total_elements)]
|
260 |
RandomPortfolio = pd.DataFrame(np.hstack(all_choices), columns=['C1', 'C2', 'W1', 'W2', 'W3', 'D1', 'D2', 'G', 'UTIL'])
|
261 |
RandomPortfolio['User/Field'] = 0
|
@@ -268,9 +266,9 @@ def create_random_portfolio(Total_Sample_Size, raw_baselines, field_growth):
|
|
268 |
if max_var <= 10:
|
269 |
ranges_dict['g_range'] = round(max_var)
|
270 |
elif max_var > 10 and max_var <= 16:
|
271 |
-
ranges_dict['
|
272 |
elif max_var > 16:
|
273 |
-
ranges_dict['
|
274 |
|
275 |
# Generate random portfolios
|
276 |
rng = np.random.default_rng()
|
|
|
245 |
if max_var <= 10:
|
246 |
ranges_dict['g_range'] = round(max_var)
|
247 |
elif max_var > 10 and max_var <= 16:
|
248 |
+
ranges_dict['g_range'] = round(max_var / 1.5)
|
249 |
elif max_var > 16:
|
250 |
+
ranges_dict['g_range'] = round(max_var / 2)
|
251 |
|
252 |
# Generate random portfolios
|
253 |
rng = np.random.default_rng()
|
254 |
total_elements = [2, 3, 2, 1, 1]
|
255 |
keys = ['c', 'w', 'd', 'g', 'util']
|
256 |
|
|
|
|
|
257 |
all_choices = [rng.choice(ranges_dict[f"{key}_range"], size=(Total_Sample_Size, elem)) for key, elem in zip(keys, total_elements)]
|
258 |
RandomPortfolio = pd.DataFrame(np.hstack(all_choices), columns=['C1', 'C2', 'W1', 'W2', 'W3', 'D1', 'D2', 'G', 'UTIL'])
|
259 |
RandomPortfolio['User/Field'] = 0
|
|
|
266 |
if max_var <= 10:
|
267 |
ranges_dict['g_range'] = round(max_var)
|
268 |
elif max_var > 10 and max_var <= 16:
|
269 |
+
ranges_dict['g_range'] = round(max_var)
|
270 |
elif max_var > 16:
|
271 |
+
ranges_dict['g_range'] = round(max_var)
|
272 |
|
273 |
# Generate random portfolios
|
274 |
rng = np.random.default_rng()
|