Circhastic commited on
Commit
21a5308
·
1 Parent(s): 7fd710d

Version 1 hotfix #13 for merge

Browse files
Files changed (1) hide show
  1. app.py +3 -3
app.py CHANGED
@@ -191,9 +191,9 @@ def merge_forecast_data(actual, predicted, future):
191
  future = future.rename_axis('Date')
192
  future.rename(columns={future.columns[0]: "Future Forecasted Sales"}, inplace=True)
193
 
194
- merged_dataframe = pd.merge_ordered(actual, predicted, on='Date', suffixes=('_Actual', '_Predicted'))
195
- merged_dataframe = pd.merge_ordered(merged_dataframe, future, on='Date')
196
- merged_dataframe = merged_dataframe.set_index('Date')
197
  return merged_dataframe
198
 
199
  # TAPAS Model
 
191
  future = future.rename_axis('Date')
192
  future.rename(columns={future.columns[0]: "Future Forecasted Sales"}, inplace=True)
193
 
194
+ # merged_dataframe = pd.merge_ordered(actual, predicted, on='Date', suffixes=('_Actual', '_Predicted'))
195
+ # merged_dataframe = pd.merge_ordered(merged_dataframe, future, on='Date')
196
+ merged_dataframe = pd.concat([actual, predicted, future], axis=1)
197
  return merged_dataframe
198
 
199
  # TAPAS Model