Merge pull request #201 from EOMYS-Public/optimization

Optimization & DXF import

Author: BonneelP

Tests/Classes/test_classes.py

@@ -162,6 +162,8 @@ def test_class_as_dict(class_dict):
             d[prop["name"]] = None
         elif type(prop["value"]) is str and "()" in prop["value"]:
             d[prop["name"]] = eval(prop["value"] + ".as_dict()")
+        elif prop["type"] == "complex":
+            d[prop["name"]] = str(prop["value"])
         elif prop["type"] == "dict":
             if prop["value"] == "":
                 d[prop["name"]] = {}

Tests/Methods/Geometry/test_Segment_meth.py

@@ -73,6 +73,7 @@
 distance_test.append({"begin": -2, "end": 2, "Z": 2, "result": 0})
 distance_test.append({"begin": 2j, "end": 2, "Z": 1 + 1j, "result": 0})
 distance_test.append({"begin": 2j, "end": 2, "Z": 3 - 1j, "result": sqrt(2)})
+distance_test.append({"begin": 1 + 0j, "end": 0 + 1j, "Z": 0 + 192j, "result": 191})
 
 
 @pytest.mark.METHODS

Tests/Methods/Geometry/test_arc_meth.py

@@ -1022,6 +1022,14 @@ def test_split_line(test_dict):
         "D": abs(-1 - 2j - (-1j + exp(1j * 5 * pi / 4))),
     }
 )
+# 12
+D_test.append(
+    {
+        "arc": Arc2(center=0 + 0j, begin=1 + 0j, angle=pi / 2),
+        "Z": -4 - 2j,  # First point of cutting line
+        "D": 5,
+    }
+)
 
 
 @pytest.mark.parametrize("test_dict", D_test)

Tests/Methods/Slot/test_HoleM50_meth.py

@@ -83,7 +83,7 @@ def test_comp_surface(self):
         )
         result = test_obj.hole[0].comp_surface()
         a = result
-        b = 3.77977e-04
+        b = 3.7803e-04
         assert abs((a - b) / a - 0) < DELTA
 
     def test_comp_W5(self):

Tests/Plot/test_ICEM_2020.py

@@ -80,11 +80,11 @@ def test_FEMM_sym():
 
     # FEMM files (mesh and results) are available in Results folder
     copyfile(
-        join(out.path_res, "Femm", "fig_09_FEMM_sym_model.ans"),
+        join(out.path_result, "Femm", "fig_09_FEMM_sym_model.ans"),
         join(save_path, "fig_09_FEMM_sym_model.ans"),
     )
     copyfile(
-        join(out.path_res, "Femm", "fig_09_FEMM_sym_model.fem"),
+        join(out.path_result, "Femm", "fig_09_FEMM_sym_model.fem"),
         join(save_path, "fig_09_FEMM_sym_model.fem"),
     )
 
@@ -489,11 +489,11 @@ def test_ecc_FEMM():
 
     # FEMM files (mesh and results) are available in Results folder
     copyfile(
-        join(out.path_res, "Femm", "fig_19_Transform_list_model.ans"),
+        join(out.path_result, "Femm", "fig_19_Transform_list_model.ans"),
         join(save_path, "fig_19_Transform_list_model.ans"),
     )
     copyfile(
-        join(out.path_res, "Femm", "fig_19_Transform_list_model.fem"),
+        join(out.path_result, "Femm", "fig_19_Transform_list_model.fem"),
         join(save_path, "fig_19_Transform_list_model.fem"),
     )
     # Plot, check, save

Tests/Validation/Optimization/test_Binh_and_Korn.py

@@ -75,8 +75,6 @@ def test_Binh_and_Korn():
     # simu.mag.Kgeo_fineness=0.02
     simu.struct = None
 
-    output = Output(simu=simu)
-
     # ### Design variable
     my_vars = [
         OptiDesignVar(
@@ -139,7 +137,7 @@ def evaluate(output):
     # ### Defining the problem
 
     my_prob = OptiProblem(
-        output=output,
+        simu=simu,
         design_var=my_vars,
         obj_func=objs,
         constraint=cstrs,

Tests/Validation/Optimization/test_opti_datakeeper_list.py

@@ -35,8 +35,6 @@ def test_opti_datakeeper_list():
     # Definition of the simulation
     simu = Simu1(name="Test_machine", machine=SCIM_001)
 
-    output = Output(simu=simu)
-
     # Design variable
     my_vars = [
         OptiDesignVar(
@@ -82,7 +80,7 @@ def evaluate(output):
 
     # Defining the problem
     my_prob = OptiProblem(
-        output=output,
+        simu=simu,
         design_var=my_vars,
         obj_func=objs,
         datakeeper_list=datakeeper_list,

Tests/Validation/Optimization/test_opti_preprocessing.py

@@ -35,8 +35,6 @@ def test_opti_preprocessing():
     # Definition of the simulation
     simu = Simu1(name="Test_machine", machine=SCIM_001)
 
-    output = Output(simu=simu)
-
     # Design variable
     my_vars = [
         OptiDesignVar(
@@ -78,7 +76,7 @@ def evaluate(output):
 
     # Defining the problem
     my_prob = OptiProblem(
-        output=output,
+        simu=simu,
         design_var=my_vars,
         obj_func=objs,
         preprocessing=preprocessing,

Tests/Validation/Optimization/test_zdt3.py

@@ -74,8 +74,6 @@ def test_zdt3():
     # simu.mag.Kgeo_fineness=0.02
     simu.struct = None
 
-    output = Output(simu=simu)
-
     # ### Design variable
     my_vars = []
 
@@ -122,7 +120,7 @@ def evaluate(output):
 
     # ### Defining the problem
     my_prob = OptiProblem(
-        output=output, design_var=my_vars, obj_func=objs, eval_func=evaluate
+        simu=simu, design_var=my_vars, obj_func=objs, eval_func=evaluate
     )
 
     solver = OptiGenAlgNsga2Deap(problem=my_prob, size_pop=40, nb_gen=100, p_mutate=0.5)

Tests/Validation/Simulation/Multisimulation/test_slot_scale.py

@@ -69,6 +69,7 @@ def test_slot_scale():
     # Multi-simulation to variate the slot size
     multisim = VarParam(
         stop_if_error=True,
+        is_reuse_femm_file=False,
         ref_simu_index=0,  # Reference simulation is set as the first simulation from var_simu
     )
 
@@ -116,10 +117,10 @@ def slot_scale(simu, scale_factor):
             error_keeper="lambda simu: np.nan",
         ),
         DataKeeper(
-            name="Airgap flux density components",
+            name="Radial Airgap flux density",
             unit="H",
             symbol="B",
-            keeper="lambda output: output.mag.B",
+            keeper="lambda output: output.mag.B.components['radial'].get_along('time','angle')['B_r']",
             error_keeper=error_keeper_mag_flux,
         ),
     ]