Added x0 initial and timing to GUI

app.py

@@ -58,7 +58,9 @@ with col2:
 
 
 random_init = st.sidebar.checkbox("Random Initialization")
-st.sidebar.caption("Default is 0 initialization")
+if not random_init:
+    default_x0 = utils.get_function_x0(function_name=function_name.split('_')[0])
+    x0 = st.sidebar.text_input("required format: x1,x2,...,xn",str(default_x0))
 
 is_adaptive = st.sidebar.checkbox("Adaptive HDMR")
 
@@ -74,13 +76,14 @@ if st.sidebar.button("Calculate HDMR"):
 
     main.is_streamlit = interactive_plot
     if is_adaptive:
-        status_hdmr, plt1, plt2, file_name = main.main_function(N, n, function_name, legendreDegree, interval[0], interval[1], 
-                                        random_init, is_adaptive, num_closest_points, epsilon, clip)
+        status_hdmr, runtime, plt1, plt2, file_name = main.main_function(N, n, function_name, legendreDegree, interval[0], interval[1], 
+                                        random_init, x0, is_adaptive, num_closest_points, epsilon, clip)
     else:
-        status_hdmr, plt1, plt2, file_name = main.main_function(N, n, function_name, legendreDegree, interval[0], interval[1], 
-                                        random_init, is_adaptive)
+        status_hdmr, runtime, plt1, plt2, file_name = main.main_function(N, n, function_name, legendreDegree, interval[0], interval[1], 
+                                        random_init, x0, is_adaptive)
     st.subheader("Results")
     st.write(f"hdmr_opt status Success: {status_hdmr.success} - X: {status_hdmr.x}")
+    st.write("Runtime: {runtime} seconds")
 
     with st.expander("Click to see the full result", expanded=False):
         st.write(status_hdmr)

app_utils.py

@@ -10,14 +10,34 @@ default_function_intervals = {
     "griewank": (-600.0, 600.0),
     "rastrigin": (-5.12, 5.12)
 }
+default_function_x0 = {
+    "testfunc": '2.0, 2.0',
+    "camel3": '2.0, 2.0',
+    "camel16": '2.0, 2.0',
+    "treccani": '2.0, 2.0',
+    "goldstein": '2.0, 2.0',
+    "branin": '2.0, 2.0',
+    "rosenbrock": '2.0, 2.0',
+    "ackley": '2.0, 2.0',
+    "griewank": '2.0, 2.0',
+    "rastrigin": '2.0, 2.0'
+}
 
 def get_function_interval(function_name):
     try:
         interval = default_function_intervals[function_name]    
     except:
-        raise KeyError("You have entered non existing funtion name.")
+        raise KeyError("You have entered non existing function name.")
     
     return interval
 
+def get_function_x0(function_name):
+    try:
+        x0 = default_function_x0[function_name]    
+    except:
+        raise KeyError("You have entered non existing function name.")
+    
+    return x0
+
 def get_dims(function_name):
     return int(function_name.split('_')[1][:-1])

src/functions.py

@@ -152,6 +152,9 @@ if __name__ == "__main__":
     elif f == rastrigin_2d:
         x1_min = x2_min = -5.12
         x1_max = x2_max = 5.12
+    elif f == testfunc_2d:
+        x1_min = x2_min = -5
+        x1_max = x2_max = 5
     
 
     N = 100

src/main.py

@@ -3,6 +3,7 @@ import numpy as np
 import math
 import matplotlib.pyplot as plt
 import pandas as pd
+import time
 try:
     import src.functions as functions
 except:
@@ -333,7 +334,7 @@ def hdmr_opt(fun, x0, args=(), jac=None, callback=None,
 
         return result
 
-def main_function(N_, n_, function_name_, m_, a_, b_, random_init_, is_adaptive_, k_=None, epsilon_=None, clip_=None):
+def main_function(N_, n_, function_name_, m_, a_, b_, random_init_, x0_, is_adaptive_, k_=None, epsilon_=None, clip_=None):
     global N, n, function_name, m, a, b, random_init, is_adaptive, k, epsilon, clip
     
     N = N_
@@ -355,11 +356,8 @@ def main_function(N_, n_, function_name_, m_, a_, b_, random_init_, is_adaptive_
     else:
         file_name = f"results/{function_name}_a{a}_b{b}_N{N}_m{m}" 
     
-    if not random_init:
-        if function_name.split('_')[1] == '2d':
-            x0 = np.array([0.0, 0.0]) # Initial value of function for optimizing process
-        elif function_name.split('_')[1] == '10d':
-            x0 = np.zeros((10,))
+    if not random_init:    
+        x0 = np.fromstring(x0_,dtype=float,sep=',')
     else:
         file_name += '_randomInit'
         if function_name.split('_')[1] == '2d':
@@ -370,9 +368,11 @@ def main_function(N_, n_, function_name_, m_, a_, b_, random_init_, is_adaptive_
     
     # status_bfgs = minimize(test_function, x0, method="BFGS") # Applying direct optimization method to the function
     # print(f"BFGS status: {status_bfgs}")
+    start=time.time()
     status_hdmr = minimize(getattr(functions, function_name), x0, args=(), method=hdmr_opt) # Applying hdmr-opt method to the function
-
-    return status_hdmr, plt1, plt2, file_name
+    end=time.time()
+    runtime=end-start
+    return status_hdmr,runtime, plt1, plt2, file_name
 
 plt1 = plt2 = None
 
@@ -408,8 +408,9 @@ if __name__ == "__main__":
     epsilon_ = global_args.epsilon
     clip_ = global_args.clip
 
-    status_hdmr, _, _, file_name = main_function(N_, n_, function_name_, m_, a_, b_, random_init_, 
+    status_hdmr, runtime, _, _, file_name = main_function(N_, n_, function_name_, m_, a_, b_, random_init_, 
                                                 is_adaptive_, k_, epsilon_, clip_)
+    print(f"{runtime} seconds")
     print(f"hdmr_opt status: {status_hdmr}")
 
     with open(file_name + '.txt', 'w') as f: