Version 1 hotfix #9 for merge

app.py

@@ -190,8 +190,7 @@ def merge_forecast_data(historical, test, future):
     historical.head()
     test.head()
     future.head()
-    merged_dataframe = pd.merge_ordered(historical, pd.merge_ordered(test, future, left_on='Date', right_on='Date'), left_on='Date', right_on='Date')
-
+    merged_dataframe = pd.merge_ordered(historical, pd.merge_ordered(test, future, fill_method="ffill", left_by="group"), fill_method="ffill", left_by="group")
 
     return merged_dataframe
 
@@ -250,7 +249,7 @@ if 'forecasted' not in st.session_state:
 # Sidebar Menu
 with st.sidebar:
     # TODO Name for product
-    st.title("MaLaCast v1.0")
+    st.title("MLCast v1.0")
     st.subheader("An intelligent sales forecasting system")
     uploaded_file = st.file_uploader("Upload your store data here to proceed (must atleast contain Date and Sales)", type=["csv"])
     if uploaded_file is not None:
@@ -353,6 +352,9 @@ if (st.session_state.uploaded):
        col[1].write(df)
     st.session_state.forecasted = True
 
+    test_y, predictions = np.array(test_y), np.array(fitted)
+    forecast_accuracy(predictions, test_y)
+
     with st.form("question_form"):
         question = st.text_input('Ask a Question about the Forecasted Data', placeholder="What is the total sales in the month of December?")
         query_button = st.form_submit_button(label='Generate Answer')