Circhastic commited on
Commit
2af4464
1 Parent(s): 0760af6

Version 1 hotfix #6 for merge

Browse files
Files changed (1) hide show
  1. app.py +2 -1
app.py CHANGED
@@ -187,7 +187,8 @@ def merge_forecast_data(historical, test, future):
187
  test.rename(columns={test.columns[0]: "Predicted Sales"}, inplace=True)
188
  future = future.to_frame()
189
  future.rename(columns={future.columns[0]: "Future Forecasted Sales"}, inplace=True)
190
- merged_dataframe = pd.merge_ordered(historical, pd.merge_ordered(test, future, left_index=True, right_index=True), left_index=True, right_index=True)
 
191
  return merged_dataframe
192
 
193
  # TAPAS Model
 
187
  test.rename(columns={test.columns[0]: "Predicted Sales"}, inplace=True)
188
  future = future.to_frame()
189
  future.rename(columns={future.columns[0]: "Future Forecasted Sales"}, inplace=True)
190
+ merged_dataframe = pd.merge_ordered(historical, pd.merge_ordered(test, future, left_by='Date', right_by='Date'), left_by='Date', right_by='Date')
191
+
192
  return merged_dataframe
193
 
194
  # TAPAS Model