update

micros-uav · Aug 19, 2023 · d76d93f · d76d93f
1 parent 692c27e
commit d76d93f
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 295 deletions.
diff --git a/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_1.m b/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_1.m
diff --git a/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_2.m b/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_2.m
diff --git a/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_3.m b/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_3.m
diff --git a/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_4.m b/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_4.m
diff --git a/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_5.m b/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_5.m
diff --git a/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_6.m b/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_6.m
diff --git a/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_7.m b/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_7.m
diff --git a/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_8.m b/...imulink_ws/Prototype_Simulator/combine_modules/params_for_parallel/setting_parameters_8.m
diff --git a/matlab_simulink_ws/Prototype_Simulator/combine_modules/setting_parameters.m b/matlab_simulink_ws/Prototype_Simulator/combine_modules/setting_parameters.m
@@ -19,8 +19,8 @@
 activate_save_states = 0.000000000000;
 time_interval_save = 1.000000000000;
 motion_model_type = 0.000000000000;
-swarm_algorithm_type = ['V', 'a', 's', 'a', 'r', 'h', 'e', 'l', 'y', 'i'];
-evaluation_metric_type = ['e', 'v', 'a', 'l', 'u', 'a', 't', 'i', 'o', 'n', '_', '0'];
+swarm_algorithm_type = ['u', 's', 'e', 'r', '_', 's', 'w', 'a', 'r', 'm'];
+evaluation_metric_type = ['u', 's', 'e', 'r', '_', 'e', 'v', 'a', 'l', 'u', 'a', 't', 'i', 'o', 'n'];
 
 
 end
diff --git a/matlab_simulink_ws/Prototype_Simulator/combine_modules/setting_parameters_1.m b/matlab_simulink_ws/Prototype_Simulator/combine_modules/setting_parameters_1.m
diff --git a/matlab_simulink_ws/Prototype_Simulator/combine_modules/setting_parameters_2.m b/matlab_simulink_ws/Prototype_Simulator/combine_modules/setting_parameters_2.m
diff --git a/...or/lower_layers/evaluation_module/user_evaluation_module/user_evaluation_module_average.m b/...or/lower_layers/evaluation_module/user_evaluation_module/user_evaluation_module_average.m
@@ -8,9 +8,12 @@
 % get parameters by user_evaluation_module_parameters()
 
 % The following operations are for multi-core parallel computing.
-file_name_param = 'user_evaluation_module_parameters';
-[~,str_core] = get_multi_core_value();
-fun_params = str2func([file_name_param, str_core]);
+persistent fun_params
+if isempty(fun_params)
+	file_name_param = 'user_evaluation_module_parameters';
+	[~,str_core] = get_multi_core_value();
+	fun_params = str2func(strcat(file_name_param,str_core));
+end
 [v_flock] = fun_params();
 
 %

diff --git a/...ulator/lower_layers/evaluation_module/user_evaluation_module/user_evaluation_module_one.m b/...ulator/lower_layers/evaluation_module/user_evaluation_module/user_evaluation_module_one.m
@@ -8,9 +8,12 @@
 % get parameters by user_evaluation_module_parameters()
 
 % The following operations are for multi-core parallel computing.
-file_name_param = 'user_evaluation_module_parameters';
-[~,str_core] = get_multi_core_value();
-fun_params = str2func([file_name_param, str_core]);
+persistent fun_params
+if isempty(fun_params)
+	file_name_param = 'user_evaluation_module_parameters';
+	[~,str_core] = get_multi_core_value();
+	fun_params = str2func([file_name_param,str_core]);
+end
 [v_flock] = fun_params();
 
 %

diff --git a/...Simulator/lower_layers/swarm_module/user_swarm_module/user_swarm_module_generate_desire.m b/...Simulator/lower_layers/swarm_module/user_swarm_module/user_swarm_module_generate_desire.m
@@ -18,9 +18,12 @@
 % get parameters by user_swarm_module_parameters()
 
 % The following operations are for multi-core parallel computing.
-file_name_param = 'user_swarm_module_parameters';
-[~,str_core] = get_multi_core_value();
-fun_params = str2func([file_name_param, str_core]);
+persistent fun_params
+if isempty(fun_params)
+	file_name_param = 'user_swarm_module_parameters';
+	[~,str_core] = get_multi_core_value();
+	fun_params = str2func([file_name_param,str_core]);
+end
 
 [r_com] = fun_params();