PyFemtet 1.8.2__tar.gz → 1.9.0__tar.gz

{pyfemtet-1.8.2 → pyfemtet-1.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyfemtet
-Version: 1.8.2
+Version: 1.9.0
 Summary: Design parameter optimization using Femtet.
 License-Expression: MIT
 License-File: LICENSE

{pyfemtet-1.8.2 → pyfemtet-1.9.0}/pyfemtet/_util/excel_macro_util.py

@@ -31,7 +31,16 @@ class _ExcelDialogProcessor:
 
     def __init__(self, excel_, timeout, restore_book=True):
         self.excel = excel_
-        self.excel_pid = _get_pid(excel_.hWnd)
+
+        if hasattr(excel_, 'hWnd'):
+            self.excel_pid = _get_pid(excel_.hWnd)
+        elif hasattr(excel_, 'Hwnd'):
+            self.excel_pid = _get_pid(excel_.Hwnd)
+        elif hasattr(excel_, 'HWnd'):
+            self.excel_pid = _get_pid(excel_.HWnd)
+        else:
+            raise AttributeError('Cannot found excel window handle attribute.')
+
         self.__excel_window_title = f' - Excel'  # {basename} - Excel
         self.__error_dialog_title = 'Microsoft Visual Basic'
         self.__vbe_window_title = f'Microsoft Visual Basic for Applications - '  # Microsoft Visual Basic for Applications - {basename}

{pyfemtet-1.8.2 → pyfemtet-1.9.0}/pyfemtet/opt/femopt.py

@@ -49,8 +49,8 @@ class FEMOpt:
 
     def __init__(
             self,
-            fem: AbstractFEMInterface = None,
-            opt: AbstractOptimizer = None,
+            fem: AbstractFEMInterface | None = None,
+            opt: AbstractOptimizer | None = None,
     ):
         self.opt: AbstractOptimizer = opt or OptunaOptimizer()
         
@@ -160,7 +160,7 @@ class FEMOpt:
             names: str | list[str],
             fun: Callable[..., Sequence[float]],
             n_return: int,
-            directions: DIRECTION | Sequence[DIRECTION] = None,
+            directions: DIRECTION | Sequence[DIRECTION] | None = None,
             args: tuple | None = None,
             kwargs: dict | None = None,
     ):
@@ -208,7 +208,7 @@ class FEMOpt:
     ):
         self.opt.set_termination_condition(func)
 
-    def set_monitor_host(self, host: str = None, port: int = None):
+    def set_monitor_host(self, host: str | None = None, port: int | None = None):
         """Sets the host IP address and the port of the process monitor.
 
         Args:
@@ -240,14 +240,14 @@ class FEMOpt:
 
     def optimize(
             self,
-            n_trials: int = None,
+            n_trials: int | None = None,
             n_parallel: int = 1,
-            timeout: float = None,
+            timeout: float | None = None,
             wait_setup: bool = True,
             confirm_before_exit: bool = True,
-            history_path: str = None,
+            history_path: str | None = None,
             with_monitor: bool = True,
-            scheduler_address: str = None,
+            scheduler_address: str | None = None,
             seed: int | None = None,
     ):
 
@@ -258,7 +258,7 @@ class FEMOpt:
                 ver=pyfemtet.__version__,
             )
         )
-        client: Client
+        client: Client | DummyClient
 
         # set arguments
         self.opt.n_trials = n_trials or self.opt.n_trials
@@ -274,7 +274,6 @@ class FEMOpt:
             worker_name_base = 'Sub'
             if n_parallel == 1:
                 cluster = nullcontext()
-                # noinspection PyTypeChecker
                 client = DummyClient()
 
             else:
@@ -534,137 +533,3 @@ class FEMOpt:
         logger.info(_('All processes are terminated.'))
 
         return df
-
-
-def debug_1():
-    # noinspection PyUnresolvedReferences
-    from time import sleep
-    # from pyfemtet.opt.optimizer import InterruptOptimization
-    import optuna
-    from pyfemtet.opt.interface import AbstractFEMInterface, NoFEM
-
-    def _parabola(_fem: AbstractFEMInterface, _opt: AbstractOptimizer):
-        x = _opt.get_variables('values')
-        # print(os.getpid())
-        # raise RuntimeError
-        # raise Interrupt
-        # if get_worker() is None:
-        #     raise RuntimeError
-        return (x ** 2).sum()
-
-    def _cns(_fem: AbstractFEMInterface, _opt: AbstractOptimizer):
-        x = _opt.get_variables('values')
-        return x[0]
-
-    _opt = OptunaOptimizer()
-    _opt.sampler = optuna.samplers.TPESampler(seed=42)
-    _opt.n_trials = 10
-
-    _fem = NoFEM()
-    _opt.fem = _fem
-
-    _args = (_opt,)
-
-    _opt.add_parameter('x1', 1, -1, 1, step=0.2)
-    _opt.add_parameter('x2', 1, -1, 1, step=0.2)
-
-    _opt.add_constraint('cns', _cns, lower_bound=-0.5, args=_args)
-
-    _opt.add_objective('obj', _parabola, args=_args)
-
-    _femopt = FEMOpt(fem=_fem, opt=_opt)
-    _femopt.opt = _opt
-    # _femopt.opt.history.path = 'v1test/femopt-restart-test.csv'
-    _femopt.optimize(n_parallel=2)
-
-    print(os.path.abspath(_femopt.opt.history.path))
-
-
-def substrate_size(Femtet):
-    """基板のXY平面上での専有面積を計算します。"""
-    substrate_w = Femtet.GetVariableValue('substrate_w')
-    substrate_d = Femtet.GetVariableValue('substrate_d')
-
-    # assert get_worker() is not None
-
-    return substrate_w * substrate_d  # 単位: mm2
-
-
-def debug_2():
-    from pyfemtet.opt.interface import FemtetInterface
-    from pyfemtet.opt.optimizer import OptunaOptimizer
-
-    fem = FemtetInterface(
-        femprj_path=os.path.join(os.path.dirname(__file__), 'wat_ex14_parametric_jp.femprj'),
-    )
-
-    opt = OptunaOptimizer()
-
-    opt.fem = fem
-
-    opt.add_parameter(name="substrate_w", initial_value=40, lower_bound=22, upper_bound=60)
-    opt.add_parameter(name="substrate_d", initial_value=60, lower_bound=34, upper_bound=60)
-    opt.add_objective(name='基板サイズ(mm2)', fun=substrate_size)
-    opt.add_objective(name='obj2', fun=substrate_size)
-    opt.add_objective(name='obj3', fun=substrate_size)
-
-    opt.n_trials = 10
-    # opt.history.path = os.path.join(os.path.dirname(__file__), 'femtet-test.csv')
-
-    femopt = FEMOpt()
-
-    femopt.opt = opt
-
-    femopt.optimize(n_parallel=1)
-
-
-def debug_3():
-    # noinspection PyUnresolvedReferences
-    from time import sleep
-    # from pyfemtet.opt.optimizer import InterruptOptimization
-    import optuna
-    from pyfemtet.opt.interface import AbstractFEMInterface, NoFEM
-
-    def _parabola(_fem: AbstractFEMInterface, _opt: AbstractOptimizer):
-        x = _opt.get_variables('values')
-        # print(os.getpid())
-        # raise RuntimeError
-        # raise Interrupt
-        # if get_worker() is None:
-        #     raise RuntimeError
-        return (x ** 2).sum()
-
-    def _cns(_fem: AbstractFEMInterface, _opt: AbstractOptimizer):
-        x = _opt.get_variables('values')
-        return x[0]
-
-    _opt = OptunaOptimizer()
-    _opt.sampler = optuna.samplers.TPESampler(seed=42)
-
-    _fem = NoFEM()
-    _opt.fem = _fem
-
-    _args = (_opt,)
-
-    _opt.add_parameter('x1', 1, -1, 1, step=0.2)
-    _opt.add_parameter('x2', 1, -1, 1, step=0.2)
-
-    _opt.add_constraint('cns', _cns, lower_bound=-0.5, args=_args)
-
-    _opt.add_objective('obj', _parabola, args=_args)
-
-    _femopt = FEMOpt(fem=_fem, opt=_opt)
-    _femopt.optimize(
-        scheduler_address='<dask scheduler で起動したスケジューラの tcp をここに入力>',
-        n_trials=80,
-        n_parallel=6,
-        with_monitor=True,
-        confirm_before_exit=False,
-    )
-
-
-if __name__ == '__main__':
-    # for i in range(1):
-        debug_1()
-    # debug_2()
-    # debug_3()

{pyfemtet-1.8.2 → pyfemtet-1.9.0}/pyfemtet/opt/interface/_base_interface.py

@@ -244,6 +244,16 @@ class AbstractFEMInterface:
     def _get_additional_data(self) -> dict:
         return dict()
 
+    # name
+    @property
+    def name(self) -> str:
+        if hasattr(self, '_name'):
+            return self._name
+        return self.__class__.__name__
+
+    @name.setter
+    def name(self, value: str):
+        self._name = value
 
 class COMInterface(AbstractFEMInterface):
 

{pyfemtet-1.8.2 → pyfemtet-1.9.0}/pyfemtet/opt/interface/_excel_interface/excel_interface.py

@@ -470,11 +470,19 @@ class ExcelInterface(COMInterface):
         sleep(0.5)
 
         # 起動した excel の pid を記憶する
-        self._excel_hwnd = self.excel.hWnd
+        if hasattr(self.excel, "hWnd"):
+            self._excel_hwnd = self.excel.hWnd
+        elif hasattr(self.excel, "Hwnd"):
+            self._excel_hwnd = self.excel.Hwnd
+        elif hasattr(self.excel, "HWnd"):
+            self._excel_hwnd = self.excel.HWnd
+        else:
+            raise RuntimeError('Failed to get Excel window handle. Cannot determine Excel process ID.')
+
         self._excel_pid = 0
         while self._excel_pid == 0:
             sleep(0.5)
-            self._excel_pid = _get_pid(self.excel.hWnd)
+            self._excel_pid = _get_pid(self._excel_hwnd)
 
         # 可視性の設定
         self.excel.Visible = self.visible
@@ -583,7 +591,13 @@ class ExcelInterface(COMInterface):
         self.remove_femtet_addin_reference(wb)
         femtet_addin_path = self.get_femtet_addin_path()
         if femtet_addin_path is not None:
-            wb.VBProject.References.AddFromFile(femtet_addin_path)
+            try:
+                wb.VBProject.References.AddFromFile(femtet_addin_path)
+            except com_error:
+                logger.warning(_(
+                    jp_message="Femtet のアドインファイルの参照の追加に失敗しました。すでに追加されている可能性があります。",
+                    en_message="Failed to add reference of Femtet add-in file. It may have already been added.",
+                )) 
 
     # ===== load =====
     def load_variables(self, opt: OptimizationDataPerFEM, raise_if_no_keyword=True) -> None:
@@ -648,7 +662,6 @@ class ExcelInterface(COMInterface):
                     upper_bound=ub,
                     step=step,
                     fix=not use,
-                    supress_duplicated_name_check=True,
                 )
 
             elif kind == 'Categorical':
@@ -661,7 +674,6 @@ class ExcelInterface(COMInterface):
                     initial_value=value,
                     choices=choices,
                     fix=not use,
-                    supress_duplicated_name_check=True,
                 )
 
             else:
@@ -708,7 +720,6 @@ class ExcelInterface(COMInterface):
                     direction=direction,
                     fun=_ScapeGoatObjective(),
                     kwargs=dict(name=name),
-                    supress_duplicated_name_check=True,
                 )
 
     def load_constraints(self, opt: OptimizationDataPerFEM, raise_if_no_keyword=False):
@@ -770,19 +781,18 @@ class ExcelInterface(COMInterface):
                     fun=_ScapeGoatObjective(),
                     kwargs=dict(name=name),
                     using_fem=not calc_before_solve,
-                    supress_duplicated_name_check=True,
                 )
 
     def objective_from_excel(self, _, name: str):
         r = 1 + search_r(self.output_xlsm_path, self.output_sheet_name, name)
         c = 1 + search_c(self.output_xlsm_path, self.output_sheet_name, ParseAsObjective.value)
-        v = self.sh_output.Cells(r, c).value
+        v = self.sh_output.Cells(r, c).Value
         return float(v)
 
     def constraint_from_excel(self, _, name: str):
         r = 1 + search_r(self.constraint_xlsm_path, self.constraint_sheet_name, name)
         c = 1 + search_c(self.constraint_xlsm_path, self.constraint_sheet_name, ParseAsConstraint.value)
-        v = self.sh_constraint.Cells(r, c).value
+        v = self.sh_constraint.Cells(r, c).Value
         return float(v)
 
     # ===== Workbook and WorkSheet =====
@@ -797,7 +807,13 @@ class ExcelInterface(COMInterface):
 
     @staticmethod
     def _get_sh(wb: CDispatch, name) -> CDispatch:
-        for sh in wb.WorkSheets:
+        if hasattr(wb, 'WorkSheets'):
+            sheets = wb.WorkSheets
+        elif hasattr(wb, 'Worksheets'):
+            sheets = wb.Worksheets
+        else:
+            raise RuntimeError('Failed to get Worksheets. Cannot determine sheet collection.')
+        for sh in sheets:
             if sh.Name == name:
                 return sh
         else:
@@ -857,7 +873,7 @@ class ExcelInterface(COMInterface):
         if self.use_named_range:
             for key, variable in self.current_prm_values.items():
                 try:
-                    self.sh_input.Range(key).value = variable.value
+                    self.sh_input.Range(key).Value = variable.value
                 except com_error:
                     logger.warning(
                         _(
@@ -874,7 +890,7 @@ class ExcelInterface(COMInterface):
             for name, variable in self.current_prm_values.items():
                 r = 1 + search_r(self.input_xlsm_path, self.input_sheet_name, name)
                 c = 1 + search_c(self.input_xlsm_path, self.input_sheet_name, ParseAsParameter.value)
-                self.sh_input.Cells(r, c).value = variable.value
+                self.sh_input.Cells(r, c).Value = variable.value
 
         # 再計算
         self.excel.CalculateFull()

{pyfemtet-1.8.2 → pyfemtet-1.9.0}/pyfemtet/opt/interface/_femtet_interface/_femtet_parametric.py

@@ -223,7 +223,6 @@ def add_parametric_results_as_objectives(opt, Femtet, indexes, directions) -> bo
         # objective value function
         opt.add_objective(
             name=name, fun=_parametric_objective, direction=direction, args=(i,),
-            supress_duplicated_name_check=True,            
         )
     return True  # ここまで来たら成功
 

{pyfemtet-1.8.2 → pyfemtet-1.9.0}/pyfemtet/opt/interface/_femtet_interface/femtet_interface.py

@@ -185,6 +185,17 @@ class FemtetInterface(COMInterface):
 
     # ===== system =====
 
+    @property
+    def name(self) -> str:
+        name = ""
+        if self.femprj_path is not None:
+            name += os.path.basename(self.femprj_path)
+        if self.model_name is not None:
+            name += f' - {self.model_name}'
+        if name == "":
+            name = super().name
+        return name
+
     @property
     def object_pass_to_fun(self):
         """The object pass to the first argument of user-defined objective functions.

{pyfemtet-1.8.2 → pyfemtet-1.9.0}/pyfemtet/opt/interface/_surrogate_model_interface/base_surrogate_interface.py

@@ -122,7 +122,7 @@ class AbstractSurrogateModelInterfaceBase(AbstractFEMInterface):
             def dummy(*args, **kwargs):
                 assert False
 
-            ctx.add_objective(obj_name, dummy, direction, supress_duplicated_name_check=True)
+            ctx.add_objective(obj_name, dummy, direction)
         
         # ctx の目的関数のうち train に含まれるものを差し替え
         # directions の目的変数名を validation しているので漏れはないはず