pyfemtet 0.4.4__tar.gz → 0.4.6__tar.gz

{pyfemtet-0.4.4 → pyfemtet-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfemtet
-Version: 0.4.4
+Version: 0.4.6
 Summary: Design parameter optimization using Femtet.
 Home-page: https://github.com/pyfemtet/pyfemtet
 License: BSD-3-Clause

pyfemtet-0.4.6/pyfemtet/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.4.6"

{pyfemtet-0.4.4 → pyfemtet-0.4.6}/pyfemtet/opt/_femopt.py

@@ -381,9 +381,9 @@ class FEMOpt:
                 )
             )
             # Femtet の parametric 設定を目的関数に用いるかどうか
-            if self.fem.use_parametric_as_objective:
+            if self.fem.parametric_output_indexes_use_as_objective is not None:
                 from pyfemtet.opt.interface._femtet_parametric import add_parametric_results_as_objectives
-                add_parametric_results_as_objectives(self)
+                add_parametric_results_as_objectives(self, self.fem.parametric_output_indexes_use_as_objective)
 
         # actor の設定
         self.status = OptimizationStatus(self.client)

{pyfemtet-0.4.4 → pyfemtet-0.4.6}/pyfemtet/opt/interface/_femtet.py

@@ -39,6 +39,9 @@ class FemtetInterface(FEMInterface):
             model_name (str or None, optional): The name of the analysis model. Defaults to None.
             connect_method (str, optional): The connection method to use. Can be 'new', 'existing', or 'auto'. Defaults to 'auto'.
             strictly_pid_specify (bool, optional): If True and connect_method=='new', search launched Femtet process strictly based on its process id.
+            allow_without_project (bool, optional): Allow to launch Femtet with no project file. Default to False.
+            open_result_with_gui (bool, optional): Open analysis result with Femtet GUI. Default to True.
+            parametric_output_indexes_use_as_objective (list of int, optional): Parametric output indexes which will be used as objective functions. Parametric output should be set on Femtet parametric analysis dialog. Note that output 'No.' in dialog is starts with 1, but this 'index' is starts with 0. Default to None.
 
         Warning:
             Even if you specify ``strictly_pid_specify=True`` on the constructor,
@@ -60,7 +63,7 @@ class FemtetInterface(FEMInterface):
             strictly_pid_specify=True,
             allow_without_project=False,
             open_result_with_gui=True,
-            use_parametric_as_objective=False,
+            parametric_output_indexes_use_as_objective=None,
             **kwargs  # 継承されたクラスからの引数
     ):
 
@@ -86,7 +89,7 @@ class FemtetInterface(FEMInterface):
         self.parameters = None
         self.max_api_retry = 3
         self.strictly_pid_specify = strictly_pid_specify
-        self.use_parametric_as_objective = use_parametric_as_objective
+        self.parametric_output_indexes_use_as_objective = parametric_output_indexes_use_as_objective
 
         # dask サブプロセスのときは femprj を更新し connect_method を new にする
         try:
@@ -113,7 +116,7 @@ class FemtetInterface(FEMInterface):
             femprj_path=self.femprj_path,
             model_name=self.model_name,
             open_result_with_gui=self.open_result_with_gui,
-            use_parametric_as_objective=self.use_parametric_as_objective,
+            parametric_output_indexes_use_as_objective=self.parametric_output_indexes_use_as_objective,
             **kwargs
         )
 
@@ -549,7 +552,7 @@ class FemtetInterface(FEMInterface):
             is_Gaudi_method=True,
         )
 
-        if self.use_parametric_as_objective:
+        if self.parametric_output_indexes_use_as_objective is not None:
             from pyfemtet.opt.interface._femtet_parametric import solve_via_parametric_dll
             self._call_femtet_api(
                 fun=solve_via_parametric_dll,

{pyfemtet-0.4.4 → pyfemtet-0.4.6}/pyfemtet/opt/interface/_femtet_parametric.py

@@ -39,14 +39,30 @@ def _get_dll_with_set_femtet(Femtet):
     return dll
 
 
-def add_parametric_results_as_objectives(femopt) -> bool:
+def _get_prm_result_names(Femtet):
+    out = []
+
+    # load dll and set target femtet
+    dll = _get_dll_with_set_femtet(Femtet)
+    n = dll.GetPrmnResult()
+    for i in range(n):
+        # objective name
+        dll.GetPrmResultName.restype = ctypes.c_char_p
+        result = dll.GetPrmResultName(i)
+        name = result.decode('mbcs')
+        # objective value function
+        out.append(name)
+    return out
+
+
+def add_parametric_results_as_objectives(femopt, indexes) -> bool:
     # load dll and set target femtet
     dll = _get_dll_with_set_femtet(femopt.fem.Femtet)
 
     # get objective names
     dll.GetPrmnResult.restype = ctypes.c_int
     n = dll.GetPrmnResult()
-    for i in range(n):
+    for i in indexes:
         # objective name
         dll.GetPrmResultName.restype = ctypes.c_char_p
         result = dll.GetPrmResultName(i)

{pyfemtet-0.4.4 → pyfemtet-0.4.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyfemtet"
-version = "0.4.4"  # ignored by versioning plugin
+version = "0.4.6"  # ignored by versioning plugin
 description = "Design parameter optimization using Femtet."
 authors = ["kazuma.naito <kazuma.naito@murata.com>"]
 readme = "README.md"

pyfemtet-0.4.4/pyfemtet/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.4.4"