Reverted back to sidebar for interface with benchmark component entered (#34)

- Reverted back to sidebar for interface with benchmark component entered (49f4335f97b24d77a7ebb2a395f0aa3272c8698c)


Co-authored-by: Warren Borders <wborders@users.noreply.huggingface.co>

app.py

@@ -57,50 +57,42 @@ def get_choices():
         An object of choices and an object of combined dataframes.
     """
     choices = {}
-    tab1, tab2, tab3, tab4, tab5 = st.tabs(["Tickers", "Quantity", "Benchmark","Risk Free Return","Risk Aversion"])
+    #tab1, tab2, tab3, tab4, tab5 = st.tabs(["Tickers", "Quantity", "Benchmark","Risk Free Return","Risk Aversion"])
 
+    tickers = st.sidebar.text_input('Enter stock tickers.', 'GOOG,A,AVOG,AMD')
 
+    # Set the weights
+    weights_str = st.sidebar.text_input('Enter the investment quantities', '50,30,25,25')
 
-    with tab1:
+    benchmark = st.sidebar.selectbox(
+        'Select your ideal benchmark of return',
+        ('SP500', 'AOK', 'IXIC'))
+    if benchmark == 'IXIC':
+        st.sidebar.warning("You have selected a volatile benchmark.")
+    elif benchmark == 'SP500':
+        st.sidebar.success('You have selected a balanced benchmark')
+    elif benchmark == 'AOK':
+        st.sidebar.success('You have selected a conservative benchmark')
 
-        tickers = st.text_input('Enter stock tickers.', 'GOOG,A,AVOG,AMD')
-
-    with tab2:
-        # Set the weights
-        weights_str = st.text_input('Enter the investment quantities', '50,30,25,25')
-
-    with tab3:
-        benchmark = st.selectbox(
-            'Select your ideal benchmark of return',
-            ('SP500', 'AOK', 'IXIC'))
-        if benchmark == 'IXIC':
-            st.warning("You have selected a volatile benchmark.")
-        elif benchmark == 'SP500':
-            st.success('You have selected a balanced benchmark')
-        elif benchmark == 'AOK':
-            st.success('You have selected a conservative benchmark')
-
-    with tab4:
-        ### koi
-        rf = st.number_input('Enter current rate of risk free return', min_value=0.001, max_value=1.00, value=0.041)
+    ### koi
+    rf = st.sidebar.number_input('Enter current rate of risk free return', min_value=0.001, max_value=1.00, value=0.041)
 
 
     #A_coef_map = 
-    with tab5:
-        A_coef = st.slider('Enter The Coefficient of Risk Aversion', min_value=5, max_value=35, value=30, step=5)
-
-        if A_coef > 20:
-            st.success("You have selected a "+ risk_str(A_coef) +" investing style")
-            investing_style = 'Conservative'
-        elif A_coef >10 and A_coef <= 20:
-            st.success("You have selected a "+risk_str(A_coef) +" investing style")
-            investing_style = 'Balanced'
-        elif A_coef <= 10:
-            st.warning("You have selected a "+ risk_str(A_coef) +" investing style")
-            investing_style = 'Risky'
+    A_coef = st.sidebar.slider('Enter The Coefficient of Risk Aversion', min_value=5, max_value=35, value=30, step=5)
+
+    if A_coef > 20:
+        st.sidebar.success("You have selected a "+ risk_str(A_coef) +" investing style")
+        investing_style = 'Conservative'
+    elif A_coef >10 and A_coef <= 20:
+        st.sidebar.success("You have selected a "+risk_str(A_coef) +" investing style")
+        investing_style = 'Balanced'
+    elif A_coef <= 10:
+        st.sidebar.warning("You have selected a "+ risk_str(A_coef) +" investing style")
+        investing_style = 'Risky'
 
     # Every form must have a submit button.
-    submitted = st.button("Calculate")
+    submitted = st.sidebar.button("Calculate")
 
     symbols = []
     reset = False