Merge pull request #370 from vikram-s-narayan/make_theta_param_as_array

Make theta a user-supplied array param
SciML · Jul 8, 2022 · 8cebcbe · 8cebcbe
2 parents 2de1b9d + ade62b4
commit 8cebcbe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/docs/src/gekpls.md b/docs/src/gekpls.md
@@ -75,10 +75,11 @@ y_true = water_flow.(x_test)
 n_comp = 2
 delta_x = 0.0001
 extra_points = 2
-initial_theta = 0.01
+initial_theta = [0.01 for i in 1:n_comp]
 g = GEKPLS(X, y, grads, n_comp, delta_x, xlimits, extra_points, initial_theta)
 y_pred = g(X_test)
 rmse = sqrt(sum(((y_pred - y_true).^2)/n_test)) #root mean squared error
-println(rmse)
+println(rmse) #0.0347
+
 ```
 
diff --git a/src/GEKPLS.jl b/src/GEKPLS.jl
@@ -35,15 +35,14 @@ function bounds_error(x, xl)
 end
 
 #constructor for GEKPLS Struct
-function GEKPLS(X, y, grads, n_comp, delta_x, xlimits, extra_points, θ)
+function GEKPLS(X, y, grads, n_comp, delta_x, xlimits, extra_points, theta)
 
     #ensure that X values are within the upper and lower bounds
     if bounds_error(X, xlimits)
         println("X values outside bounds")
         return
     end
 
-    theta = [θ for i in 1:n_comp]
     pls_mean, X_after_PLS, y_after_PLS = _ge_compute_pls(X, y, n_comp, grads, delta_x,
                                                          xlimits, extra_points)
     X_after_std, y_after_std, X_offset, y_mean, X_scale, y_std = standardization(X_after_PLS,

diff --git a/test/GEKPLS.jl b/test/GEKPLS.jl
@@ -60,7 +60,7 @@ y_true = water_flow.(x_test)
     n_comp = 2
     delta_x = 0.0001
     extra_points = 2
-    initial_theta = 0.01
+    initial_theta = [0.01 for i in 1:n_comp]
     g = GEKPLS(X, y, grads, n_comp, delta_x, xlimits, extra_points, initial_theta)
     y_pred = g(X_test)
     rmse = sqrt(sum(((y_pred - y_true) .^ 2) / n_test))
@@ -71,7 +71,7 @@ end
     n_comp = 3
     delta_x = 0.0001
     extra_points = 2
-    initial_theta = 0.01
+    initial_theta = [0.01 for i in 1:n_comp]
     g = GEKPLS(X, y, grads, n_comp, delta_x, xlimits, extra_points, initial_theta) #change hard-coded 2 param to variable
     y_pred = g(X_test)
     rmse = sqrt(sum(((y_pred - y_true) .^ 2) / n_test))
@@ -82,7 +82,7 @@ end
     n_comp = 3
     delta_x = 0.0001
     extra_points = 3
-    initial_theta = 0.01
+    initial_theta = [0.01 for i in 1:n_comp]
     g = GEKPLS(X, y, grads, n_comp, delta_x, xlimits, extra_points, initial_theta)
     y_pred = g(X_test)
     rmse = sqrt(sum(((y_pred - y_true) .^ 2) / n_test))
@@ -118,7 +118,7 @@ y_true = welded_beam.(x_test)
     n_comp = 3
     delta_x = 0.0001
     extra_points = 2
-    initial_theta = 0.01
+    initial_theta = [0.01 for i in 1:n_comp]
     g = GEKPLS(X, y, grads, n_comp, delta_x, xlimits, extra_points, initial_theta)
     y_pred = g(X_test)
     rmse = sqrt(sum(((y_pred - y_true) .^ 2) / n_test))
@@ -129,7 +129,7 @@ end
     n_comp = 2
     delta_x = 0.0001
     extra_points = 2
-    initial_theta = 0.01
+    initial_theta = [0.01 for i in 1:n_comp]
     g = GEKPLS(X, y, grads, n_comp, delta_x, xlimits, extra_points, initial_theta)
     y_pred = g(X_test)
     rmse = sqrt(sum(((y_pred - y_true) .^ 2) / n_test))
@@ -141,7 +141,7 @@ end
     n_comp = 2
     delta_x = 0.0001
     extra_points = 4
-    initial_theta = 0.01
+    initial_theta = [0.01 for i in 1:n_comp]
     g = GEKPLS(X, y, grads, n_comp, delta_x, xlimits, extra_points, initial_theta)
     y_pred = g(X_test)
     rmse = sqrt(sum(((y_pred - y_true) .^ 2) / n_test))
@@ -171,7 +171,7 @@ y_true = sphere_function.(x_test)
     n_comp = 2
     delta_x = 0.0001
     extra_points = 2
-    initial_theta = 0.01
+    initial_theta = [0.01 for i in 1:n_comp]
     g = GEKPLS(X, y, grads, n_comp, delta_x, xlimits, extra_points, initial_theta)
     y_pred = g(X_test)
     rmse = sqrt(sum(((y_pred - y_true) .^ 2) / n_test))
@@ -197,7 +197,7 @@ y_true = sphere_function.(x_test)
     n_comp = 2
     delta_x = 0.0001
     extra_points = 2
-    initial_theta = 0.01
+    initial_theta = [0.01 for i in 1:n_comp]
     g = GEKPLS(X, y, grads, n_comp, delta_x, xlimits, extra_points, initial_theta)
     y_pred = g(X_test)
     rmse = sqrt(sum(((y_pred - y_true) .^ 2) / n_test))
@@ -216,7 +216,7 @@ end
     n_comp = 2
     delta_x = 0.0001
     extra_points = 2
-    initial_theta = 0.01
+    initial_theta = [0.01 for i in 1:n_comp]
     g = GEKPLS(initial_X, initial_y, initial_grads, n_comp, delta_x, xlimits, extra_points,
                initial_theta)
     n_test = 100