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

pyfemtet/__init__.py

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

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
 
@@ -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/_excel_interface.py

@@ -79,7 +79,7 @@ class ExcelInterface(FEMInterface):
 
         connect_method (str, optional):
             Excel との接続方法を指定します。 'auto' または
-            'new' が利用可能です。デフォルトは 'auto' です。
+            'new' が利用可能です。デフォルトは 'new' です。
 
         procedure_timeout (float or None, optional):
             Excel マクロ関数のタイムアウト時間を秒単位で指定
@@ -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,
@@ -443,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 を記憶する
@@ -730,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():
 
@@ -781,6 +785,7 @@ class ExcelInterface(FEMInterface):
                 opt.variables.add_parameter(prm)
 
             else:
+                # noinspection PyTypeChecker
                 fixed_prm = Expression(
                     name=name,
                     fun=lambda: value,
@@ -794,7 +799,7 @@ class ExcelInterface(FEMInterface):
                 )
                 opt.variables.add_expression(fixed_prm)
 
-    def load_objective(self, opt):
+    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
@@ -802,6 +807,7 @@ class ExcelInterface(FEMInterface):
         df = ParseAsObjective.parse(
             self.output_xlsm_path,
             self.output_sheet_name,
+            raise_if_no_keyword,
         )
 
         for i, row in df.iterrows():

pyfemtet/opt/interface/_femtet_excel.py

@@ -44,9 +44,12 @@ class FemtetWithExcelSettingsInterface(FemtetInterface, ExcelInterface, FEMInter
             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, connect_method, procedure_timeout,
+            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)
@@ -58,7 +61,7 @@ class FemtetWithExcelSettingsInterface(FemtetInterface, ExcelInterface, FEMInter
         )
 
 
-    def load_objective(self, opt):
+    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
@@ -66,7 +69,7 @@ class FemtetWithExcelSettingsInterface(FemtetInterface, ExcelInterface, FEMInter
         df = ParseAsObjective.parse(
             self.output_xlsm_path,
             self.output_sheet_name,
-            False
+            raise_if_no_keyword,
         )
 
         for i, row in df.iterrows():

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_excel.py

@@ -18,7 +18,6 @@ class PoFBoTorchInterfaceWithExcelSettingsInterface(
 
             # SurrogateModel
             history_path: str = None, train_history: History = None,
-            _output_directions: dict[int, str | float] | list[str | float] = None,
 
             # Excel
             input_xlsm_path: str or Path = None,
@@ -29,7 +28,7 @@ class PoFBoTorchInterfaceWithExcelSettingsInterface(
             constraint_sheet_name: str = None,
             procedure_name: str = None,
             procedure_args: list or tuple = None,
-            connect_method: str = 'auto',  # or 'new'
+            # connect_method: str = 'auto',  # or 'new'
             procedure_timeout: float or None = None,
             setup_xlsm_path: str or Path = None,
             setup_procedure_name: str = None,
@@ -48,9 +47,10 @@ class PoFBoTorchInterfaceWithExcelSettingsInterface(
             self,
             history_path,
             train_history,
-            _output_directions,
         )
 
+        connect_method = 'new'
+
         ExcelInterface.__init__(
             self,
             input_xlsm_path,
@@ -77,11 +77,11 @@ class PoFBoTorchInterfaceWithExcelSettingsInterface(
             use_named_range,
         )
 
-    def load_parameter(self, opt) -> None:
-        ExcelInterface.load_parameter(self, opt)
+    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) -> None:
-        PoFBoTorchInterface.load_objective(self, opt)
+    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)

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-0.8.10.dist-info → pyfemtet-0.8.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyfemtet
-Version: 0.8.10
+Version: 0.8.11
 Summary: Design parameter optimization using Femtet.
 License: BSD-3-Clause
 Author: kazuma.naito

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

@@ -1,4 +1,4 @@
-pyfemtet/__init__.py,sha256=CKrbpoGm6OyINBDoT8Nfpyecbw2W68SS4YSkSpJJ5-0,22
+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
@@ -25,7 +25,7 @@ pyfemtet/logger/__init__.py,sha256=UOJ9n_U2xwdTrp0Xgg-N6geySxNzKqTBQlXsaH0kW_w,4
 pyfemtet/logger/_impl.py,sha256=rsAd0HpmveOaLS39ucp3U2OcDhQMWjC5fnVGhbJtWVw,6375
 pyfemtet/opt/__init__.py,sha256=wRR8LbEhb5I6MUgmnCgjB6-tqHlOVxDIo7yPkq0QbBs,758
 pyfemtet/opt/_femopt.py,sha256=MSqSJzyD2sRYBNQAe0P5rpSvvVihOV2ugUa-hZyYnBA,40671
-pyfemtet/opt/_femopt_core.py,sha256=mm7ySxFSp4RhRT_Bt2TxWVUXaA2ejRJJZDOHj9CV6Ho,39348
+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
@@ -34,10 +34,6 @@ pyfemtet/opt/advanced_samples/excel_ui/(ref) original_project.femprj,sha256=5OqZ
 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/meta_script/meta_script.py,sha256=v0D-4xqH_fvMEQ4B_OnJrtlUsJ6kQfLLcE4YHlsgmMw,4896
-pyfemtet/opt/advanced_samples/meta_script/sample.yaml,sha256=_X95DVX1BMIFlML1mW4UqymOMxLElw3aeWiI9KJBD-k,351
-pyfemtet/opt/advanced_samples/meta_script/yaml_generator.txt,sha256=n2IWoAge_fWWBDfOi-rHQYZvfyGQqdS4BOSTvsdKYjk,670
-pyfemtet/opt/advanced_samples/meta_script/yaml_generator.xlsm,sha256=YUaVVqtoa5dTY0c2gJ5C3s4y7eC5Gx5PRtxA2rwV9-s,18287
 pyfemtet/opt/advanced_samples/restart/gal_ex13_parametric.femprj,sha256=iIHH1X-wWBqEYj4cFJXco73LCJXSrYBsSKOD0HxYu60,87599
 pyfemtet/opt/advanced_samples/restart/gal_ex13_parametric_restart.py,sha256=YCqtLjazFDRKhEu7sGJlDJDDL7YPH6GmWEb6X0e30Og,3045
 pyfemtet/opt/advanced_samples/restart/gal_ex13_parametric_restart_jp.py,sha256=Oaua2Eb8NGtlWjvYC9B1uYTKcEuWxWZxzJbLi_4IqxE,3580
@@ -48,10 +44,10 @@ pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_optimize_with_surrogate_j
 pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_parametric.femprj,sha256=iIHH1X-wWBqEYj4cFJXco73LCJXSrYBsSKOD0HxYu60,87599
 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=pJ2JGBbAuU_UrxVYj6_DL51WkUbsl1-eEJsUxeq_dQk,40007
+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=4o1jdP1WZxaVhe8Me60SGKV4AP7Dvy0ZqnUjyeIfCWY,5882
-pyfemtet/opt/interface/_femtet_parametric.py,sha256=rhvnpHdbjNJAKxiCkgnExnZdV5qOB6pBv6AaLeTkeF8,10155
+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
@@ -60,7 +56,10 @@ pyfemtet/opt/interface/_surrogate/__init__.py,sha256=2UT5NuBylyWQJNjg1zsBRCV-MzN
 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=YOXa4EMqPw8fo75tr_cb1wJw6vKzUipI3m-1BQAl-5Y,3501
+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
@@ -149,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.10.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.8.10.dist-info/METADATA,sha256=IfB4bF5vQgSvuRP8aMQZqIsn7bO9UnNH5rME4ZIOXNY,3549
-pyfemtet-0.8.10.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-pyfemtet-0.8.10.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.8.10.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/opt/advanced_samples/meta_script/meta_script.py

@@ -1,163 +0,0 @@
-# for meta script
-import os
-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 pyfemtet.opt import FEMOpt
-from pyfemtet.opt.interface import *
-from pyfemtet.opt.optimizer import *
-from optuna.samplers import *
-from pyfemtet.opt.interface._femtet_excel import FemtetWithExcelSettingsInterface
-
-
-# fore debug
-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
-
-
-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,
-):
-    """
-
-    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().
-
-    """
-
-    if yaml_path is not None:
-        if os.path.isfile(yaml_path):
-            context = open(yaml_path, 'r', encoding='utf-8')
-        else:
-            print('debug mode')
-            context = ContentContext(yaml_path)
-        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)
-
-    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)
-
-    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_)
-    femopt.set_random_seed(seed_)
-    femopt.optimize(**optimize_kwargs_)
-
-
-# if __name__ == '__main__':
-#     Fire(main)
-
-
-# for debugging file input
-if __name__ == '__main__':
-    os.chdir(os.path.dirname(__file__))
-    path = 'sample.yaml'
-    main(yaml_path=path)
-
-
-# for debugging yaml input
-# if __name__ == '__main__':
-#     content = r"""
-# interface_class: FemtetInterface
-# interface_kwargs:
-#   femprj_path: C:\日本語ファイル.femprj
-# optimizer_class: OptunaOptimizer
-# optimizer_kwargs:
-#   sampler_class: TPESampler
-#   sampler_kwargs:
-#     n_startup_trials: 10
-# femopt_kwargs:
-#   history_path: sample.csv
-# optimize_kwargs:
-#   n_trials: 15
-#   confirm_before_exit: False
-# seed: null
-# """
-#
-#     main(yaml_path=content)
-
-
-# for debugging CLI input
-# if __name__ == '__main__':
-#
-#     interface_kwargs = dict(
-#         femprj_path=r'sample.femprj',
-#         parametric_output_indexes_use_as_objective={0: 0, 1: 'minimize'}
-#     )
-#     optimizer_kwargs = dict(
-#         sampler_class='TPESampler',
-#         sampler_kwargs=dict(
-#             n_startup_trials=10,
-#         )
-#     )
-#     femopt_kwargs = dict(
-#         history_path='sample.csv'
-#     )
-#
-#     seed = None
-#
-#     optimize_kwargs = dict(
-#         n_trials=15,
-#         confirm_before_exit=False,
-#     )
-#
-#     main(
-#         interface_class='FemtetWithExcelSettingsInterface',
-#         interface_kwargs=yaml.safe_dump(interface_kwargs, allow_unicode=True),
-#         optimizer_class='OptunaOptimizer',
-#         optimizer_kwargs=yaml.safe_dump(optimizer_kwargs, allow_unicode=True),
-#         femopt_kwargs=yaml.safe_dump(femopt_kwargs, allow_unicode=True),
-#         seed=yaml.safe_dump(femopt_kwargs, allow_unicode=True),
-#         optimize_kwargs=yaml.safe_dump(optimize_kwargs, allow_unicode=True),
-#     )

pyfemtet/opt/advanced_samples/meta_script/sample.yaml

@@ -1,14 +0,0 @@
- interface_class: FemtetInterface
- interface_kwargs:
-   femprj_path: C:\日本語ファイル.femprj
- optimizer_class: OptunaOptimizer
- optimizer_kwargs:
-   sampler_class: TPESampler
-   sampler_kwargs:
-     n_startup_trials: 10
- femopt_kwargs:
-   history_path: sample.csv
- optimize_kwargs:
-   n_trials: 15
-   confirm_before_exit: False
- seed: null