pyfemtet 0.8.9__py3-none-any.whl → 0.8.11__py3-none-any.whl

pyfemtet/__init__.py

@@ -1 +1 @@
-__version__ = "0.8.9"
+__version__ = "0.8.11"

pyfemtet/_message/locales/ja/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-01-29 15:47+0900\n"
+"POT-Creation-Date: 2025-02-19 13:47+0900\n"
 "PO-Revision-Date: 2024-07-22 14:05+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: ja\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.16.0\n"
+"Generated-By: Babel 2.17.0\n"
 
 #: pyfemtet/_message/messages.py:30
 msgid "hello!"
@@ -542,6 +542,14 @@ msgstr "ひとつの設計変数に対する目的関数の変化"
 msgid "The vertical axis is objective, and the horizontal axis is parameter."
 msgstr "縦軸は目的関数、横軸は設計変数です。"
 
+#: pyfemtet/_message/messages.py:201
+msgid "The importance of parameters evaluated by fANOVA"
+msgstr "fANOVA に基づくパラメータ重要度"
+
+#: pyfemtet/_message/messages.py:202
+msgid "The normalized relative importance of parameters. Please note that the importance is calculated from the overall relationship of the input-output response, rather than from a specific solution."
+msgstr "相対的なパラメータの重要度です。この重要度は特定の解におけるものではなく、入力-出力応答全体の関係から計算されていることに注意してください。"
+
 #~ msgid "The magnitude relationship is incorrect. "
 #~ msgstr ""
 

pyfemtet/_message/locales/messages.pot

@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-01-29 15:47+0900\n"
+"POT-Creation-Date: 2025-02-19 13:47+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.16.0\n"
+"Generated-By: Babel 2.17.0\n"
 
 #: pyfemtet/_message/messages.py:30
 msgid "hello!"
@@ -541,3 +541,11 @@ msgstr ""
 msgid "The vertical axis is objective, and the horizontal axis is parameter."
 msgstr ""
 
+#: pyfemtet/_message/messages.py:201
+msgid "The importance of parameters evaluated by fANOVA"
+msgstr ""
+
+#: pyfemtet/_message/messages.py:202
+msgid "The normalized relative importance of parameters. Please note that the importance is calculated from the overall relationship of the input-output response, rather than from a specific solution."
+msgstr ""
+

pyfemtet/_message/messages.py

@@ -198,4 +198,5 @@ class Message:
     DETAIL_PAGE_CONTOUR_DESCRIPTION = _('The axes are parameters, and the color shows objective value.')
     DETAIL_PAGE_SLICE_HEADER = _('The response of an objective versus one parameter')
     DETAIL_PAGE_SLICE_DESCRIPTION = _('The vertical axis is objective, and the horizontal axis is parameter.')
-
+    DETAIL_PAGE_IMPORTANCE_HEADER = _('The importance of parameters evaluated by fANOVA')
+    DETAIL_PAGE_IMPORTANCE_DESCRIPTION = _('The normalized relative importance of parameters. Please note that the importance is calculated from the overall relationship of the input-output response, rather than from a specific solution.')

pyfemtet/_util/excel_parse_util.py

@@ -13,15 +13,15 @@ __all__ = [
 ]
 
 
-def parse_excel(book_path, sheet_name, keyword, required, optional) -> pd.DataFrame:
+def parse_excel(book_path, sheet_name, keyword, required, optional, raise_if_no_keyword=True) -> pd.DataFrame:
     """Excel シートからパラメータを取得します。
 
     シートのパースプロセスは以下の通りです。
 
     1. シート全体 (A1 セルから、値が入力されている最終セルまで) をデータに取り込みます。
-    2. すべてのセルが空白である列をデータから除きます。
-    3. すべてのセルが空白である行をデータから除きます。
-    4. 最も左上（上が優先）にある keyword に一致するセルより上および左の行・列をデータから除きます。
+    2. 最も左上（上が優先）にある keyword に一致するセルより上および左の行・列をデータから除きます。
+    3. その時点のデータの上から順に見てすべてのセルが空白である行以下の行をデータから除きます。
+    4. すべてのセルが空白である列をデータから除きます。
 
     Args:
         book_path: Excel book のパス。
@@ -29,6 +29,7 @@ def parse_excel(book_path, sheet_name, keyword, required, optional) -> pd.DataFr
         keyword (str): 必ず含まれるべき、表データの最初の列名として使う文字列。
         required (list[str]): 必ず含まれるべき、表データの列名として使う文字列のリスト。
         optional (list[str]): 表データの列名として使ってよい文字列のリスト。
+        raise_if_no_keyword (bool, optional): 指定されたシートに keyword が含まれない場合エラーにするかどうか。
 
     Returns:
 
@@ -41,21 +42,31 @@ def parse_excel(book_path, sheet_name, keyword, required, optional) -> pd.DataFr
     # 読み込み
     df = pd.read_excel(book_path, sheet_name, header=None)
 
-    # NaN のみからなる列を削除する
-    valid_columns = [col for col in df.columns if df[col].notna().sum()]
-    df = df[valid_columns]
-
-    # NaN のみからなる行を削除する
-    valid_rows = [row for row in df.index if df.loc[row].notna().sum()]
-    df = df.loc[valid_rows]
-
     # 「変数名」を左上とする表にする
-    df: pd.DataFrame
     idx = np.where(df.values == keyword)
+    if len(idx[0]) == 0:
+        if raise_if_no_keyword:
+            raise RuntimeError(f'keyword "{keyword}" is lacked in {sheet_name}. ')
+        else:
+            return pd.DataFrame()
+
     r = idx[0][0]
     c = idx[1][0]
     df = pd.DataFrame(df.iloc[1+r:, c:].values, columns=df.iloc[r, c:].values)
 
+    # NaN のみからなる行を最初に見つけるまでデータに追加する
+    valid_rows = []
+    for row in df.index:
+        if df.loc[row].notna().sum():
+            valid_rows.append(row)
+        else:
+            break
+    df = df.loc[valid_rows]
+
+    # NaN のみからなる列を削除する
+    valid_columns = [col for i, col in enumerate(df.columns) if df.iloc[:, i].notna().sum()]
+    df = df[valid_columns]
+
     # パースが成功しているかチェックする
     lack = True
     for col in df.columns:
@@ -76,8 +87,15 @@ class ParseBase:
     OPTIONAL_COLUMNS = []
 
     @classmethod
-    def parse(cls, book_path, sheet_name) -> pd.DataFrame:
-        return parse_excel(book_path, sheet_name, cls.KEYWORD, cls.REQUIRED_COLUMNS, cls.OPTIONAL_COLUMNS)
+    def parse(cls, book_path, sheet_name, raise_if_no_keyword=True) -> pd.DataFrame:
+        return parse_excel(
+            book_path,
+            sheet_name,
+            cls.KEYWORD,
+            cls.REQUIRED_COLUMNS,
+            cls.OPTIONAL_COLUMNS,
+            raise_if_no_keyword,
+        )
 
 
 class ParseAsParameter(ParseBase):

pyfemtet/opt/_femopt.py

@@ -139,6 +139,7 @@ class FEMOpt:
         self.monitor_host_record = None
         self._hv_reference = None
         self._extra_space_dir = None
+        self._opt_exceptions = []
 
     # multiprocess 時に pickle できないオブジェクト参照の削除
     def __getstate__(self):
@@ -925,6 +926,7 @@ class FEMOpt:
             sleep(1)  # monitor が terminated 状態で少なくとも一度更新されなければ running のまま固まる
 
             # 全ての Exception を再表示
+            self._opt_exceptions = opt_exceptions
             for i, opt_exception in enumerate(opt_exceptions):
                 if opt_exception is not None:
                     print()

pyfemtet/opt/_femopt_core.py

@@ -306,7 +306,7 @@ class Function:
                         fun.__globals__[varname] = _Scapegoat()
 
         self.fun = fun
-        self.name = name
+        self.name: str = name
         self.args = args
         self.kwargs = kwargs
 
@@ -325,7 +325,7 @@ class Function:
         args = self.args
         # Femtet 特有の処理
         if isinstance(fem, FemtetInterface):
-            args = (fem.Femtet, *args)
+            args = (fem.object_passed_to_functions, *args)
         return float(self.fun(*args, **self.kwargs))
 
     def _restore_constants(self):
@@ -853,7 +853,7 @@ class History:
 
         # 最小化問題に変換された objective values を取得
         raw_objective_values = df[self.obj_names].values
-        objective_values = np.full_like(raw_objective_values, np.nan)
+        objective_values = np.full_like(raw_objective_values, np.nan, dtype=float)
         for n_trial in range(len(raw_objective_values)):
             for obj_idx, (_, objective) in enumerate(objectives.items()):
                 objective_values[n_trial, obj_idx] = objective.convert(raw_objective_values[n_trial, obj_idx])

pyfemtet/opt/interface/__init__.py

@@ -25,7 +25,7 @@ from pyfemtet.opt.interface._surrogate._base import SurrogateModelInterfaceBase
 from pyfemtet.opt.interface._surrogate._singletaskgp import PoFBoTorchInterface
 
 
-__all__ =[
+__all__ = [
     'FEMInterface',
     'NoFEM',
     'FemtetInterface',

pyfemtet/opt/interface/_base.py

@@ -24,18 +24,27 @@ class FEMInterface(ABC):
 
     """
 
+    kwargs = None
+
     def __init__(
             self,
             **kwargs
     ):
         # restore のための情報保管
-        self.kwargs = kwargs
+        if self.kwargs is None:
+            self.kwargs = kwargs
+        else:
+            self.kwargs.update(kwargs)
 
     @abstractmethod
     def update(self, parameters: pd.DataFrame) -> None:
         """Updates the FEM analysis based on the proposed parameters."""
         raise NotImplementedError('update() must be implemented.')
 
+    @property
+    def object_passed_to_functions(self):
+        return self
+
     def check_param_value(self, param_name) -> float or None:
         """Checks the value of a parameter in the FEM model (if implemented in concrete class)."""
         pass
@@ -50,13 +59,13 @@ class FEMInterface(ABC):
         pass
 
     def load_parameter(self, opt) -> None:  # opt: AbstractOptimizer
-        raise NotImplementedError()
+        pass
 
     def load_objective(self, opt) -> None:  # opt: AbstractOptimizer
-        raise NotImplementedError()
+        pass
 
     def load_constraint(self, opt) -> None:  # opt: AbstractOptimizer
-        raise NotImplementedError()
+        pass
 
     def _setup_before_parallel(self, client) -> None:
         """Preprocessing before launching a dask worker (if implemented in concrete class).

pyfemtet/opt/interface/_excel_interface.py

@@ -55,36 +55,36 @@ class ExcelInterface(FEMInterface):
         input_xlsm_path (str or Path):
             設計変数の定義を含む Excel ファイルのパスを指定
             します。
-            
+
         input_sheet_name (str):
             設計変数の定義を含むシートの名前を指定します。
-            
+
         output_xlsm_path (str or Path, optional):
             目的関数の定義を含む Excel ファイルのパスを指定
             します。指定しない場合は ``input_xlsm_path`` と
             同じと見做します。
-            
+
         output_sheet_name (str, optional):
             目的関数の定義を含む含むシートの名前を指定します。
             指定しない場合は ``input_sheet_name`` と同じと見
             做します。
-            
+
         procedure_name (str, optional):
             Excel マクロ関数名を指定します。指定しない場合は
             ``FemtetMacro.FemtetMain`` と見做します。
-            
+
         procedure_args (list or tuple, optional):
             Excel マクロ関数に渡す引数をリストまたはタプルで
             指定します。
-            
+
         connect_method (str, optional):
             Excel との接続方法を指定します。 'auto' または
-            'new' が利用可能です。デフォルトは 'auto' です。
-            
+            'new' が利用可能です。デフォルトは 'new' です。
+
         procedure_timeout (float or None, optional):
             Excel マクロ関数のタイムアウト時間を秒単位で指定
             します。 None の場合はタイムアウトなしとなります。
-            
+
         setup_xlsm_path (str or Path, optional):
             セットアップ時に呼ぶ関数を含む xlsm のパスです。
             指定しない場合は ``input_xlsm_path`` と
@@ -135,7 +135,7 @@ class ExcelInterface(FEMInterface):
     Attributes:
         input_xlsm_path (Path):
             設計変数の定義を含む Excel ファイルのパス。
-            
+
         input_sheet_name (str):
             設計変数の定義を含むシートの名前。
 
@@ -232,7 +232,7 @@ class ExcelInterface(FEMInterface):
             constraint_sheet_name: str = None,
             procedure_name: str = None,
             procedure_args: list or tuple = None,
-            connect_method: str = 'auto',  # or 'new'
+            connect_method: str = 'new',  # or 'auto'
             procedure_timeout: float or None = None,
             setup_xlsm_path: str or Path = None,
             setup_procedure_name: str = None,
@@ -257,7 +257,7 @@ class ExcelInterface(FEMInterface):
         self.output_sheet_name = output_sheet_name if output_sheet_name is not None else input_sheet_name
         self.constraint_xlsm_path = str(input_xlsm_path) if constraint_xlsm_path is None else str(constraint_xlsm_path)
         self.constraint_sheet_name = constraint_sheet_name or self.input_sheet_name
-        self.procedure_name = procedure_name or 'FemtetMacro.FemtetMain'
+        self.procedure_name = procedure_name
         self.procedure_args = procedure_args or []
         assert connect_method in ['new', 'auto']
         self.connect_method = connect_method
@@ -271,7 +271,8 @@ class ExcelInterface(FEMInterface):
         self.setup_procedure_name = setup_procedure_name
         self.setup_procedure_args = setup_procedure_args or []
 
-        self.teardown_xlsm_path = str(input_xlsm_path) if teardown_xlsm_path is None else str(teardown_xlsm_path)  # あとで取得する
+        self.teardown_xlsm_path = str(input_xlsm_path) if teardown_xlsm_path is None else str(
+            teardown_xlsm_path)  # あとで取得する
         self.teardown_procedure_name = teardown_procedure_name
         self.teardown_procedure_args = teardown_procedure_args or []
 
@@ -442,7 +443,7 @@ class ExcelInterface(FEMInterface):
             self.excel = DispatchEx('Excel.Application')
 
         # FemtetRef を追加する
-        self.open_femtet_ref_xla()  # ここでエラーが発生しているかも？
+        self.open_femtet_ref_xla()
         sleep(0.5)
 
         # 起動した excel の pid を記憶する
@@ -516,7 +517,8 @@ class ExcelInterface(FEMInterface):
                 self.sh_constraint = sh
                 break
         else:
-            raise RuntimeError(f'Sheet {self.constraint_sheet_name} does not exist in the book {self.wb_constraint.Name}.')
+            raise RuntimeError(
+                f'Sheet {self.constraint_sheet_name} does not exist in the book {self.wb_constraint.Name}.')
 
         # ===== setup =====
         # 開く (setup)
@@ -618,18 +620,19 @@ class ExcelInterface(FEMInterface):
         self.update_parameter(parameters)
 
         # マクロ実行
-        try:
-            with watch_excel_macro_error(self.excel, timeout=self.procedure_timeout):
-                self.excel.Run(
-                    f'{self.procedure_name}',
-                    *self.procedure_args
-                )
+        if self.procedure_name is not None:
+            try:
+                with watch_excel_macro_error(self.excel, timeout=self.procedure_timeout):
+                    self.excel.Run(
+                        f'{self.procedure_name}',
+                        *self.procedure_args
+                    )
 
-            # 再計算
-            self.excel.CalculateFull()
+                # 再計算
+                self.excel.CalculateFull()
 
-        except com_error as e:
-            raise SolveError(f'Failed to run macro {self.procedure_name}. The original message is: {e}')
+            except com_error as e:
+                raise SolveError(f'Failed to run macro {self.procedure_name}. The original message is: {e}')
 
     def quit(self):
         if self.terminate_excel_when_quit:
@@ -655,7 +658,8 @@ class ExcelInterface(FEMInterface):
                         self.excel.CalculateFull()
 
                     except com_error as e:
-                        raise RuntimeError(f'Failed to run macro {self.teardown_procedure_args}. The original message is: {e}')
+                        raise RuntimeError(
+                            f'Failed to run macro {self.teardown_procedure_args}. The original message is: {e}')
 
             # 不具合の原因になる場合があるので参照設定は解除しないこと
             # self.remove_femtet_ref_xla(self.wb_input)
@@ -726,11 +730,15 @@ class ExcelInterface(FEMInterface):
     def input_workbook(self) -> CDispatch:
         return self.wb_input
 
-    def load_parameter(self, opt) -> None:
+    def load_parameter(self, opt, raise_if_no_keyword=True) -> None:
         from pyfemtet.opt.optimizer import AbstractOptimizer, logger
         opt: AbstractOptimizer
 
-        df = ParseAsParameter.parse(self.input_xlsm_path, self.input_sheet_name)
+        df = ParseAsParameter.parse(
+            self.input_xlsm_path,
+            self.input_sheet_name,
+            raise_if_no_keyword,
+        )
 
         for i, row in df.iterrows():
 
@@ -777,6 +785,7 @@ class ExcelInterface(FEMInterface):
                 opt.variables.add_parameter(prm)
 
             else:
+                # noinspection PyTypeChecker
                 fixed_prm = Expression(
                     name=name,
                     fun=lambda: value,
@@ -790,12 +799,16 @@ class ExcelInterface(FEMInterface):
                 )
                 opt.variables.add_expression(fixed_prm)
 
-    def load_objective(self, opt):
-        from pyfemtet.opt.optimizer import AbstractOptimizer, logger
+    def load_objective(self, opt, raise_if_no_keyword=True):
+        from pyfemtet.opt.optimizer import AbstractOptimizer
         from pyfemtet.opt._femopt_core import Objective
         opt: AbstractOptimizer
 
-        df = ParseAsObjective.parse(self.output_xlsm_path, self.output_sheet_name)
+        df = ParseAsObjective.parse(
+            self.output_xlsm_path,
+            self.output_sheet_name,
+            raise_if_no_keyword,
+        )
 
         for i, row in df.iterrows():
 
@@ -827,22 +840,19 @@ class ExcelInterface(FEMInterface):
                     kwargs=dict(),
                 )
 
-    def load_constraint(self, opt):
-        from pyfemtet.opt.optimizer import AbstractOptimizer, logger
+    def load_constraint(self, opt, raise_if_no_keyword=False):
+        from pyfemtet.opt.optimizer import AbstractOptimizer
         from pyfemtet.opt._femopt_core import Constraint
         opt: AbstractOptimizer
 
-        # TODO:
-        #   constraint は optional である。
-        #   現在は実装していないが、シートから問題を取得するよりよいロジックができたら
-        #   （つまり、同じシートからパラメータと拘束を取得出来るようになったら）__init__ 内で
-        #   constraint に None が与えられたのか故意に input_sheet_name と同じシート名を
-        #   与えられたのか分別できる実装に変えてそのチェック処理をここに反映する。
-        # constraint_sheet_name が指定されていない場合何もしない
-        if (self.constraint_sheet_name == self.input_sheet_name) and is_same_path(self.input_xlsm_path, self.constraint_xlsm_path):
-            return
-
-        df = ParseAsConstraint.parse(self.constraint_xlsm_path, self.constraint_sheet_name)
+        # constraint は optional であるが
+        # __init__ で input_sheet_name を入れられるので
+        # ここで constraint が実際に与えられているか判断する
+        df = ParseAsConstraint.parse(
+            self.constraint_xlsm_path,
+            self.constraint_sheet_name,
+            raise_if_no_keyword=raise_if_no_keyword,
+        )
 
         for i, row in df.iterrows():
 
@@ -877,7 +887,8 @@ class ExcelInterface(FEMInterface):
             calc_before_solve = True
             if ParseAsConstraint.calc_before_solve in df.columns:
                 _calc_before_solve = row[ParseAsConstraint.calc_before_solve]
-                calc_before_solve = True if is_cell_value_empty(_calc_before_solve) else bool(_calc_before_solve)  # bool or NaN
+                calc_before_solve = True if is_cell_value_empty(_calc_before_solve) else bool(
+                    _calc_before_solve)  # bool or NaN
 
             if use:
                 # constraint を作る
@@ -892,6 +903,7 @@ class ExcelInterface(FEMInterface):
                     using_fem=not calc_before_solve,
                 )
 
+    # TODO: femopt_core.Function の仕様を変えたらここも変える
     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)

pyfemtet/opt/interface/_femtet.py

@@ -192,7 +192,8 @@ class FemtetInterface(FEMInterface):
         # subprocess で restore するための情報保管
         # パスなどは connect_and_open_femtet での処理結果を反映し
         # メインで開いた解析モデルが確実に開かれるようにする
-        super().__init__(
+        FEMInterface.__init__(
+            self,
             femprj_path=self.femprj_path,
             model_name=self.model_name,
             open_result_with_gui=self.open_result_with_gui,
@@ -201,6 +202,10 @@ class FemtetInterface(FEMInterface):
             **kwargs
         )
 
+    @property
+    def object_passed_to_functions(self):
+        return self.Femtet
+
     def use_parametric_output_as_objective(self, number: int, direction: str | float = 'minimize') -> None:
         """Use output setting of Femtet parametric analysis as an objective function.
 
@@ -234,7 +239,6 @@ class FemtetInterface(FEMInterface):
         self.kwargs['parametric_output_indexes_use_as_objective'] = self.parametric_output_indexes_use_as_objective
 
 
-
     def __del__(self):
         self.quit()
         # CoUninitialize()  # Win32 exception occurred releasing IUnknown at 0x0000022427692748

pyfemtet/opt/interface/_femtet_excel.py

@@ -0,0 +1,141 @@
+import re
+from pathlib import Path
+
+from pyfemtet.opt.interface._base import FEMInterface
+from pyfemtet.opt.interface._femtet import FemtetInterface
+from pyfemtet.opt.interface._excel_interface import (
+    ExcelInterface, is_cell_value_empty, ParseAsObjective, ScapeGoatObjective,
+    ParseAsConstraint, search_c, search_r
+)
+
+
+PARAMETRIC_PREFIX = 'パラメトリック'
+
+
+def get_number(name):
+    numbers = re.findall(r'\d+', name)
+    if len(numbers) == 0:
+        raise ValueError('パラメトリック結果出力の番号指定が検出できませんでした。')
+    else:
+        return int(numbers[0])
+
+
+
+class FemtetWithExcelSettingsInterface(FemtetInterface, ExcelInterface, FEMInterface):
+
+    def __init__(
+            self,
+
+            # FemtetInterface arguments
+            femprj_path: str = None, model_name: str = None, connect_method: str = 'auto',
+            save_pdt: str = 'all', strictly_pid_specify: bool = True, allow_without_project: bool = False,
+            open_result_with_gui: bool = True,
+            parametric_output_indexes_use_as_objective: dict[int, str or float] = None,
+
+            # ExcelInterface arguments
+            input_xlsm_path: str or Path = None, input_sheet_name: str = None, output_xlsm_path: str or Path = None,
+            output_sheet_name: str = None, constraint_xlsm_path: str or Path = None,
+            constraint_sheet_name: str = None, procedure_name: str = None, procedure_args: list or tuple = None,
+            procedure_timeout: float or None = None,
+            setup_xlsm_path: str or Path = None, setup_procedure_name: str = None,
+            setup_procedure_args: list or tuple = None, teardown_xlsm_path: str or Path = None,
+            teardown_procedure_name: str = None, teardown_procedure_args: list or tuple = None,
+            related_file_paths: list[str or Path] = None, visible: bool = False, display_alerts: bool = False,
+            terminate_excel_when_quit: bool = None, interactive: bool = True, use_named_range: bool = True,
+
+    ):
+
+        excel_connect_method = 'new'
+
+        ExcelInterface.__init__(
+            self, input_xlsm_path, input_sheet_name, output_xlsm_path, output_sheet_name, constraint_xlsm_path,
+            constraint_sheet_name, procedure_name, procedure_args, excel_connect_method, procedure_timeout,
+            setup_xlsm_path, setup_procedure_name, setup_procedure_args, teardown_xlsm_path,
+            teardown_procedure_name, teardown_procedure_args, related_file_paths, visible, display_alerts,
+            terminate_excel_when_quit, interactive, use_named_range)
+
+        FemtetInterface.__init__(
+            self,
+            femprj_path, model_name, connect_method, save_pdt, strictly_pid_specify, allow_without_project,
+            open_result_with_gui, parametric_output_indexes_use_as_objective
+        )
+
+
+    def load_objective(self, opt, raise_if_no_keyword=True):
+        from pyfemtet.opt.optimizer import AbstractOptimizer
+        from pyfemtet.opt._femopt_core import Objective
+        opt: AbstractOptimizer
+
+        df = ParseAsObjective.parse(
+            self.output_xlsm_path,
+            self.output_sheet_name,
+            raise_if_no_keyword,
+        )
+
+        for i, row in df.iterrows():
+
+            # use(optional)
+            use = True
+            if ParseAsObjective.use in df.columns:
+                _use = row[ParseAsObjective.use]
+                use = False if is_cell_value_empty(_use) else bool(_use)  # bool or NaN
+
+            # name
+            name = str(row[ParseAsObjective.name])
+
+            # direction
+            direction = row[ParseAsObjective.direction]
+            assert not is_cell_value_empty(direction), 'direction is empty.'
+            try:
+                direction = float(direction)
+            except ValueError:
+                direction = str(direction).lower()
+                assert direction in ['minimize', 'maximize']
+
+            if use:
+
+                # name が「パラメトリック」から始まっていたら
+                # パラメトリック解析の結果を目的関数にする
+                if name.startswith(PARAMETRIC_PREFIX):
+                    number = get_number(name)
+                    self.use_parametric_output_as_objective(number, direction)
+
+                # そうでなければ通常の Excel objective を作る
+                else:
+                    opt.objectives[name] = Objective(
+                        fun=ScapeGoatObjective(),
+                        name=name,
+                        direction=direction,
+                        args=(name,),
+                        kwargs=dict(),
+                    )
+
+    def _setup_before_parallel(self, client):
+        FemtetInterface._setup_before_parallel(self, client)
+        ExcelInterface._setup_before_parallel(self, client)
+
+    def _setup_after_parallel(self, *args, **kwargs):
+        FemtetInterface._setup_after_parallel(self, *args, **kwargs)
+        ExcelInterface._setup_after_parallel(self, *args, **kwargs)
+
+    def update(self, parameters) -> None:
+        FemtetInterface.update(self, parameters)
+        ExcelInterface.update(self, parameters)
+
+    def quit(self, timeout=1, force=True):
+        FemtetInterface.quit(self, timeout, force)
+        ExcelInterface.quit(self)
+
+    # noinspection PyMethodOverriding
+    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
+        return float(v)
+
+    # noinspection PyMethodOverriding
+    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
+        return float(v)

pyfemtet/opt/interface/_femtet_parametric.py

@@ -107,7 +107,8 @@ class ParametricResultCSVProcessor:
 
             # 与えられた output_number に関連する行だけ抜き出し
             # エラーがあるかどうかチェックする
-            pdf = df['結果出力設定番号'] == parametric_output_index + 1
+            idx = df['結果出力設定番号'] == parametric_output_index + 1
+            pdf = df[idx]
 
         # 結果出力設定番号 カラムが存在しない
         else:

pyfemtet/opt/interface/_surrogate/_base.py

@@ -17,6 +17,7 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
             self,
             history_path: str = None,
             train_history: History = None,
+            _output_directions: dict[int, str | float] | list[str | float] = None,
     ):
 
         self.train_history: History
@@ -25,6 +26,7 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
         self.obj: dict[str, float] = dict()
         self.df_prm: pd.DataFrame
         self.df_obj: pd.DataFrame
+        self._output_directions = _output_directions
 
         # history_path が与えられた場合、train_history をコンストラクトする
         if history_path is not None:
@@ -54,11 +56,52 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
         self.df_prm = df_prm
         self.df_obj = df_obj
 
+        # _output_directions が与えられている場合、
+        # history から objective の設定を読み込む
+        if self._output_directions is not None:
+            self._load_problem_from_me: bool = True
+
         FEMInterface.__init__(
             self,
             train_history=train_history,  # コンストラクト済み train_history を渡せば並列計算時も何もしなくてよい
         )
 
+
+    def load_objective(self, opt) -> None:
+        from pyfemtet.opt._femopt_core import Objective
+
+        assert self._output_directions is not None
+
+        if isinstance(self._output_directions, dict):
+
+            for index, direction in self._output_directions:
+                obj_name = self.train_history.obj_names[index]
+                opt.objectives[obj_name] = Objective(
+                    lambda obj_name_=obj_name: self.obj[obj_name_],
+                    name=obj_name,
+                    direction=direction,
+                    args=(),
+                    kwargs={},
+                )
+
+        elif isinstance(self._output_directions, list) \
+                or isinstance(self._output_directions, tuple):
+
+            obj_names = self.train_history.obj_names
+            assert len(self._output_directions) == len(obj_names)
+
+            for obj_name, direction in zip(obj_names, self._output_directions):
+                opt.objectives[obj_name] = Objective(
+                    lambda obj_name_=obj_name: self.obj[obj_name_],
+                    name=obj_name,
+                    direction=direction,
+                    args=(),
+                    kwargs={},
+                )
+
+        else:
+            raise ValueError('Invalid _output_directions')
+
     def filter_feasible(self, x: np.ndarray, y: np.ndarray, return_feasibility=False):
         feasible_idx = np.where(~np.isnan(y.sum(axis=1)))
         if return_feasibility:

pyfemtet/opt/interface/_surrogate_excel.py

@@ -0,0 +1,102 @@
+import re
+from pathlib import Path
+
+from pyfemtet.opt._femopt_core import History
+from pyfemtet.opt.interface._base import FEMInterface
+from pyfemtet.opt.interface._surrogate._singletaskgp import PoFBoTorchInterface
+from pyfemtet.opt.interface._excel_interface import ExcelInterface
+
+
+class PoFBoTorchInterfaceWithExcelSettingsInterface(
+    PoFBoTorchInterface,
+    ExcelInterface,
+    FEMInterface,
+):
+
+    def __init__(
+            self,
+
+            # SurrogateModel
+            history_path: str = None, train_history: History = None,
+
+            # Excel
+            input_xlsm_path: str or Path = None,
+            input_sheet_name: str = None,
+            output_xlsm_path: str or Path = None,
+            output_sheet_name: str = None,
+            constraint_xlsm_path: str or Path = None,
+            constraint_sheet_name: str = None,
+            procedure_name: str = None,
+            procedure_args: list or tuple = None,
+            # connect_method: str = 'auto',  # or 'new'
+            procedure_timeout: float or None = None,
+            setup_xlsm_path: str or Path = None,
+            setup_procedure_name: str = None,
+            setup_procedure_args: list or tuple = None,
+            teardown_xlsm_path: str or Path = None,
+            teardown_procedure_name: str = None,
+            teardown_procedure_args: list or tuple = None,
+            related_file_paths: list[str or Path] = None,
+            visible: bool = False,
+            display_alerts: bool = False,
+            terminate_excel_when_quit: bool = None,
+            interactive: bool = True,
+            use_named_range: bool = True,
+    ):
+        PoFBoTorchInterface.__init__(
+            self,
+            history_path,
+            train_history,
+        )
+
+        connect_method = 'new'
+
+        ExcelInterface.__init__(
+            self,
+            input_xlsm_path,
+            input_sheet_name,
+            output_xlsm_path,
+            output_sheet_name,
+            constraint_xlsm_path,
+            constraint_sheet_name,
+            procedure_name,
+            procedure_args,
+            connect_method,  # or 'new'
+            procedure_timeout,
+            setup_xlsm_path,
+            setup_procedure_name,
+            setup_procedure_args,
+            teardown_xlsm_path,
+            teardown_procedure_name,
+            teardown_procedure_args,
+            related_file_paths,
+            visible,
+            display_alerts,
+            terminate_excel_when_quit,
+            interactive,
+            use_named_range,
+        )
+
+    def load_parameter(self, opt, raise_if_no_keyword=True) -> None:
+        ExcelInterface.load_parameter(self, opt, raise_if_no_keyword)
+
+    def load_objective(self, opt, raise_if_no_keyword=True) -> None:
+        ExcelInterface.load_objective(self, opt, raise_if_no_keyword)
+
+    def load_constraint(self, opt, raise_if_no_keyword=False):
+        ExcelInterface.load_constraint(self, opt, raise_if_no_keyword)
+
+    def _setup_before_parallel(self, client):
+        PoFBoTorchInterface._setup_before_parallel(self, client)
+        ExcelInterface._setup_before_parallel(self, client)
+
+    def _setup_after_parallel(self, *args, **kwargs):
+        PoFBoTorchInterface._setup_after_parallel(self, *args, **kwargs)
+        ExcelInterface._setup_after_parallel(self, *args, **kwargs)
+
+    def update(self, parameters) -> None:
+        PoFBoTorchInterface.update(self, parameters)
+
+    def quit(self):
+        PoFBoTorchInterface.quit(self)
+        ExcelInterface.quit(self)

pyfemtet/opt/meta_script/__main__.py

@@ -0,0 +1,213 @@
+CONFIRM_BEFORE_ABNORMAL_TERMINATION = True
+
+try:
+
+    # for meta script
+    import os
+    import sys
+    import importlib
+    import pyfemtet
+
+    if __name__ == '__main__':
+        print(f'pyfemtet {pyfemtet.__version__} starting.')
+
+    from pyfemtet._message.messages import encoding
+
+    from fire import Fire
+    import yaml
+
+    # for concrete script
+    from optuna.samplers import *
+    from pyfemtet.opt import FEMOpt
+    from pyfemtet.opt.interface import *
+    from pyfemtet.opt.optimizer import *
+    from pyfemtet.opt.interface._femtet_excel import FemtetWithExcelSettingsInterface
+    from pyfemtet.opt.interface._surrogate_excel import PoFBoTorchInterfaceWithExcelSettingsInterface
+
+    # for debug
+    DEBUG = False
+
+    class ContentContext:
+
+        def __init__(self, content_):
+            self.content = content_
+
+        def __enter__(self):
+            return self.content
+
+        def __exit__(self, exc_type, exc_val, exc_tb):
+            pass
+
+    # for importing user-defined module
+    def import_from_path(module_name, file_path):
+
+        print(f'{file_path=}')
+
+        # noinspection PyUnresolvedReferences
+        spec = importlib.util.spec_from_file_location(module_name, file_path)
+
+        print(f'{spec=}')
+
+        # noinspection PyUnresolvedReferences
+        module = importlib.util.module_from_spec(spec)
+
+        print(f'{module=}')
+
+        sys.modules[module_name] = module
+        spec.loader.exec_module(module)
+        return module
+
+
+    def main(
+            yaml_path: str = None,
+
+            interface_class: str = None,  # including parameter definition excel
+            interface_kwargs: str = None,  # including Parametric Analysis Output
+            optimizer_class: str = None,
+            optimizer_kwargs: str = None,
+            femopt_kwargs: str = None,
+            seed: str = 'null',
+            optimize_kwargs: str = None,
+            additional_module_paths: list[str] = None,
+
+            confirm_before_abnormal_termination: bool = True,
+    ):
+        """
+
+        Args:
+            yaml_path:
+                If this argument is passed, the other arguments will be ignored
+                and load by .yaml file.
+                The yaml file must contain the other arguments.
+
+            interface_class: FemtetWithExcelSettingsInterface or SurrogateModelInterface.
+            interface_kwargs: See documentation of each interface class.
+            optimizer_class: OptunaOptimizer or ScipyOptimizer.
+            optimizer_kwargs: See documentation of each optimizer class.
+            femopt_kwargs: See documentation of FEMOpt.
+            seed: int or None.
+            optimize_kwargs: See documentation of FEMOpt.optimize().
+            additional_module_paths:
+                The .py file paths containing user-defined objective and constraints functions.
+                The module must contain __objective_functions__ or __constraint_functions__.
+                They must be a dict variable that contains the required arguments of
+                `FEMOpt.add_objective()` or `FEMOpt.add_constraint()` method.
+                Note that the `args` argument of constraint function is reserved by meta_script
+                and that value is fixed to `FEMOpt.opt`, so you can not use `args` argument
+                in __constraint_functions__.
+                Note that the functions should not contain the python variables defined outside
+                global scope.
+            confirm_before_abnormal_termination: Pause before termination if an error occurs. Default is True.
+
+        """
+
+        global CONFIRM_BEFORE_ABNORMAL_TERMINATION
+        CONFIRM_BEFORE_ABNORMAL_TERMINATION = confirm_before_abnormal_termination
+
+        # load variables from yaml file
+        if yaml_path is not None:
+
+            # check
+            if os.path.isfile(yaml_path):
+                context = open(yaml_path, 'r', encoding='utf-8')
+
+            else:
+                if DEBUG:
+                    print('debug mode')
+                    context = ContentContext(yaml_path)  # yaml_path is yaml content
+
+                else:
+                    raise FileNotFoundError(yaml_path)
+
+            # load **as yaml content**
+            with context as f:
+                d = yaml.safe_load(f)
+                interface_class = yaml.safe_dump(d['interface_class'], allow_unicode=True)
+                interface_kwargs = yaml.safe_dump(d['interface_kwargs'], allow_unicode=True)
+                optimizer_class = yaml.safe_dump(d['optimizer_class'], allow_unicode=True)
+                optimizer_kwargs = yaml.safe_dump(d['optimizer_kwargs'], allow_unicode=True)
+                femopt_kwargs = yaml.safe_dump(d['femopt_kwargs'], allow_unicode=True)
+                seed = yaml.safe_dump(d['seed'], allow_unicode=True)
+                optimize_kwargs = yaml.safe_dump(d['optimize_kwargs'], allow_unicode=True)
+                additional_module_paths = yaml.safe_dump(d.get('additional_module_paths', None), allow_unicode=True)
+
+        # load **python variables** from yaml content
+
+        # additional import
+        additional_module_paths_ = yaml.safe_load(additional_module_paths)
+
+        if additional_module_paths_ is not None:
+
+            for i, path_ in enumerate(additional_module_paths_):
+
+                # noinspection PyUnresolvedReferences
+                additional_module = import_from_path(f'additional_module_{i}', path_)
+
+                # from additional_module import *
+                if hasattr(additional_module, '__all__'):
+                    globals().update({key: getattr(additional_module, key) for key in additional_module.__all__})
+
+        Interface = eval(yaml.safe_load(interface_class))
+        interface_kwargs_ = yaml.safe_load(interface_kwargs)
+
+        Optimizer = eval(yaml.safe_load(optimizer_class))
+        optimizer_kwargs_ = yaml.safe_load(optimizer_kwargs)
+
+        optimizer_kwargs_['sampler_class'] = eval(optimizer_kwargs_['sampler_class'])
+
+        femopt_kwargs_ = yaml.safe_load(femopt_kwargs)
+
+        seed_ = yaml.safe_load(seed)
+
+        optimize_kwargs_ = yaml.safe_load(optimize_kwargs)
+
+        fem = Interface(**interface_kwargs_)
+        opt = Optimizer(**optimizer_kwargs_)
+        femopt = FEMOpt(fem=fem, opt=opt, **femopt_kwargs_)
+
+        if additional_module_paths_ is not None:
+
+            for i, path_ in enumerate(additional_module_paths_):
+
+                # noinspection PyUnresolvedReferences
+                additional_module = import_from_path(f'additional_module_{i}', path_)
+
+                # import obj & cns
+                d: dict
+                if hasattr(additional_module, '__objective_functions__'):
+                    for d in additional_module.__objective_functions__:
+                        femopt.add_objective(
+                            fun=d['fun'],
+                            name=d.get('name'),
+                            direction=d.get('direction'),
+                            args=d.get('args'),
+                            kwargs=d.get('kwargs'),
+                        )
+                if hasattr(additional_module, '__constraint_functions__'):
+                    for d in additional_module.__constraint_functions__:
+                        femopt.add_constraint(
+                            fun=d['fun'],
+                            name=d.get('name'),
+                            lower_bound=d.get('lower_bound'),
+                            upper_bound=d.get('upper_bound'),
+                            strict=d.get('strict', True),
+                            using_fem=d.get('using_fem'),
+                            args=(femopt.opt,),
+                            kwargs=d.get('kwargs'),
+                        )
+
+        femopt.set_random_seed(seed_)
+        femopt.optimize(**optimize_kwargs_)
+
+
+    if __name__ == '__main__':
+        Fire(main)
+
+
+except Exception as e:
+    from traceback import print_exception
+
+    print_exception(e)
+    print()
+    if CONFIRM_BEFORE_ABNORMAL_TERMINATION:
+        input('終了するには Enter を押してください。')

pyfemtet/opt/visualization/_process_monitor/pages.py

@@ -362,6 +362,19 @@ class OptunaVisualizerPage(AbstractPage):
             )
             layout.append(dcc.Graph(figure=fig, style={'height': '70vh'}))
 
+        layout.append(html.H2(Msg.DETAIL_PAGE_IMPORTANCE_HEADER))
+        layout.append(html.H4(Msg.DETAIL_PAGE_IMPORTANCE_DESCRIPTION))
+        for i, obj_name in enumerate(obj_names):
+            fig = optuna.visualization.plot_param_importances(
+                study,
+                target=lambda t: t.values[i],
+                target_name=obj_name
+            )
+            import plotly.graph_objects as go
+            fig: go.Figure
+            fig.update_layout(title=obj_name)
+            layout.append(dcc.Graph(figure=fig, style={'height': '70vh'}))
+
         return layout
 
     def setup_callback(self):

{pyfemtet-0.8.9.dist-info → pyfemtet-0.8.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyfemtet
-Version: 0.8.9
+Version: 0.8.11
 Summary: Design parameter optimization using Femtet.
 License: BSD-3-Clause
 Author: kazuma.naito
@@ -30,6 +30,7 @@ Requires-Dist: pandas (>=2.2.3,<3.0.0)
 Requires-Dist: plotly (>=5.22.0,<6.0.0)
 Requires-Dist: psutil (>=5.9.6,<6.0.0)
 Requires-Dist: pywin32 (>=306,<307) ; sys_platform == "win32"
+Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
 Requires-Dist: scipy (>=1.11.4,<2.0.0)
 Requires-Dist: torch (>=2.5.1,<2.6.0) ; sys_platform != "linux"
 Requires-Dist: torch (>=2.5.1,<2.6.0) ; sys_platform == "linux"

{pyfemtet-0.8.9.dist-info → pyfemtet-0.8.11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyfemtet/__init__.py,sha256=jBrmFTf-nNFPcJTuyxzw1H9WEW7G7OpCejEb8xk5m-U,21
+pyfemtet/__init__.py,sha256=2JL5Qr1tMuuX9W0K2n-UaciQXJtKIEm_9ijSZ2wv2C0,22
 pyfemtet/_femtet_config_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/_femtet_config_util/autosave.py,sha256=dNirA9XGuFehas8_Jkj2BW9GOzMbPyhnt1WHcH_ObSU,2070
 pyfemtet/_femtet_config_util/exit.py,sha256=0BWID-tjOkmZwmgPFkcJMkWW39voccz5ARIBWvZbHaw,1877
@@ -6,14 +6,14 @@ pyfemtet/_message/1. make_pot.bat,sha256=wrTA0YaL7nUfNB0cS8zljOmwq2qgyG6RMwHQbrw
 pyfemtet/_message/2. make_mo.bat,sha256=6shJ3Yn4BXjDc0hhv_kiGUtVTq4oSRz8-iS4vW29rNE,155
 pyfemtet/_message/__init__.py,sha256=gE1-XX_PzHj9BbhqPaK5VcIHuv6_Tec5qlPMC3IRiBg,100
 pyfemtet/_message/babel.cfg,sha256=AQIFCQ7NlAA84PhV0gowHhbIXH41zA55mzhgyROniJk,73
-pyfemtet/_message/locales/ja/LC_MESSAGES/messages.mo,sha256=Af0m1bHsrMAjqyfLlDjW_OK09IXnuDvByaESf7BvuQU,18984
-pyfemtet/_message/locales/ja/LC_MESSAGES/messages.po,sha256=CPVryK95GFl_GSSTz1uSvkKwXaYRvTboIr_aTgdfwbo,25441
-pyfemtet/_message/locales/messages.pot,sha256=AxtocHuEX5VPgXgULpHBxU8swNLUzm9KEBbSP1Y6qP8,15017
-pyfemtet/_message/messages.py,sha256=OsSXVLn9_YKwuHczW1A4CEnhZ0wrtHmOhxPA9OPOzHc,13856
+pyfemtet/_message/locales/ja/LC_MESSAGES/messages.mo,sha256=BsDrPmXWzKfaAjATSq-GZexNX4iG8ax7Ss0bfB1ocIk,19512
+pyfemtet/_message/locales/ja/LC_MESSAGES/messages.po,sha256=_ugJcUf__C1HdXt3ubcPurLQWKuL3dg0DGMcrDtTBbw,26047
+pyfemtet/_message/locales/messages.pot,sha256=G_6aRv0zZjpShKx13hm_1B2D60sViOuUHpZsX5QJSpQ,15372
+pyfemtet/_message/messages.py,sha256=ztDyORp0sjgNCe2DKEh-ojWfcVnVmOy3mEtAUt_yYhA,14185
 pyfemtet/_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/_util/dask_util.py,sha256=ufgr4m8slvyWP97lWBwolysQpJ1PmAO_-OI8IlEyvU8,233
 pyfemtet/_util/excel_macro_util.py,sha256=cF1Z3yl9FMM0J7dpMRTsle8uYxYcfHhQC0QffnVovdY,7944
-pyfemtet/_util/excel_parse_util.py,sha256=-puddKHcdf9OOWNXXeeUIuetAQ-wOepYdr37VdOqQf8,4148
+pyfemtet/_util/excel_parse_util.py,sha256=AoVMTcjSm5PEytK5AdDTXZ4Gbj3V5KTlj0KfrN1ZzkU,4809
 pyfemtet/_util/sample.xlsx,sha256=OU8mBY48YESJFQrdt4OkntlE1z-6WiyUyOV-PMr09DQ,9423
 pyfemtet/_warning.py,sha256=TSOj8mOhuyfOUJB24LsW6GNhTA3IzIEevJw_hLKTrq8,2205
 pyfemtet/brep/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -24,14 +24,14 @@ pyfemtet/dispatch_extensions/_impl.py,sha256=yH_yeAnQ-Xi9GfjX-FQt9u3yHnrLYIteRb6
 pyfemtet/logger/__init__.py,sha256=UOJ9n_U2xwdTrp0Xgg-N6geySxNzKqTBQlXsaH0kW_w,420
 pyfemtet/logger/_impl.py,sha256=rsAd0HpmveOaLS39ucp3U2OcDhQMWjC5fnVGhbJtWVw,6375
 pyfemtet/opt/__init__.py,sha256=wRR8LbEhb5I6MUgmnCgjB6-tqHlOVxDIo7yPkq0QbBs,758
-pyfemtet/opt/_femopt.py,sha256=9-naHBWBVCd2jkIldhO_whrOh6AmpQLXUsdzyYKZyco,40587
-pyfemtet/opt/_femopt_core.py,sha256=hMnb5UD7R_FfF6VvNLakJedIdjv7B3i--nsvqhdue2M,39328
+pyfemtet/opt/_femopt.py,sha256=MSqSJzyD2sRYBNQAe0P5rpSvvVihOV2ugUa-hZyYnBA,40671
+pyfemtet/opt/_femopt_core.py,sha256=w8jcKAIxakO2JMC51TTWI3iL-3wlEg6wCDn45D4ZCe4,39366
 pyfemtet/opt/_test_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/_test_utils/control_femtet.py,sha256=8oAl9y5V2n8Nnsgx_ebcZVzwFt1eI3swkdiKg6pg3-M,1085
 pyfemtet/opt/_test_utils/hyper_sphere.py,sha256=nQhw8EIY0DwvcTqrbKhkxiITLZifr4-nG77E-_6ggmA,700
 pyfemtet/opt/_test_utils/record_history.py,sha256=7V2LCZ8F985c_NNUVu-K7_2-p2mwG1lRMZhkYhSy_Dw,4356
 pyfemtet/opt/advanced_samples/excel_ui/(ref) original_project.femprj,sha256=5OqZfynTpVCrgEIOBOMYuDGaMvepi5lojVNFr1jAsEI,157489
-pyfemtet/opt/advanced_samples/excel_ui/femtet-macro.xlsm,sha256=ckF0SQ0f3IWSW6QoH1IPJdwUUlR7O_AiGC5fi8SI3jA,133137
+pyfemtet/opt/advanced_samples/excel_ui/femtet-macro.xlsm,sha256=7G9hr1Oj1zwTFv6mh2fWk4FZ0R5ZNDQmvjNvujy6gbw,124145
 pyfemtet/opt/advanced_samples/excel_ui/pyfemtet-core.py,sha256=aF2TWXdbt7dnkeBqqVO6GvIExozjFp0mxx3BX8rpYNc,9879
 pyfemtet/opt/advanced_samples/excel_ui/test-pyfemtet-core.cmd,sha256=r-Pa1Ng9sa6wfDqIhTf2BUDrN9rePWFymz7pmtBbvcQ,895
 pyfemtet/opt/advanced_samples/restart/gal_ex13_parametric.femprj,sha256=iIHH1X-wWBqEYj4cFJXco73LCJXSrYBsSKOD0HxYu60,87599
@@ -42,19 +42,24 @@ pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_create_training_data_jp.p
 pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_optimize_with_surrogate.py,sha256=s0b31wuN3iXjb78dt0ro0ZjxHa8uLIH94jRfEuj1EVY,3090
 pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_optimize_with_surrogate_jp.py,sha256=OAOpHKyMMo1StSqNMqx4saYDn4hiGOKDypyK6uhTILQ,3215
 pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_parametric.femprj,sha256=iIHH1X-wWBqEYj4cFJXco73LCJXSrYBsSKOD0HxYu60,87599
-pyfemtet/opt/interface/__init__.py,sha256=na6-elI9-karOqoSxT9LfLQpjBPm1lrUWjow0NYYRP4,1349
-pyfemtet/opt/interface/_base.py,sha256=y0uQ5jdsWbgt5odyqPin7NXcK_IbUwPDcrrkV_JhpRw,2722
-pyfemtet/opt/interface/_excel_interface.py,sha256=s103vePTPXXYiPwGdAEUFgtpvGXtu1nSljDtP4HsmcY,40355
-pyfemtet/opt/interface/_femtet.py,sha256=_T75D0GWEYc_5n9RRF6u-HZVxgFnG9PoGYF2-cDiqeM,37673
-pyfemtet/opt/interface/_femtet_parametric.py,sha256=rhvnpHdbjNJAKxiCkgnExnZdV5qOB6pBv6AaLeTkeF8,10155
+pyfemtet/opt/interface/__init__.py,sha256=SstCN9WMYqF5lKNbb8xAzq0hBV-Hk8YuCrajvF3sOg0,1350
+pyfemtet/opt/interface/_base.py,sha256=zbRhNB4fwznKHsllC1X29TONoB9MP8qMH8Nqz4NX_yA,2838
+pyfemtet/opt/interface/_excel_interface.py,sha256=1PYB056rU2mX-LgBWRwwTUxDkt7crgHAk3fKJuMNMMU,40152
+pyfemtet/opt/interface/_femtet.py,sha256=bAeFG4oik0zt3PcbPOhhQOm0-kboS83JKn0RX_mIrP0,37779
+pyfemtet/opt/interface/_femtet_excel.py,sha256=dWPQguKNOVdJ4jTfwLykCeM9iwA2S1KOLynw8UGzmvk,5968
+pyfemtet/opt/interface/_femtet_parametric.py,sha256=hxNiZfhR1IPtrMXg39TZutXTcOXdoxTKiRTTcYRGgVs,10181
 pyfemtet/opt/interface/_femtet_with_nx/__init__.py,sha256=-6W2g2FDEcKzGHmI5KAKQe-4U5jDpMj0CXuma-GZca0,83
 pyfemtet/opt/interface/_femtet_with_nx/_interface.py,sha256=LkaODUSpBLq05uz5Jf-JKuH6Evq8ElZoItXxFZopWeM,5994
 pyfemtet/opt/interface/_femtet_with_nx/update_model.py,sha256=P7VH0i_o-X9OUe6AGaLF1fACPeHNrMjcrOBCA3MMrI4,3092
 pyfemtet/opt/interface/_femtet_with_sldworks.py,sha256=rjEgebuP1w1eAFVWw4eRJUq3lsyBcmXlkMjZKIpD0kw,11019
 pyfemtet/opt/interface/_surrogate/__init__.py,sha256=2UT5NuBylyWQJNjg1zsBRCV-MzNCUswTUt6ZuSrYFUM,120
-pyfemtet/opt/interface/_surrogate/_base.py,sha256=_mVjoxrGEWL-PydjzEYXIgsOJ9zPmntoRHY3dXR2HGo,3098
+pyfemtet/opt/interface/_surrogate/_base.py,sha256=s_Mqo7CUAhaj-ZYYxxGKekiox4EnH_SnWB8eVj-VnFU,4739
 pyfemtet/opt/interface/_surrogate/_chaospy.py,sha256=Bqej89Mo0zgdJq1OK7YKRqHOcuyN0wL4ZQUQXdJtYJ8,1987
 pyfemtet/opt/interface/_surrogate/_singletaskgp.py,sha256=bHzY5QIjA9zhLxweexz259XQMZLgkHWfrIDW7f3q-2k,2520
+pyfemtet/opt/interface/_surrogate_excel.py,sha256=r0i9xNb6R-1SHL911Pi9x6lD4mQbCl8m3cQG2dQft1E,3509
+pyfemtet/opt/meta_script/YAML_Generator.xlsm,sha256=2hZKioZfGkH_0ufre8xi2gps8SJUNwgSB_6b9vCc2tI,66648
+pyfemtet/opt/meta_script/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyfemtet/opt/meta_script/__main__.py,sha256=J7RD6aFr67t62tcwgLcoC4GzQ2DdYFxx7z63imro9A4,8061
 pyfemtet/opt/optimizer/__init__.py,sha256=Ia6viowECkG0IFXtFef0tJ4jDKsoDzJLqMJ9xLFH2LQ,543
 pyfemtet/opt/optimizer/_base.py,sha256=1TY1iVZdpgJcmF6g3-CcY-6u4REs8_gR_0y9cXUQe2s,12932
 pyfemtet/opt/optimizer/_optuna/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -133,7 +138,7 @@ pyfemtet/opt/visualization/_complex_components/pm_graph_creator.py,sha256=f-ikYA
 pyfemtet/opt/visualization/_create_wrapped_components.py,sha256=9AltJHr1DM6imZfpNp867rC-uAYqQ-emdgTLChKDrl8,2513
 pyfemtet/opt/visualization/_process_monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/_process_monitor/application.py,sha256=8ShNMPWrD_1IHyPz2a63tlzENQg7by3kg4pdXSuv0_4,8659
-pyfemtet/opt/visualization/_process_monitor/pages.py,sha256=-G-zNvYS6HDXrwX0lQlInlJn3rZPr1-Rh4AAAOudmuY,15147
+pyfemtet/opt/visualization/_process_monitor/pages.py,sha256=a94MWLSnjr6bbPqIcAWbvJ3D4bMEP98DvoomSFFkBqE,15711
 pyfemtet/opt/visualization/_wrapped_components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/_wrapped_components/dbc.py,sha256=iSh4QRmLIQMfiAWowG1ThXLPhmKluRYOYPcdDFVI0t0,42162
 pyfemtet/opt/visualization/_wrapped_components/dcc.py,sha256=-Iw6MjFQmvJ__KcddPhFDqui6lk2ixB2U2tZH_Il5pA,17500
@@ -143,8 +148,8 @@ pyfemtet/opt/visualization/result_viewer/.gitignore,sha256=ryvb4aqbbsHireHWlPQfx
 pyfemtet/opt/visualization/result_viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/result_viewer/application.py,sha256=WcHBx_J5eNLKSaprpk9BGifwhO04oN8FiNGYTWorrXA,1691
 pyfemtet/opt/visualization/result_viewer/pages.py,sha256=MZAjzbuq0toZrR-iJhElM3A12_jHVCTt65gz1kdNPbw,32193
-pyfemtet-0.8.9.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.8.9.dist-info/METADATA,sha256=7KhkJFd-xgckrqllScrrmO-uAYns2wfa-G8PDR5KSd8,3509
-pyfemtet-0.8.9.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-pyfemtet-0.8.9.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.8.9.dist-info/RECORD,,
+pyfemtet-0.8.11.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
+pyfemtet-0.8.11.dist-info/METADATA,sha256=Yg6P6oApQo_63zTEzB4m2Ls3TQCljx_Tddr_T5bWgYs,3549
+pyfemtet-0.8.11.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pyfemtet-0.8.11.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.8.11.dist-info/RECORD,,

{pyfemtet-0.8.9.dist-info → pyfemtet-0.8.11.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 2.1.1
 Root-Is-Purelib: true
 Tag: py3-none-any