Spaces:
Runtime error
Runtime error
Akram Sanad
commited on
Commit
·
ebcc2b0
1
Parent(s):
fe52f62
small fix
Browse files- visualize/visualize.py +35 -12
visualize/visualize.py
CHANGED
@@ -62,8 +62,16 @@ def water_deficit(df, latitude, longitude, shading_coef=0, historic=True):
|
|
62 |
|
63 |
|
64 |
def concatenate_historic_forecast(
|
65 |
-
historic, forecast, cols_to_keep, value_period_col="forecast scénario modéré"
|
66 |
-
):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
67 |
historic["period"] = "historique"
|
68 |
forecast["period"] = value_period_col
|
69 |
historic = historic[cols_to_keep]
|
@@ -87,9 +95,14 @@ def visualize_climate(
|
|
87 |
"period",
|
88 |
],
|
89 |
):
|
90 |
-
|
91 |
-
|
92 |
-
|
|
|
|
|
|
|
|
|
|
|
93 |
concatenated_moderate = concatenated_moderate.sort_values(by=x_axis) # Ensure order
|
94 |
|
95 |
fig = go.Figure()
|
@@ -111,10 +124,14 @@ def visualize_climate(
|
|
111 |
),
|
112 |
)
|
113 |
)
|
114 |
-
|
115 |
-
|
116 |
-
|
117 |
-
|
|
|
|
|
|
|
|
|
118 |
concatenated_pessimist = concatenated_pessimist.sort_values(by=x_axis)
|
119 |
concatenated_pessimist = concatenated_pessimist[
|
120 |
concatenated_pessimist["period"] != "historique"
|
@@ -184,9 +201,15 @@ def visualize_climate(
|
|
184 |
)
|
185 |
|
186 |
# Continue with pessimistic data as in the original function...
|
187 |
-
|
188 |
-
|
189 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
190 |
concatenated_pessimist = concatenated_pessimist.sort_values(by=x_axis)
|
191 |
for condition_value in concatenated_pessimist["period"].unique():
|
192 |
segment = concatenated_pessimist[
|
|
|
62 |
|
63 |
|
64 |
def concatenate_historic_forecast(
|
65 |
+
historic, forecast, cols_to_keep, value_period_col="forecast scénario modéré", don_t = False
|
66 |
+
):
|
67 |
+
if don_t:
|
68 |
+
historic["period"] = value_period_col
|
69 |
+
forecast["period"] = value_period_col
|
70 |
+
historic = historic[cols_to_keep]
|
71 |
+
forecast = forecast[cols_to_keep]
|
72 |
+
full_data = pd.concat([historic, forecast])
|
73 |
+
full_data = full_data[full_data['year']>=2025]
|
74 |
+
return full_data
|
75 |
historic["period"] = "historique"
|
76 |
forecast["period"] = value_period_col
|
77 |
historic = historic[cols_to_keep]
|
|
|
95 |
"period",
|
96 |
],
|
97 |
):
|
98 |
+
if column == "Water Deficit (mm/day)":
|
99 |
+
concatenated_moderate = concatenate_historic_forecast(
|
100 |
+
historic, moderate, cols_to_keep,don_t=True
|
101 |
+
)
|
102 |
+
else:
|
103 |
+
concatenated_moderate = concatenate_historic_forecast(
|
104 |
+
historic, moderate, cols_to_keep
|
105 |
+
)
|
106 |
concatenated_moderate = concatenated_moderate.sort_values(by=x_axis) # Ensure order
|
107 |
|
108 |
fig = go.Figure()
|
|
|
124 |
),
|
125 |
)
|
126 |
)
|
127 |
+
if column == "Water Deficit (mm/day)":
|
128 |
+
concatenated_pessimist = concatenate_historic_forecast(
|
129 |
+
historic, pessimist, cols_to_keep, "forecast scénario pessimiste",don_t=True
|
130 |
+
)
|
131 |
+
else:
|
132 |
+
concatenated_pessimist = concatenate_historic_forecast(
|
133 |
+
historic, pessimist, cols_to_keep, "forecast scénario pessimiste"
|
134 |
+
)
|
135 |
concatenated_pessimist = concatenated_pessimist.sort_values(by=x_axis)
|
136 |
concatenated_pessimist = concatenated_pessimist[
|
137 |
concatenated_pessimist["period"] != "historique"
|
|
|
201 |
)
|
202 |
|
203 |
# Continue with pessimistic data as in the original function...
|
204 |
+
if column == "Water Deficit (mm/day)":
|
205 |
+
concatenated_pessimist = concatenate_historic_forecast(
|
206 |
+
historic, pessimist, cols_to_keep, "forecast scénario pessimiste",don_t=True
|
207 |
+
)
|
208 |
+
else:
|
209 |
+
concatenated_pessimist = concatenate_historic_forecast(
|
210 |
+
historic, pessimist, cols_to_keep, "forecast scénario pessimiste"
|
211 |
+
)
|
212 |
+
|
213 |
concatenated_pessimist = concatenated_pessimist.sort_values(by=x_axis)
|
214 |
for condition_value in concatenated_pessimist["period"].unique():
|
215 |
segment = concatenated_pessimist[
|