From e3f53b4f77a2e8d5ebfdbdd37288ca3a0f6f65b9 Mon Sep 17 00:00:00 2001 From: Krzysztof Antoniak Date: Sun, 22 Nov 2020 20:06:38 +0100 Subject: [PATCH] Bring back objective function names --- tests/includes/get_objective_func.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/includes/get_objective_func.m b/tests/includes/get_objective_func.m index fb8f682..15ecdf1 100755 --- a/tests/includes/get_objective_func.m +++ b/tests/includes/get_objective_func.m @@ -11,43 +11,43 @@ case name_equals('squared_l2_norm') objective.func = @squared_l2_norm_func; objective.func_name = 'squared_l2_norm'; - objective.display_name = 'Kwadrat normy $ \norm{x}_2 $'; + objective.display_name = 'Squared l2 norm'; objective.x0_func = @squared_l2_norm_point; case name_equals('penalty_1') objective.func = @penalty_1_func; objective.func_name = 'penalty_1'; - objective.display_name = 'Funkcja kary I'; + objective.display_name = 'Penalty I function'; objective.x0_func = @penalty_1_point; case name_equals('powell') objective.func = @powell_func; objective.func_name = 'powell'; - objective.display_name = 'Rozszerzona funkcja Powella'; + objective.display_name = 'Powell function'; objective.x0_func = @powell_point; case name_equals('rosenbrock') objective.func = @(x) rosenbrock_func(x, 1, 100); objective.func_name = 'rosenbrock'; - objective.display_name = 'Rozszerzona funkcja Rosenbrocka'; + objective.display_name = 'Rosenbrock function'; objective.x0_func = @rosenbrock_point; case name_equals('trigonometric') objective.func = @trigonometric_func; objective.func_name = 'trigonometric'; - objective.display_name = 'Funkcja trygonometryczna'; + objective.display_name = 'Trigonometric function'; objective.x0_func = @trigonometric_point; case name_equals('variably_dimensioned') objective.func = @variably_dimensioned_func; objective.func_name = 'variably_dimensioned'; - objective.display_name = 'Funkcja z \cite{more1981testing}'; + objective.display_name = 'Variably dimensioned function'; objective.x0_func = @variably_dimensioned_point; case name_equals('fletcher_powell') objective.func = @fletcher_powell_func; objective.func_name = 'fletcher_powell'; - objective.display_name = 'Dolina spiralna Fletchera i Powella'; + objective.display_name = 'Fletcher & Powell helical valley'; objective.x0_func = @fletcher_powell_point; otherwise