rename femmt_print()

upb-lea · Aug 8, 2023 · 8df9be8 · 8df9be8
1 parent c611f8b
commit 8df9be8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/femmt/examples/ito_optuna_example.py b/femmt/examples/ito_optuna_example.py
@@ -39,9 +39,9 @@
 )
 
 
-#task = 'start_study'
+task = 'start_study'
 #task = 'filter_reluctance_model'
-task = 'fem_simulation_from_filtered_reluctance_model_results'
+# task = 'fem_simulation_from_filtered_reluctance_model_results'
 #task = 'plot_study_results'
 
 study_name = "workflow_2023-04-15"

diff --git a/femmt/examples/sto_optuna_example.py b/femmt/examples/sto_optuna_example.py
@@ -66,7 +66,7 @@
 if __name__ == '__main__':
     time_start = datetime.datetime.now()
 
-    fmt.StackedTransformerOptimization.FemSimulation.start_proceed_study(study_name, dab_transformer_config, 2,
+    fmt.StackedTransformerOptimization.FemSimulation.start_proceed_study(study_name, dab_transformer_config, 15,
                                                                                 number_objectives=4,
                                                                                 sampler=optuna.samplers.NSGAIIISampler())
     #fmt.StackedTransformerOptimization.FemSimulation.show_study_results(study_name, dab_transformer_config)
diff --git a/femmt/optimization/ito.py b/femmt/optimization/ito.py
@@ -1186,7 +1186,7 @@ def load_unfiltered_results(working_directory: str) -> List[ItoSingleResultFile]
             :rtype: List[ItoSingleResultFile]
             """
             integrated_transformer_reluctance_model_results_directory = os.path.join(working_directory, "01_reluctance_model_results")
-            ff.femmt_print(f"Read results from {integrated_transformer_reluctance_model_results_directory}")
+            print(f"Read results from {integrated_transformer_reluctance_model_results_directory}")
             return femmt.IntegratedTransformerOptimization.ReluctanceModel.load_list(integrated_transformer_reluctance_model_results_directory)
 
         @staticmethod
@@ -1200,7 +1200,7 @@ def load_filtered_results(working_directory: str) -> List[ItoSingleResultFile]:
             :rtype: List[ItoSingleResultFile]
             """
             integrated_transformer_reluctance_model_results_directory = os.path.join(working_directory, "01_reluctance_model_results_filtered")
-            ff.femmt_print(f"Read results from {integrated_transformer_reluctance_model_results_directory}")
+            print(f"Read results from {integrated_transformer_reluctance_model_results_directory}")
             return femmt.IntegratedTransformerOptimization.ReluctanceModel.load_list(integrated_transformer_reluctance_model_results_directory)
 
     class FemSimulation:

diff --git a/femmt/optimization/sto.py b/femmt/optimization/sto.py
@@ -163,7 +163,7 @@ def objective(trial, config: StoSingleInputConfig,
 
                 geo = femmt.MagneticComponent(component_type=femmt.ComponentType.IntegratedTransformer,
                                               working_directory=target_and_fixed_parameters.working_directories.fem_working_directory,
-                                              silent=True, simulation_name=f"Case_{trial.number}")
+                                              verbosity=femmt.Verbosity.Silent, simulation_name=f"Case_{trial.number}")
 
                 core_dimensions = femmt.dtos.StackedCoreDimensions(core_inner_diameter=core_inner_diameter, window_w=window_w,
                                                                  window_h_top=window_h_top, window_h_bot=window_h_bot)
@@ -475,7 +475,7 @@ def re_simulate_single_result(study_name: str, config: StoSingleInputConfig, num
 
             geo = femmt.MagneticComponent(component_type=femmt.ComponentType.IntegratedTransformer,
                                           working_directory=target_and_fixed_parameters.working_directories.fem_working_directory,
-                                          silent=True, simulation_name=f"Single_Case_{trial._trial_id}")
+                                          verbosity=fmt.Verbosity.Silent, simulation_name=f"Single_Case_{trial._trial_id}")
 
             core_dimensions = femmt.dtos.StackedCoreDimensions(core_inner_diameter=core_inner_diameter, window_w=window_w,
                                                                window_h_top=window_h_top, window_h_bot=window_h_bot)