diff --git a/EMFieldML/Visualize/Prediction.py b/EMFieldML/Visualize/Prediction.py index 7dd4002..34e3e95 100644 --- a/EMFieldML/Visualize/Prediction.py +++ b/EMFieldML/Visualize/Prediction.py @@ -264,14 +264,16 @@ def mu_star_efficiency( ): """Calculate mu_star for efficiency prediction.""" k_star = rbf_kernel(X_train, X_test, lengthscale, scale) - k_star_star = rbf_kernel(X_test, X_test, lengthscale, scale) + noise * np.eye( - len(X_test) - ) mu_star = calculate_mu_star(X_test, k_star, K_inv_Y_train, mean_constant) ** ( config.prepocessing_value_efficiency ) - var_star = (k_star_star - k_star.T @ K_inv @ k_star) ** (1 / 2) - return mu_star, var_star + + if mu_star[0][0] < 0.0: + mu_star[0][0] = 0.0 + elif mu_star[0][0] > 1.0: + mu_star[0][0] = 1.0 + + return mu_star def vector( diff --git a/EMFieldML/Visualize/Visualize.py b/EMFieldML/Visualize/Visualize.py index 30cb4be..0abb3f3 100644 --- a/EMFieldML/Visualize/Visualize.py +++ b/EMFieldML/Visualize/Visualize.py @@ -106,8 +106,7 @@ def render_controls(self) -> dict[str, bool]: # Display efficiency psim.TextUnformatted( - f"Efficiency : {self.visualizer.efficiency[0][0]*config.convert_efficiency:.3f} ± " - f"{abs(self.visualizer.var_efficiency[0][0])*config.convert_efficiency:.3f} %", + f"Efficiency : {self.visualizer.efficiency[0][0]*config.convert_efficiency:.3f} % " ) psim.Separator() @@ -295,7 +294,6 @@ def _init_ml_params(self): self.values = None self.db_values = None self.efficiency = None - self.var_efficiency = None self.magnetic_vector = None # Training data and models @@ -1161,7 +1159,7 @@ def _run_initial_predictions(self): )[0] # Predict efficiency - self.efficiency, self.var_efficiency = Prediction.mu_star_efficiency( + (self.efficiency) = Prediction.mu_star_efficiency( self.X_train_efficiency, self.X_test, self.K_inv_Y_train_efficiency, @@ -1430,7 +1428,7 @@ def update_values_for_move(self): ).reshape(-1) self.dBvalues = Visualize.convert_to_db(self.values) - self.efficiency, self.var_efficiency = Prediction.mu_star_efficiency( + self.efficiency = Prediction.mu_star_efficiency( self.X_train_efficiency, self.X_test, self.K_inv_Y_train_efficiency, @@ -1559,7 +1557,7 @@ def update_values_for_shape( self.mean_constant_mag, ).reshape(-1) self.dBvalues = Visualize.convert_to_db(self.values) - self.efficiency, self.var_efficiency = Prediction.mu_star_efficiency( + self.efficiency = Prediction.mu_star_efficiency( self.X_train_efficiency, self.X_test, self.K_inv_Y_train_efficiency,