pyfemtet 1.0.1__tar.gz → 1.0.3__tar.gz

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyfemtet
-Version: 1.0.1
+Version: 1.0.3
 Summary: Design parameter optimization using Femtet.
 License: MIT
 Author: kazuma.naito

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/_util/df_util.py

@@ -9,6 +9,9 @@ __all__ = [
 
 
 def get_index(df, equality_filters):
+    # 値渡しに変換
+    equality_filters = equality_filters.copy()
+
     # フィルタ条件に一致する行のインデックスを取得
 
     # na との == での比較は常に False なので別処理するために別リストを作る

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/history/_history.py

@@ -1115,8 +1115,6 @@ class History:
     when the optimization process starts.
     """
 
-    MAIN_FILTER = MAIN_FILTER
-
     def __init__(self):
         self._records = Records()
         self.path: str | None = None
@@ -1275,7 +1273,7 @@ class History:
                 #   フィデリティの話は現在解析を実行している opt が
                 #   必要なので、recording メソッドの引数に
                 #   それを追加する
-                df = self.get_df(equality_filters=self.MAIN_FILTER)
+                df = self.get_df(equality_filters=MAIN_FILTER)
 
                 if client is not None:
                     client.run_on_scheduler(

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/interface/_base_interface.py

@@ -22,7 +22,7 @@ except ModuleNotFoundError:
 
 from pyfemtet._util.dask_util import *
 from pyfemtet.logger import get_module_logger
-from pyfemtet.opt.problem.variable_manager import SupportedVariableTypes
+from pyfemtet.opt.problem.problem import *
 
 logger = get_module_logger('opt.interface', False)
 
@@ -39,12 +39,12 @@ class AbstractFEMInterface:
 
     kwargs: dict = {}
     _load_problem_from_fem: bool = False
-    current_prm_values: dict[str, SupportedVariableTypes]
+    current_prm_values: TrialInput
     _tmp_dir: tempfile.TemporaryDirectory
 
     # ===== update =====
 
-    def update_parameter(self, x: dict[str, SupportedVariableTypes]) -> None:
+    def update_parameter(self, x: TrialInput) -> None:
         # FEM オブジェクトに与えられた変数を設定する。
         #   目的は Function 内でユーザーが FEM オブジェクト経由で
         #   変数を取得できるようにするためなので、各具象クラスでは

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/interface/_excel_interface/excel_interface.py

@@ -26,7 +26,7 @@ from pyfemtet._util.femtet_autosave import *
 from pyfemtet._i18n import _
 
 from pyfemtet.opt.exceptions import *
-from pyfemtet.opt.problem.variable_manager import SupportedVariableTypes
+from pyfemtet.opt.problem.problem import *
 from pyfemtet.opt.interface._base_interface import COMInterface
 
 from pyfemtet.logger import get_module_logger
@@ -797,15 +797,15 @@ class ExcelInterface(COMInterface):
         return self._get_wb(self.teardown_xlsm_path)
 
     # ===== update =====
-    def update_parameter(self, x: dict[str, SupportedVariableTypes]) -> None:
+    def update_parameter(self, x: TrialInput) -> None:
 
         COMInterface.update_parameter(self, x)
 
         # excel シートの変数更新
         if self.use_named_range:
-            for key, value in self.current_prm_values.items():
+            for key, variable in self.current_prm_values.items():
                 try:
-                    self.sh_input.Range(key).value = value
+                    self.sh_input.Range(key).value = variable.value
                 except com_error:
                     logger.warning(
                         _(
@@ -819,10 +819,10 @@ class ExcelInterface(COMInterface):
                     break
 
         if not self.use_named_range:  # else にしないこと
-            for name, value in self.current_prm_values.items():
+            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 = value
+                self.sh_input.Cells(r, c).value = variable.value
 
         # 再計算
         self.excel.CalculateFull()

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/interface/_femtet_interface/femtet_interface.py

@@ -33,7 +33,7 @@ from pyfemtet._util.femtet_access_inspection import *
 from pyfemtet.dispatch_extensions import *
 from pyfemtet.opt.interface._base_interface import COMInterface
 from pyfemtet.opt.exceptions import *
-from pyfemtet.opt.problem.variable_manager import SupportedVariableTypes
+from pyfemtet.opt.problem.problem import *
 
 from ._femtet_parametric import *
 
@@ -803,7 +803,7 @@ class FemtetInterface(COMInterface):
         else:
             return None
 
-    def update_parameter(self, x: dict[str, SupportedVariableTypes], with_warning=False) -> None | list[str]:
+    def update_parameter(self, x: TrialInput, with_warning=False) -> None | list[str]:
         """Update parameter of femprj."""
         COMInterface.update_parameter(self, x)
 
@@ -844,7 +844,7 @@ class FemtetInterface(COMInterface):
 
             # 変数を更新
             warning_messages = []
-            for name, value in self.current_prm_values.items():
+            for name, variable in self.current_prm_values.items():
 
                 # 渡された変数がちゃんと Femtet に定義されている
                 if name in existing_variable_names:
@@ -855,9 +855,9 @@ class FemtetInterface(COMInterface):
                         return_value_if_failed=False,
                         if_error=ModelError,  # 生きてるのに失敗した場合
                         error_message=Msg.ERR_FAILED_TO_UPDATE_VARIABLE
-                        + f"{value} -> {name}",
+                        + f"{variable.value} -> {name}",
                         is_Gaudi_method=True,
-                        args=(name, value),
+                        args=(name, variable.value),
                     )
 
                 # 渡された変数が Femtet で定義されていない
@@ -875,15 +875,15 @@ class FemtetInterface(COMInterface):
 
             # update without parameter check
             warning_messages = []
-            for name, value in self.current_prm_values.items():
+            for name, variable in self.current_prm_values.items():
                 self._call_femtet_api(
                     fun=self.Femtet.UpdateVariable,
                     return_value_if_failed=False,
                     if_error=ModelError,  # 生きてるのに失敗した場合
                     error_message=Msg.ERR_FAILED_TO_UPDATE_VARIABLE
-                    + f"{value} -> {name}",
+                    + f"{variable.value} -> {name}",
                     is_Gaudi_method=True,
-                    args=(name, value),
+                    args=(name, variable.value),
                 )
 
         # ここでは ReExecute しない

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/interface/_femtet_with_nx_interface/femtet_with_nx_interface.py

@@ -9,10 +9,11 @@ import subprocess
 # noinspection PyUnresolvedReferences
 from pywintypes import com_error
 
-from pyfemtet._i18n import Msg, _
+from pyfemtet._i18n import _
 from pyfemtet.opt.interface._base_interface import AbstractFEMInterface
 from pyfemtet.opt.interface._femtet_interface import FemtetInterface
 from pyfemtet.opt.exceptions import *
+from pyfemtet.opt.problem.variable_manager import *
 
 if TYPE_CHECKING:
     from pyfemtet.opt.optimizer import AbstractOptimizer
@@ -78,7 +79,9 @@ class _NXInterface(AbstractFEMInterface):
             os.remove(xt_path)
 
         # 変数の json 文字列を作る
-        str_json = json.dumps(self.current_prm_values)
+        str_json = json.dumps(
+            {name: variable.value for name, variable
+             in self.current_prm_values.items()})
 
         # create dumped json of export settings
         tmp_dict = dict(
@@ -216,13 +219,17 @@ class FemtetWithNXInterface(FemtetInterface, _NXInterface):
 
 def _debug_1():
 
+    x = Variable()
+    x.name = 'x'
+    x.value = 20
+
     fem = _NXInterface(
         prt_path=os.path.join(os.path.dirname(__file__), 'model1.prt'),
         export_solids=True,
     )
     fem._setup_before_parallel()
     fem._setup_after_parallel()
-    fem.update_parameter({'x': 20})
+    fem.update_parameter(dict(x=x))
     fem._export_xt(os.path.join(os.path.dirname(__file__), 'model1.x_t'))
 
 

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/interface/_femtet_with_solidworks/femtet_with_solidworks_interface.py

@@ -9,7 +9,7 @@ from pywintypes import com_error
 
 from pyfemtet._i18n import _
 
-from pyfemtet.opt.problem.variable_manager import SupportedVariableTypes
+from pyfemtet.opt.problem.problem import *
 from pyfemtet.opt.interface._base_interface import AbstractFEMInterface
 from pyfemtet.opt.interface._femtet_interface import FemtetInterface
 from pyfemtet.opt.interface._solidworks_interface import SolidworksInterface
@@ -89,7 +89,7 @@ class FemtetWithSolidworksInterface(FemtetInterface, SolidworksInterface, Abstra
         SolidworksInterface._setup_after_parallel(self, opt)
         FemtetInterface._setup_after_parallel(self, opt)
 
-    def update_parameter(self, x: dict[str, SupportedVariableTypes], with_warning=False) -> None:
+    def update_parameter(self, x: TrialInput, with_warning=False) -> None:
         SolidworksInterface.update_parameter(self, x)
         FemtetInterface.update_parameter(self, x, with_warning)
 

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/interface/_solidworks_interface/solidworks_interface.py

@@ -14,7 +14,7 @@ from pyfemtet._util.dask_util import *
 from pyfemtet.opt.exceptions import *
 from pyfemtet.opt.interface._base_interface import COMInterface
 from pyfemtet._i18n import _
-from pyfemtet.opt.problem.variable_manager import SupportedVariableTypes
+from pyfemtet.opt.problem.problem import *
 from pyfemtet.logger import get_module_logger
 
 if TYPE_CHECKING:
@@ -125,7 +125,7 @@ class SolidworksInterface(COMInterface):
     def update(self) -> None:
         raise NotImplementedError
 
-    def update_parameter(self, x: dict[str, SupportedVariableTypes]) -> None:
+    def update_parameter(self, x: TrialInput) -> None:
 
         COMInterface.update_parameter(self, x)
 
@@ -154,7 +154,7 @@ class SolidworksInterface(COMInterface):
                 prm_name = _get_name_from_equation(eq)
                 # 対象なら処理
                 if prm_name in self.current_prm_values:
-                    new_equation = f'"{prm_name}" = {self.current_prm_values[prm_name]}'
+                    new_equation = f'"{prm_name}" = {self.current_prm_values[prm_name].value}'
                     swEqnMgr.Equation(i, new_equation)
 
             # 式の計算

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/interface/_surrogate_model_interface/botorch_interface.py

@@ -62,7 +62,7 @@ class BoTorchInterface(AbstractSurrogateModelInterfaceBase):
 
     def update(self) -> None:
         # update current objective values
-        x = np.array([self.current_prm_values.values()])
+        x = np.array([[variable.value for variable in self.current_prm_values.values()]])
 
         y, _ = self.pyfemtet_model.predict(x)
         y = y[0]
@@ -255,7 +255,7 @@ class PoFBoTorchInterface(BoTorchInterface, AbstractSurrogateModelInterfaceBase)
 
             return
 
-        x = np.array([self.current_prm_values.values()])
+        x = np.array([[variable.value for variable in self.current_prm_values.values()]])
 
         f_mean, f_std = self.pyfemtet_model_c.predict(x)
         f_mean, f_std = f_mean[0][0], f_std[0][0]

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/interface/_with_excel_settings/with_excel_settings.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING
 
 import re
 
-from pyfemtet.opt.problem.problem import SupportedVariableTypes
+from pyfemtet.opt.problem.problem import *
 from pyfemtet.opt.interface._base_interface import AbstractFEMInterface
 from pyfemtet.opt.interface._excel_interface import ExcelInterface
 from pyfemtet.opt.interface._femtet_interface import FemtetInterface
@@ -116,7 +116,7 @@ def _class_factory(FEMClass: type[AbstractFEMInterface]) -> type[AbstractFEMInte
             ExcelInterface.load_constraints(self, opt, raise_if_no_keyword)
             FEMClass.load_constraints(self, opt)
 
-        def update_parameter(self, x: SupportedVariableTypes) -> None:
+        def update_parameter(self, x: TrialInput) -> None:
             assert self._excel_initialized, '最初に init_excel() を呼び出してください。'
             ExcelInterface.update_parameter(self, x)
             FEMClass.update_parameter(self, x)

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/optimizer/_base_optimizer.py

@@ -458,7 +458,6 @@ class AbstractOptimizer:
                 self,
                 opt_: AbstractOptimizer,
                 parameters: TrialInput,
-                variables_pass_to_fem: dict[str, SupportedVariableTypes],
                 history: History = None,
                 datetime_start=None,
                 trial_id=None,
@@ -509,8 +508,12 @@ class AbstractOptimizer:
                 logger.info(parameters)
 
                 # ===== update FEM parameter =====
+                pass_to_fem = self.opt.variable_manager.get_variables(
+                    filter='pass_to_fem',
+                    format='raw',
+                )
                 logger.info(_('updating variables...'))
-                opt_.fem.update_parameter(variables_pass_to_fem)
+                opt_.fem.update_parameter(pass_to_fem)
                 opt_._check_and_raise_interruption()
 
                 # ===== evaluate hard constraint =====
@@ -632,7 +635,6 @@ class AbstractOptimizer:
         def solve(
                 self,
                 x: TrialInput,
-                x_pass_to_fem_: dict[str, SupportedVariableTypes],
                 opt_: AbstractOptimizer | None = None,
                 trial_id: str =None,
         ) -> _FReturnValue | None:
@@ -669,7 +671,7 @@ class AbstractOptimizer:
                 datetime_start = datetime.datetime.now()
                 try:
                     f_return = self._solve_or_raise(
-                        opt_, x, x_pass_to_fem_, self.opt.history,
+                        opt_, x, self.opt.history,
                         datetime_start, trial_id
                     )
 

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/optimizer/optuna_optimizer/_optuna_optimizer.py

@@ -228,13 +228,12 @@ class OptunaOptimizer(AbstractOptimizer):
 
             # construct TrialInput
             x = vm.get_variables(filter='parameter')
-            x_pass_to_fem: dict[str, SupportedVariableTypes] = vm.get_variables(filter='pass_to_fem', format='dict')
 
             # prepare solve
             solve_set = self._get_solve_set()
 
             # process main fidelity model
-            f_return = solve_set.solve(x, x_pass_to_fem)
+            f_return = solve_set.solve(x)
             if f_return is None:
                 y_internal: None = None
             else:
@@ -244,7 +243,7 @@ class OptunaOptimizer(AbstractOptimizer):
             for sub_fidelity_name, sub_opt in self.sub_fidelity_models.items():
                 # _SolveSet に特殊な初期化を入れていないので
                 # sub fidelity でも初期化せず使用可能
-                solve_set.solve(x, x_pass_to_fem, sub_opt)
+                solve_set.solve(x, sub_opt)
 
             # check interruption
             self._check_and_raise_interruption()

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/enable_nonlinear_constraint.py

@@ -75,7 +75,9 @@ def _evaluate_pyfemtet_cns(
                        'アクセスは著しく時間がかかりますので'
                        'ご注意ください。'
         ))
-        pass_to_fem = opt.variable_manager.get_variables(filter='pass_to_fem')
+        pass_to_fem = opt.variable_manager.get_variables(
+            filter='pass_to_fem', format='raw'
+        )
         opt.fem.update_parameter(pass_to_fem)
 
     # eval

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/optimizer/scipy_optimizer/_scipy_optimizer.py

@@ -195,7 +195,9 @@ class ScipyOptimizer(AbstractOptimizer):
         # update fem (very slow!)
         if cns.using_fem:
             logger.warning(Msg.WARN_USING_FEM_IN_NLC)
-            pass_to_fem = self.variable_manager.get_variables(filter='pass_to_fem')
+            pass_to_fem = self.variable_manager.get_variables(
+                filter='pass_to_fem', format='raw'
+            )
             self.fem.update_parameter(pass_to_fem)
 
         return cns.eval(self.fem)
@@ -345,12 +347,10 @@ class ScipyOptimizer(AbstractOptimizer):
 
             # construct TrialInput
             x = vm.get_variables(filter='parameter')
-            x_pass_to_fem: dict[str, SupportedVariableTypes] = vm.get_variables(
-                filter='pass_to_fem', format='dict')
 
             # process main fidelity model
             solve_set = self._get_solve_set()
-            f_return = solve_set.solve(x, x_pass_to_fem)
+            f_return = solve_set.solve(x)
             assert f_return is not None
             dict_y_internal = f_return[1]
             y_internal: float = tuple(dict_y_internal.values())[0]  # type: ignore

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyfemtet/opt/visualization/history_viewer/result_viewer/_pages.py

@@ -7,6 +7,7 @@ from dash import Output, Input, State, callback_context, no_update
 from dash.exceptions import PreventUpdate
 
 from pyfemtet.opt.history import History
+from pyfemtet.opt.problem.variable_manager import Variable
 
 from pyfemtet.opt.visualization.history_viewer._wrapped_components import dcc, dbc, html
 from pyfemtet.opt.visualization.history_viewer._base_application import *
@@ -326,9 +327,14 @@ class HomePage(AbstractPage):
                 row = df[df['trial'] == trial]
                 prm_names = self.application.history.prm_names
                 prm_values = row[prm_names].values.ravel()
-                x = {name: value for name, value in zip(prm_names, prm_values)}
 
-                self.femtet_control.fem.update_parameter(x)
+                pass_to_fem = {}
+                for name, value in zip(prm_names, prm_values):
+                    v = Variable()
+                    v.name = name
+                    v.value = value
+                    pass_to_fem.update({name: v})
+                self.femtet_control.fem.update_parameter(pass_to_fem)
                 self.femtet_control.fem.update_model()
 
                 Femtet.SaveProject(Femtet.Project, True)

{pyfemtet-1.0.1 → pyfemtet-1.0.3}/pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
 
 #[project.optional-dependencies]
 #brep = ["brepmatching>=0.1.8,<0.2"]
-version = "1.0.1"
+version = "1.0.3"
 
 [project.urls]
 Repository = "https://github.com/pyfemtet/pyfemtet"