pyfemtet 0.4.19__py3-none-any.whl → 0.4.21__py3-none-any.whl

pyfemtet/opt/interface/_femtet.py

@@ -215,6 +215,24 @@ class FemtetInterface(FEMInterface):
         if self.Femtet is None:
             raise RuntimeError(Msg.ERR_FEMTET_CONNECTION_FAILED)
 
+    def _check_gaudi_accessible(self) -> bool:
+        try:
+            _ = self.Femtet.Gaudi
+        except com_error:
+            # モデルが開かれていないかFemtetが起動していない
+            return False
+        return True
+
+    # noinspection PyMethodMayBeStatic
+    def _construct_femtet_api(self, string):  # static にしてはいけない
+        if isinstance(string, str):
+            if string.startswith('self.'):
+                return eval(string)
+            else:
+                return eval('self.' + string)
+        else:
+            return string  # Callable
+
     def _call_femtet_api(
             self,
             fun,
@@ -232,7 +250,7 @@ class FemtetInterface(FEMInterface):
 
         Parameters
         ----------
-        fun : Callable
+        fun : Callable or str
             Femtet API
         return_value_if_failed : Any
             API が失敗した時の戻り値
@@ -271,36 +289,62 @@ class FemtetInterface(FEMInterface):
         # 1. 結果に関わらず戻り値が None で API 実行時に com_error を送出する
         # 2. API 実行時に成功失敗を示す戻り値を返し、ShowLastError で例外にアクセスできる状態になる
 
+        # 実行する API をデバッグ出力
+        if isinstance(fun, str):
+            logger.debug(' ' * print_indent + f'Femtet API:{fun}, args:{args}, kwargs:{kwargs}')
+        else:
+            logger.debug(' ' * print_indent + f'Femtet API:{fun.__name__}, args:{args}, kwargs:{kwargs}')
+
         # Gaudi コマンドなら Gaudi.Activate する
-        logger.debug(' ' * print_indent + f'Femtet API:{fun.__name__}, args:{args}, kwargs:{kwargs}')
         if is_Gaudi_method:  # Optimizer は Gogh に触らないので全部にこれをつけてもいい気がする
             try:
-                self._call_femtet_api(
-                    self.Femtet.Gaudi.Activate,
-                    False,  # None 以外なら何でもいい
-                    Exception,
-                    'Gaudi のオープンに失敗しました',
-                    print_indent=print_indent + 1
-                )
+                # まず Gaudi にアクセスできるか
+                gaudi_accessible = self._check_gaudi_accessible()
+                if gaudi_accessible:
+                    # Gaudi にアクセスできるなら Gaudi を Activate する
+                    fun = self._construct_femtet_api(fun)  # (str) -> Callable
+                    if fun.__name__ != 'Activate':
+                        # 再帰ループにならないように
+                        self._call_femtet_api(
+                            self.Femtet.Gaudi.Activate,
+                            False,  # None 以外なら何でもいい
+                            Exception,
+                            'Gaudi のオープンに失敗しました',
+                            print_indent=print_indent + 1
+                        )
+
+                else:
+                    # Gaudi にアクセスできないならば次の API 実行でエラーになる
+                    pass
+
             except com_error:
-                # Gaudi へのアクセスだけで com_error が生じうる
-                # そういう場合は次の API 実行で間違いなくエラーになるので放っておく
                 pass
 
         # API を実行
         try:
+            # gaudi のメソッドかどうかにかかわらず、gaudi へのアクセスでエラーが出るか
+            if not self._check_gaudi_accessible():
+                raise com_error
+
+            # gaudi_accessible なので関数が何であろうが安全にアクセスはできる
+            if isinstance(fun, str):
+                fun = self._construct_femtet_api(fun)  # (str) -> Callable
+
             # 解析結果を開いた状態で Gaudi.Activate して ReExecute する場合、ReExecute の前後にアクティブ化イベントが必要
             # さらに、プロジェクトツリーが開いていないとアクティブ化イベントも意味がないらしい。
             if fun.__name__ == 'ReExecute':
                 if self.open_result_with_gui or self.parametric_output_indexes_use_as_objective:
                     post_activate_message(self.Femtet.hWnd)
+                # API を実行
                 returns = fun(*args, **kwargs)  # can raise pywintypes.error
                 if self.open_result_with_gui or self.parametric_output_indexes_use_as_objective:
                     post_activate_message(self.Femtet.hWnd)
             else:
                 returns = fun(*args, **kwargs)
+
+        # API の実行に失敗
         except (com_error, error):
-            # パターン 2 エラーが生じたことは確定なのでエラーが起こるよう returns を作る
+            # 後続の処理でエラー判定されるように returns を作る
             # com_error ではなく error の場合はおそらく Femtet が落ちている
             if ret_for_check_idx is None:
                 returns = return_value_if_failed
@@ -361,7 +405,7 @@ class FemtetInterface(FEMInterface):
 
     def femtet_is_alive(self) -> bool:
         """Returns connected femtet process is existing or not."""
-        return _get_pid(self.Femtet.hWnd) > 0
+        return _get_pid(self.Femtet.hWnd) > 0  # hWnd の値はすでに Femtet が終了している場合は 0
 
     def open(self, femprj_path: str, model_name: str or None = None) -> None:
         """Open specific analysis model with connected Femtet."""
@@ -479,7 +523,7 @@ class FemtetInterface(FEMInterface):
         # 変数更新のための処理
         sleep(0.1)  # Gaudi がおかしくなる時がある対策
         self._call_femtet_api(
-            self.Femtet.Gaudi.Activate,
+            'self.Femtet.Gaudi.Activate',
             True,  # 戻り値を持たないのでここは無意味で None 以外なら何でもいい
             Exception,  # 生きてるのに開けない場合
             error_message=Msg.NO_ANALYSIS_MODEL_IS_OPEN,
@@ -553,7 +597,7 @@ class FemtetInterface(FEMInterface):
 
         # 設計変数に従ってモデルを再構築
         self._call_femtet_api(
-            self.Femtet.Gaudi.ReExecute,
+            'self.Femtet.Gaudi.ReExecute',
             False,
             ModelError,  # 生きてるのに失敗した場合
             error_message=Msg.ERR_RE_EXECUTE_MODEL_FAILED,
@@ -576,7 +620,7 @@ class FemtetInterface(FEMInterface):
         """Execute FEM analysis."""
         # # メッシュを切る
         self._call_femtet_api(
-            self.Femtet.Gaudi.Mesh,
+            'self.Femtet.Gaudi.Mesh',
             0,
             MeshError,
             Msg.ERR_MODEL_MESH_FAILED,
@@ -630,6 +674,11 @@ class FemtetInterface(FEMInterface):
     def quit(self, timeout=1, force=True):
         """Force to terminate connected Femtet."""
         major, minor, bugfix = 2024, 0, 1
+
+        # すでに終了しているならば何もしない
+        if not self.femtet_is_alive():
+            return
+
         if self._version() >= _version(major, minor, bugfix):
             # gracefully termination method without save project available from 2024.0.1
             try:
@@ -715,16 +764,20 @@ class FemtetInterface(FEMInterface):
             # save to worker space
             result_dir = self.femprj_path.replace('.femprj', '.Results')
             pdt_path = os.path.join(result_dir, self.model_name + '.pdt')
-            succeed = self.Femtet.SavePDT(pdt_path, True)
 
-            # convert .pdt to ByteIO
-            if succeed:
-                with open(pdt_path, 'rb') as f:
-                    content = f.read()
-                return content
+            self._call_femtet_api(
+                fun=self.Femtet.SavePDT,
+                args=(pdt_path, True),
+                return_value_if_failed=False,
+                if_error=SolveError,
+                error_message=Msg.ERR_FAILED_TO_SAVE_PDT,
+                is_Gaudi_method=False,
+            )
 
-            else:
-                raise Exception(Msg.ERR_FAILED_TO_SAVE_PDT)
+            # convert .pdt to ByteIO and return it
+            with open(pdt_path, 'rb') as f:
+                content = f.read()
+            return content
 
         else:
             return None

pyfemtet/opt/opt/_base.py

@@ -1,5 +1,6 @@
 # typing
 from abc import ABC, abstractmethod
+from typing import Optional
 
 # built-in
 import traceback
@@ -13,6 +14,7 @@ import pandas as pd
 from pyfemtet.opt.interface import FemtetInterface
 from pyfemtet.opt._femopt_core import OptimizationStatus
 from pyfemtet.message import Msg
+from pyfemtet.opt.parameter import ExpressionEvaluator
 
 # logger
 import logging
@@ -134,6 +136,7 @@ class AbstractOptimizer(ABC):
         self.fem_class = None
         self.fem_kwargs = dict()
         self.parameters: pd.DataFrame = pd.DataFrame()
+        self.variables: ExpressionEvaluator = ExpressionEvaluator()
         self.objectives: dict = dict()
         self.constraints: dict = dict()
         self.entire_status = None  # actor
@@ -153,14 +156,22 @@ class AbstractOptimizer(ABC):
         # interruption の実装は具象クラスに任せる
 
         # x の更新
-        self.parameters['value'] = x
+        prm_names = self.variables.get_parameter_names()
+        for name, value in zip(prm_names, x):
+            self.variables.variables[name].value = value
+
         logger.info('---------------------')
         logger.info(f'input: {x}')
 
         # FEM の更新
         logger.debug('fem.update() start')
         try:
-            self.fem.update(self.parameters)
+            df_to_fem = self.variables.get_variables(
+                format='df',
+                filter_pass_to_fem=True
+            )
+            self.fem.update(df_to_fem)
+
         except Exception as e:
             logger.info(f'{type(e).__name__} : {e}')
             logger.info(Msg.INFO_EXCEPTION_DURING_FEM_ANALYSIS)
@@ -178,8 +189,14 @@ class AbstractOptimizer(ABC):
         c = [cns.calc(self.fem) for cns in self.constraints.values()]
 
         logger.debug('history.record start')
+
+        df_to_opt = self.variables.get_variables(
+            format='df',
+            filter_parameter=True,
+        )
+
         self.history.record(
-            self.parameters,
+            df_to_opt,
             self.objectives,
             self.constraints,
             y,
@@ -220,17 +237,7 @@ class AbstractOptimizer(ABC):
             ValueError: If an invalid format is provided.
 
         """
-        if format == 'df':
-            return self.parameters
-        elif format == 'values' or format == 'value':
-            return self.parameters.value.values
-        elif format == 'dict':
-            ret = {}
-            for i, row in self.parameters.iterrows():
-                ret[row['name']] = row.value
-            return ret
-        else:
-            raise ValueError(f'get_parameter() got invalid format: {format}')
+        return self.variables.get_variables(format=format)
 
     def _check_interruption(self):
         """"""

pyfemtet/opt/opt/_optuna.py

@@ -63,19 +63,25 @@ class OptunaOptimizer(AbstractOptimizer):
             trial.study.stop()  # 現在実行中の trial を最後にする
             return None  # set TrialState FAIL
 
-        # candidate x
-        x = []
-        for i, row in self.parameters.iterrows():
-            v = trial.suggest_float(row['name'], row['lb'], row['ub'], step=row['step'])
-            x.append(v)
-        x = np.array(x).astype(float)
+        # candidate x and update parameters
+        for prm in self.variables.get_variables(format='raw', filter_parameter=True):
+            value = trial.suggest_float(
+                name=prm.name,
+                low=prm.lower_bound,
+                high=prm.upper_bound,
+                step=prm.step,
+            )
+            self.variables.variables[prm.name].value = value
+
+        # update expressions
+        self.variables.evaluate()
 
         # message の設定
         self.message = trial.user_attrs['message'] if 'message' in trial.user_attrs.keys() else ''
 
-        # fem や opt 経由で変数を取得して constraint を計算する時のためにアップデート
-        self.parameters['value'] = x
-        self.fem.update_parameter(self.parameters)
+        # fem 経由で変数を取得して constraint を計算する時のためにアップデート
+        df_fem = self.variables.get_variables(format='df', filter_pass_to_fem=True)
+        self.fem.update_parameter(df_fem)
 
         # strict 拘束
         strict_constraints = [cns for cns in self.constraints.values() if cns.strict]
@@ -89,10 +95,11 @@ class OptunaOptimizer(AbstractOptimizer):
             if not feasible:
                 logger.info(Msg.INFO_INFEASIBLE)
                 logger.info(f'Constraint: {cns.name}')
-                logger.info(self.get_parameter('dict'))
+                logger.info(self.variables.get_variables('dict', filter_parameter=True))
                 raise optuna.TrialPruned()  # set TrialState PRUNED because FAIL causes similar candidate loop.
 
         # 計算
+        x = self.variables.get_variables(format='values', filter_parameter=True)
         try:
             _, _y, c = self.f(x)  # f の中で info は出している
         except (ModelError, MeshError, SolveError) as e:
@@ -175,7 +182,7 @@ class OptunaOptimizer(AbstractOptimizer):
             # 初期値の設定
             if len(self.study.trials) == 0:  # リスタートでなければ
                 # ユーザーの指定した初期値
-                params = self.get_parameter('dict')
+                params = self.variables.get_variables('dict', filter_parameter=True)
                 self.study.enqueue_trial(params, user_attrs={"message": "initial"})
 
                 # add_initial_parameter で追加された初期値
@@ -197,8 +204,8 @@ class OptunaOptimizer(AbstractOptimizer):
                     bounds = []
                     for i, row in self.parameters.iterrows():
                         names.append(row['name'])
-                        lb = row['lb']
-                        ub = row['ub']
+                        lb = row['lower_bound']
+                        ub = row['upper_bound']
                         bounds.append([lb, ub])
                     data = generate_lhs(bounds, seed=self.seed)
                     for datum in data:

pyfemtet/opt/opt/_scipy.py

@@ -114,7 +114,7 @@ class ScipyOptimizer(AbstractOptimizer):
         if 'bounds' not in self.minimize_kwargs.keys():
             bounds = []
             for i, row in self.parameters.iterrows():
-                lb, ub = row['lb'], row['ub']
+                lb, ub = row['lower_buond'], row['upper_bound']
                 if lb is None: lb = -np.inf
                 if ub is None: ub = np.inf
                 bounds.append([lb, ub])

pyfemtet/opt/opt/_scipy_scalar.py

@@ -78,7 +78,7 @@ class ScipyScalarOptimizer(AbstractOptimizer):
         if 'bounds' not in self.minimize_kwargs.keys():
             bounds = []
             for i, row in self.parameters.iterrows():
-                lb, ub = row['lb'], row['ub']
+                lb, ub = row['lower_bound'], row['upper_bound']
                 if lb is None: lb = -np.inf
                 if ub is None: ub = np.inf
                 bounds.append([lb, ub])

pyfemtet/opt/parameter.py

@@ -0,0 +1,113 @@
+from graphlib import TopologicalSorter
+from dataclasses import dataclass
+import inspect
+from typing import Optional, Callable, Any, Tuple, Dict
+
+import numpy as np
+import pandas as pd
+
+
+@dataclass
+class Variable:
+    name: str
+    value: float
+    pass_to_fem: Optional[bool] = True
+    properties: Optional[dict[Any]] = None
+
+
+@dataclass
+class Parameter(Variable):
+    lower_bound: Optional[float] = None
+    upper_bound: Optional[float] = None
+    step: Optional[float] = None
+
+
+@dataclass
+class Expression(Variable):
+    # fun に params を自動で代入するので positional args は実装しない
+    fun: Optional[Callable] = None
+    kwargs: Optional[Dict] = None
+
+
+class ExpressionEvaluator:
+    def __init__(self):
+        self.variables = {}  # Parameter 又は計算された Expression が入る
+        self.parameters = {}
+        self.expressions = {}
+        self.dependencies = {}
+        self.evaluation_order = []
+
+    def add_parameter(self, prm: Parameter):
+        self.variables[prm.name] = prm
+        self.parameters[prm.name] = prm
+        self.dependencies[prm.name] = set()
+
+    def add_expression(self, exp: Expression):
+        self.expressions[exp.name] = exp
+
+        # params は Python 変数として使える文字のみからなる文字列のリスト
+        params = inspect.signature(exp.fun).parameters
+        self.dependencies[exp.name] = set(params) - set(exp.kwargs.keys())
+
+    def resolve(self):
+        ts = TopologicalSorter(self.dependencies)
+        self.evaluation_order = list(ts.static_order())
+
+    def evaluate(self):
+        # order 順に見ていき、expression なら計算して variables を更新する
+        for var_name in self.evaluation_order:
+            if var_name in self.expressions.keys():
+                # 現在の expression に関して parameter 部分の引数 kwargs を作成
+                kwargs = {param: self.variables[param].value for param in self.dependencies[var_name]}
+
+                # fun に すべての kwargs を入れて expression の value を更新
+                exp: Expression = self.expressions[var_name]
+                kwargs.update(exp.kwargs)
+                exp.value = exp.fun(**kwargs)
+
+                # 計算済み variables に追加
+                self.variables[var_name] = exp
+
+    def get_variables(self, format='dict', filter_pass_to_fem=False, filter_parameter=False):
+        """format: dict, values, df, raw(list of Variable object)"""
+
+        # リストを作成
+        vars = [self.variables[name] for name in self.evaluation_order if name in self.variables]
+
+        # 必要なら FEM に直接使うもののみ取り出し
+        if filter_pass_to_fem:
+            vars = [var for var in vars if var.pass_to_fem]
+
+        # 必要なら parameter のみ取り出し
+        if filter_parameter:
+            vars = [var for var in vars if isinstance(var, Parameter)]
+
+        if format == 'raw':
+            return vars
+
+        elif format == 'dict':
+            return {var.name: var.value for var in vars}
+
+        elif format == 'values':
+            return np.array([var.value for var in vars]).astype(float)
+
+        elif format == 'df':
+            data = dict(
+                    name=[var.name for var in vars],
+                    value=[var.value for var in vars],
+                    properties=[var.properties for var in vars],
+                )
+            if filter_parameter:
+                data.update(
+                    dict(
+                        lower_bound=[var.lower_bound for var in vars],
+                        upper_bound=[var.upper_bound for var in vars],
+                    )
+                )
+            return pd.DataFrame(data)
+
+        else:
+            raise NotImplementedError(f'invalid format: {format}. Valid formats are `dict`, `values`, `df` and `raw`(= list of Variables).')
+
+    def get_parameter_names(self):
+        return list(self.parameters.keys())

{pyfemtet-0.4.19.dist-info → pyfemtet-0.4.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfemtet
-Version: 0.4.19
+Version: 0.4.21
 Summary: Design parameter optimization using Femtet.
 Home-page: https://github.com/pyfemtet/pyfemtet
 License: BSD-3-Clause
@@ -16,7 +16,7 @@ Requires-Dist: babel (>=2.15.0,<3.0.0)
 Requires-Dist: botorch (>=0.9.5) ; python_version >= "3.12" and python_version < "3.13"
 Requires-Dist: botorch (>=0.9.5,<0.10.0) ; python_version < "3.12"
 Requires-Dist: colorlog (>=6.8.0,<7.0.0)
-Requires-Dist: dash (>=2.14.2,<3.0.0)
+Requires-Dist: dash (>=2.17.0,<3.0.0)
 Requires-Dist: dash-bootstrap-components (>=1.5.0,<2.0.0)
 Requires-Dist: dask (>=2023.12.1,<2024.0.0)
 Requires-Dist: distributed (>=2023.12.1,<2024.0.0)
@@ -26,11 +26,12 @@ Requires-Dist: openpyxl (>=3.1.2,<4.0.0)
 Requires-Dist: optuna (>=3.4.0,<4.0.0)
 Requires-Dist: optuna-integration (>=3.6.0,<4.0.0)
 Requires-Dist: pandas (>=2.1.3,<3.0.0)
-Requires-Dist: plotly (>=5.18.0,<6.0.0)
+Requires-Dist: plotly (>=5.22.0,<6.0.0)
 Requires-Dist: psutil (>=5.9.6,<6.0.0)
 Requires-Dist: pytest-dashboard (>=0.1.2,<0.2.0)
 Requires-Dist: pywin32 (>=306,<307)
 Requires-Dist: scipy (>=1.11.4,<2.0.0)
+Requires-Dist: torch (>=2.3.0,<2.4.0)
 Requires-Dist: tqdm (>=4.66.1,<5.0.0)
 Project-URL: Repository, https://github.com/pyfemtet/pyfemtet
 Description-Content-Type: text/markdown

{pyfemtet-0.4.19.dist-info → pyfemtet-0.4.21.dist-info}/RECORD

@@ -12,7 +12,7 @@ pyfemtet/FemtetPJTSample/her_ex40_parametric.py,sha256=B5PQoh71Q3KN2CyLU1gP_Yh9g
 pyfemtet/FemtetPJTSample/wat_ex14_parallel_parametric.py,sha256=UfhJffuXyhzdIWNpOrpV6xLTK1fuVvgyhlyg4Rp-628,2148
 pyfemtet/FemtetPJTSample/wat_ex14_parametric.femprj,sha256=pxacKe0NPNUPAcxqo2cATFApsMKiVt2g2e_FOk4fpjA,172895
 pyfemtet/FemtetPJTSample/wat_ex14_parametric.py,sha256=LGbWxCek0Ad2YrDCKykiQkE3aIypM4g8P3mLd_2anEE,2052
-pyfemtet/__init__.py,sha256=OCiQi0NygMAlBjlUUnm1SyRHaOf3qlZ_qx2T9-TEFkQ,22
+pyfemtet/__init__.py,sha256=1n-NaGbhCs2-5sTHYY-kUYdFODaECYkQxiDw4p6nNng,22
 pyfemtet/_test_util.py,sha256=CT9J19qQ4gYT5glFs8WwlTDmc3SokvdE5ucpB-KCOro,4274
 pyfemtet/core.py,sha256=3lqfBGJ5IuKz2Nqj5pRo7YQqKwx_0ZDL72u95Ur_1p0,1386
 pyfemtet/dispatch_extensions.py,sha256=XVZajbjh7mb6NG4Hq8qff2TJWab75r4Hd59cIvCRsVg,16213
@@ -21,13 +21,13 @@ pyfemtet/message/1. make_pot.bat,sha256=oS38xYsaUnQAuKwUR8hZJFgt3AKBU993fWFDSg2R
 pyfemtet/message/2. make_mo.bat,sha256=nqUi3Cze7JGKkYItlch8ZG2gSbRNZiS2ltuCS7DbmG8,154
 pyfemtet/message/__init__.py,sha256=gE1-XX_PzHj9BbhqPaK5VcIHuv6_Tec5qlPMC3IRiBg,100
 pyfemtet/message/babel.cfg,sha256=rlvsm_EjDU2ki-OLVPG3toWspVuVA0JFAFvFp2U-By4,72
-pyfemtet/message/locales/ja/LC_MESSAGES/messages.mo,sha256=02THhFHvbWT9tWr-M3isYXbjF6-U6rLf9wh-Q8d-EEU,16595
-pyfemtet/message/locales/ja/LC_MESSAGES/messages.po,sha256=KwWy1qFgaf7Xewk3rV8ht3mNPEdPXPJmukdcqS4uuJs,21116
-pyfemtet/message/locales/messages.pot,sha256=CLjvfugvP8O-E6819gd3CmqZVYiwPGwU5kxOUpdukqY,12089
+pyfemtet/message/locales/ja/LC_MESSAGES/messages.mo,sha256=VbUncnHf3ztDF3WqaoNd4AcGqpYKLMEKc1LL5P4yuoQ,16965
+pyfemtet/message/locales/ja/LC_MESSAGES/messages.po,sha256=6UtCDxiDiRetnnSRo-l_BunYfYoIm0L-9Z8qU3r8z8Q,21723
+pyfemtet/message/locales/messages.pot,sha256=JWknwqPn_541aeIEbxp9Y2tqXvUcoM-vgdjeUo4C2T0,12336
 pyfemtet/message/messages.py,sha256=GCzjA6dBLI8108K3hel82pcr1nYTvjJKCfCAn5jZ5OM,11324
 pyfemtet/opt/__init__.py,sha256=AJc1_d0sQ2_X4h_8FOcdmHvSPrFV_vfxlRrZTsqDZuE,612
-pyfemtet/opt/_femopt.py,sha256=LE6ImEyCFRqBpSLkTfgEykjw1gltu59bd3ZB5lE1vjk,23373
-pyfemtet/opt/_femopt_core.py,sha256=X_hIbf0ifiXFv_ADRiRzlyQPHK_Hzyd7xEday7ATvzY,25293
+pyfemtet/opt/_femopt.py,sha256=lJJYDNoeAFlPEDD7mMz5PXA-x91vz6u0hnai7FLJJ30,24905
+pyfemtet/opt/_femopt_core.py,sha256=ezf-E1_oaupSgHb0mwPooV0nvsrQC1wgtumN5WzQop8,25311
 pyfemtet/opt/femprj_sample/.gitignore,sha256=hx-5Hhaf7kpHe1wvWWfJqjPfObg-zf9CTI4joNh2Hk4,28
 pyfemtet/opt/femprj_sample/ParametricIF - True.femprj,sha256=tCd29CUXmyJ0VH6cV0xTdjQMLBPkCk0UrFwvRbyrcYA,431415
 pyfemtet/opt/femprj_sample/ParametricIF.femprj,sha256=9BtDHmc3cdom0Zq33DTdZ0mDAsIUY6i8SRkkg-n7GO0,442090
@@ -109,17 +109,18 @@ pyfemtet/opt/femprj_sample_jp/wat_ex14_parametric_jp.py,sha256=W30jobW1eEYuAsJJR
 pyfemtet/opt/femprj_sample_jp/wat_ex14_parametric_parallel_jp.py,sha256=ul2JUwlM5jfjNRELHkT7ZDuyMOq5RAHO32vAweEhCwg,2641
 pyfemtet/opt/interface/__init__.py,sha256=qz5BszPuU3jZIoDnPjkPDAgvgHLlx1sYhuqh5ID798k,480
 pyfemtet/opt/interface/_base.py,sha256=I4pJttLeRW-6WWMuCNynwxWPwriiGZk20vHLVcfixZY,2332
-pyfemtet/opt/interface/_femtet.py,sha256=U5sRe8yMsc4Uum_hRGl0C6S8A04a_p388q39d4lHsng,32388
+pyfemtet/opt/interface/_femtet.py,sha256=vWPEn8TpJFCSN48uk430kAFr7_5ralMoOGF8IKvpIjU,34441
 pyfemtet/opt/interface/_femtet_parametric.py,sha256=KDG8SB43AgwuhpCStjvx10G0RzyHhga6k4dfvp0gvYU,2175
 pyfemtet/opt/interface/_femtet_with_nx/__init__.py,sha256=-6W2g2FDEcKzGHmI5KAKQe-4U5jDpMj0CXuma-GZca0,83
 pyfemtet/opt/interface/_femtet_with_nx/_interface.py,sha256=cibPOhsUAvTDJa1xdEhVClZjwPkEx2kBmi61vyTJHUs,5514
 pyfemtet/opt/interface/_femtet_with_nx/update_model.py,sha256=P7VH0i_o-X9OUe6AGaLF1fACPeHNrMjcrOBCA3MMrI4,3092
 pyfemtet/opt/interface/_femtet_with_sldworks.py,sha256=Ldr8Esa5xZ-D_E5uIXBTF2DHslXVMFDYOsqTd8FhY1M,6242
 pyfemtet/opt/opt/__init__.py,sha256=_9hkYtxk-8PfWkWJaiYqESrH5CnSKM2Gv93HxtD-f3o,383
-pyfemtet/opt/opt/_base.py,sha256=LZp17pjkqEKoS4W4j2Vj4Afc9Y_Yv8p5fZ7m7nHkFC0,11273
-pyfemtet/opt/opt/_optuna.py,sha256=GFz7PcI8rPAiqqzK3hqjaL0WCAbA6gfN2tBYufXxPBQ,10701
-pyfemtet/opt/opt/_scipy.py,sha256=HkEZTjMRJvOoIWIpIEbJaZJjZQkQ73FjD9c4NZADeIc,4185
-pyfemtet/opt/opt/_scipy_scalar.py,sha256=6nFAnERtQIMnPJCwR5HkpKetxrVJaSFWHxJfXMPn3wg,2815
+pyfemtet/opt/opt/_base.py,sha256=pIxreZzhT4YQOj7mtXnfidNqJ18ypZBpD2CK0G_uQ6Q,11425
+pyfemtet/opt/opt/_optuna.py,sha256=y4MnFPDyP1eheq5nUh786z0BM-pHNYrSwjo1TD044h0,11105
+pyfemtet/opt/opt/_scipy.py,sha256=8Alx9sIlLzNTxuVGTHOJMsvW5LSp8WDFiqD8IV6CVPc,4203
+pyfemtet/opt/opt/_scipy_scalar.py,sha256=ot1KbetZeQh5XkllzHc1PubPjBPgVBtC0a4jllNi8G4,2833
+pyfemtet/opt/parameter.py,sha256=YLE9lmYRaZA8isnTPJnbYXpUn6zsJFW4xg03QaSWey8,3950
 pyfemtet/opt/prediction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/prediction/base.py,sha256=q4lDqrOtAkiWG-OblQEddnEVj29Q-EJE3-O5QTOb3Q4,1761
 pyfemtet/opt/prediction/single_task_gp.py,sha256=VbsVllzXzCGqkM1fC61Ouqwuv3ddS5INbFwDG8v-d6g,3303
@@ -145,8 +146,8 @@ pyfemtet/opt/visualization/wrapped_components/dbc.py,sha256=wzR1ZMOb4uwPNTMFn5up
 pyfemtet/opt/visualization/wrapped_components/dcc.py,sha256=hcW7SR6VIMn4S4-JMyohvOzdc0Aw8A4chIeHqQEUbFU,17499
 pyfemtet/opt/visualization/wrapped_components/html.py,sha256=sE2XHTDY1GvA1NW7y6SKWf-WglVXFKKvXhU9h3z53_g,95652
 pyfemtet/opt/visualization/wrapped_components/str_enum.py,sha256=NZqbh2jNEAckvJyZv__MWeRs2F2Q-dkJCWo30rU2rrM,1383
-pyfemtet-0.4.19.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.4.19.dist-info/METADATA,sha256=hRr5yBMmdzSVSaLV4hUA0kk9omm7SFpE-mT5ogpx6u4,3421
-pyfemtet-0.4.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyfemtet-0.4.19.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.4.19.dist-info/RECORD,,
+pyfemtet-0.4.21.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
+pyfemtet-0.4.21.dist-info/METADATA,sha256=r0QpSmzWtYQ9Us_OsVe_cNJGRo8E6JKci0aL9SDD-qI,3459
+pyfemtet-0.4.21.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyfemtet-0.4.21.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.4.21.dist-info/RECORD,,