pyfemtet 0.4.7__py3-none-any.whl → 0.4.9__py3-none-any.whl

pyfemtet/__init__.py

@@ -1 +1 @@
-__version__ = "0.4.7"
+__version__ = "0.4.9"

pyfemtet/_test_util.py

@@ -86,10 +86,30 @@ def _get_obj_from_csv(csv_path):
     return out, columns
 
 
-def is_equal_result(csv1, csv2):
+def is_equal_result(csv1, csv2, result_save_to=None):
     """Check the equality of two result csv files."""
     df1, columns1 = _get_obj_from_csv(csv1)
     df2, columns2 = _get_obj_from_csv(csv2)
+
+    if result_save_to is not None:
+        import datetime
+        with open(result_save_to, 'a', encoding='utf-8', newline='\n') as f:
+            name = os.path.basename(csv1)
+            content = [
+                f'===== result of {name} =====\n',
+                f'{datetime.datetime.now()}\n',
+                f'----- column numbers -----\n',
+                f'csv1: {len(columns1)} columns\n',
+                f'csv2: {len(columns2)} columns\n',
+                f'----- row numbers -----\n',
+                f'csv1: {len(df1)} columns\n',
+                f'csv2: {len(df2)} columns\n',
+                f'----- difference -----\n',
+                f'max difference ratio: {(np.abs(df1.values - df2.values) / np.abs(df2.values)).max() * 100}%\n',
+                '\n'
+            ]
+            f.writelines(content)
+
     assert len(columns1) == len(columns2), '結果 csv の column 数が異なります。'
     assert len(df1) == len(df2), '結果 csv の row 数が異なります。'
     assert (np.abs(df1.values - df2.values) / np.abs(df2.values)).max() <= 0.01, '前回の結果と 1% を超える相違があります。'

pyfemtet/opt/_femopt.py

@@ -513,10 +513,7 @@ class FEMOpt:
         sleep(1)
 
         # terminate monitor process
-        if self._is_error_exit:
-            self.status.set(OptimizationStatus.CRASHED)
-        else:
-            self.status.set(OptimizationStatus.TERMINATE_ALL)
+        self.status.set(OptimizationStatus.TERMINATE_ALL)
         logger.info(self.monitor_process_future.result())
         sleep(1)
 

pyfemtet/opt/_femopt_core.py

@@ -14,7 +14,7 @@ import numpy as np
 import pandas as pd
 from scipy.stats.qmc import LatinHypercube
 from optuna._hypervolume import WFG
-from dask.distributed import Lock
+from dask.distributed import Lock, get_client
 
 # win32com
 from win32com.client import constants, Constants
@@ -532,7 +532,17 @@ class History:
 
         return columns, metadata
 
-    def record(self, parameters, objectives, constraints, obj_values, cns_values, message):
+    def record(
+            self,
+            parameters,
+            objectives,
+            constraints,
+            obj_values,
+            cns_values,
+            message,
+            postprocess_func,
+            postprocess_args,
+    ):
         """Records the optimization results in the history.
 
         Record only. NOT save.
@@ -544,7 +554,8 @@ class History:
             obj_values (list): The objective values.
             cns_values (list): The constraint values.
             message (str): Additional information or messages related to the optimization results.
-
+            postprocess_func (Callable): fem method to call after solving. i.e. save result file. Must take trial(int) for 1st argument.
+            postprocess_args (dict): arguments for `postprocess_func`. i.e. create binary data of result file in the worker process.
         """
 
         # create row
@@ -591,6 +602,12 @@ class History:
             self._calc_hypervolume(objectives)  # update self.local_data
             self.actor_data = self.local_data
 
+            # save file
+            if postprocess_args is not None:
+                trial = self.local_data['trial'].values[-1]
+                client = get_client()  # always returns valid client
+                client.run_on_scheduler(postprocess_func, trial, **postprocess_args)
+
     def _calc_non_domi(self, objectives):
 
         # 目的関数の履歴を取り出してくる
@@ -696,8 +713,8 @@ class OptimizationStatus:
     RUNNING = 30
     INTERRUPTING = 40
     TERMINATED = 50
-    CRASHED = 55
     TERMINATE_ALL = 60
+    CRASHED = 70
 
     def __init__(self, client, name='entire'):
         self._future = client.submit(_OptimizationStatusActor, actor=True)

pyfemtet/opt/femprj_sample/cad_ex01_NX.py

@@ -107,6 +107,10 @@ if __name__ == '__main__':
     fem = FemtetWithNXInterface(
         prt_path='cad_ex01_NX.prt',
         open_result_with_gui=False,  # To calculate von Mises stress, set this argument to False. See Femtet Macro Help.
+        export_curves=False,
+        export_surfaces=False,
+        export_solids=True,
+        export_flattened_assembly=False,
     )
 
     # Initialize the FEMOpt object.
@@ -129,4 +133,11 @@ if __name__ == '__main__':
     # Run optimization.
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=20)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample/cad_ex01_SW.py

@@ -129,4 +129,11 @@ if __name__ == '__main__':
     # Run optimization.
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=20)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample/gal_ex58_parametric.py

@@ -72,4 +72,11 @@ if __name__ == '__main__':
     # Run optimization.
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=10)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample/gau_ex08_parametric.py

@@ -56,4 +56,11 @@ if __name__ == '__main__':
     # Run optimization.
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=20)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample/her_ex40_parametric.py

@@ -134,4 +134,11 @@ if __name__ == '__main__':
 
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=15)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample/paswat_ex1_parametric.py

@@ -58,4 +58,11 @@ if __name__ == '__main__':
     # Run optimization.
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=15)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample/paswat_ex1_parametric_parallel.py

@@ -59,4 +59,11 @@ if __name__ == '__main__':
     femopt.set_random_seed(42)
     # femopt.optimize(n_trials=15)
     femopt.optimize(n_trials=30, n_parallel=3)  # This line is the only difference with no parallel pattern.
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample/wat_ex14_parametric.py

@@ -56,4 +56,11 @@ if __name__ == '__main__':
     # Run optimization.
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=15)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample_jp/cad_ex01_NX_jp.py

@@ -103,6 +103,10 @@ if __name__ == '__main__':
     fem = FemtetWithNXInterface(
         prt_path='cad_ex01_NX.prt',
         open_result_with_gui=False,
+        export_curves=False,
+        export_surfaces=False,
+        export_solids=True,
+        export_flattened_assembly=False,
     )
 
     # FEMOpt オブジェクトの初期化 (最適化問題とFemtetとの接続を行います)
@@ -123,4 +127,11 @@ if __name__ == '__main__':
     # 最適化を実行
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=20)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample_jp/cad_ex01_SW_jp.py

@@ -123,4 +123,11 @@ if __name__ == '__main__':
     # 最適化を実行
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=20)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample_jp/gal_ex58_parametric_jp.py

@@ -68,4 +68,11 @@ if __name__ == '__main__':
     # 最適化を実行
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=10)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample_jp/gau_ex08_parametric_jp.py

@@ -55,4 +55,11 @@ if __name__ == '__main__':
     # 最適化を実行
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=20)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample_jp/her_ex40_parametric_jp.py

@@ -134,4 +134,11 @@ if __name__ == '__main__':
 
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=15)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample_jp/paswat_ex1_parametric_jp.py

@@ -56,4 +56,11 @@ if __name__ == '__main__':
     # 最適化を実行
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=15)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample_jp/paswat_ex1_parametric_parallel_jp.py

@@ -57,4 +57,11 @@ if __name__ == '__main__':
     femopt.set_random_seed(42)
     # femopt.optimize(n_trials=15)
     femopt.optimize(n_trials=30, n_parallel=3)  # 並列計算しない場合との差はこの行のみです。
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/femprj_sample_jp/wat_ex14_parametric_jp.py

@@ -54,4 +54,11 @@ if __name__ == '__main__':
     # 最適化を実行
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=15)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

pyfemtet/opt/interface/_base.py

@@ -63,6 +63,12 @@ class FEMInterface(ABC):
         """Preprocessing after launching a dask worker and before run optimization (if implemented in concrete class)."""
         pass
 
+    def postprocess_func(self, trial: int, *args, dask_scheduler=None, **kwargs):
+        pass
+
+    def create_postprocess_args(self):
+        pass
+
 
 class NoFEM(FEMInterface):
     """Interface with no FEM for debug."""

pyfemtet/opt/interface/_femtet.py

@@ -59,9 +59,10 @@ class FemtetInterface(FEMInterface):
             self,
             femprj_path=None,
             model_name=None,
-            connect_method='auto',
-            strictly_pid_specify=True,
-            allow_without_project=False,
+            connect_method='auto',  # dask worker では __init__ の中で 'new' にするので super() の引数にしない。（しても意味がない）
+            save_pdt='all',  # 'all' or None
+            strictly_pid_specify=True,  # dask worker では True にしたいので super() の引数にしない。
+            allow_without_project=False,  # main でのみ True を許容したいので super() の引数にしない。
             open_result_with_gui=True,
             parametric_output_indexes_use_as_objective=None,
             **kwargs  # 継承されたクラスからの引数
@@ -80,6 +81,7 @@ class FemtetInterface(FEMInterface):
         self.allow_without_project = allow_without_project
         self.original_femprj_path = self.femprj_path
         self.open_result_with_gui = open_result_with_gui
+        self.save_pdt = save_pdt
 
         # その他のメンバーの宣言や初期化
         self.Femtet = None
@@ -106,6 +108,15 @@ class FemtetInterface(FEMInterface):
         # 開かれたモデルに応じて femprj_path と model を更新する
         self._connect_and_open_femtet()
 
+        # original_fem_prj が None なら必ず
+        # dask worker でないプロセスがオリジナルファイルを開いている
+        if self.original_femprj_path is None:
+            # dask worker でなければ original のはず
+            try:
+                worker = get_worker()
+            except ValueError:
+                self.original_femprj_path = self.femprj_path
+
         # 接続した Femtet の種類に応じて del 時に quit するかどうか決める
         self.quit_when_destruct = self.connected_method == 'new'
 
@@ -117,26 +128,13 @@ class FemtetInterface(FEMInterface):
             model_name=self.model_name,
             open_result_with_gui=self.open_result_with_gui,
             parametric_output_indexes_use_as_objective=self.parametric_output_indexes_use_as_objective,
+            save_pdt=self.save_pdt,
             **kwargs
         )
 
     def __del__(self):
         if self.quit_when_destruct:
-            try:
-                # 強制終了 TODO: 自動保存を回避する
-                hwnd = self.Femtet.hWnd
-                pid = _get_pid(hwnd)
-                util.close_femtet(hwnd, 1, True)
-                start = time()
-                while psutil.pid_exists(pid):
-                    if time() - start > 30:  # 30 秒経っても存在するのは何かおかしい
-                        os.kill(pid, signal.SIGKILL)
-                        break
-                    sleep(1)
-                sleep(1)
-
-            except (AttributeError, OSError):  # already dead
-                pass
+            self.quit()
         # CoUninitialize()  # Win32 exception occurred releasing IUnknown at 0x0000022427692748
 
     def _connect_new_femtet(self):
@@ -626,8 +624,25 @@ class FemtetInterface(FEMInterface):
                 print('================')
                 input('終了するには Enter を押してください。')
                 raise e
+
         else:
-            util.close_femtet(self.Femtet.hWnd, timeout, force)
+            hwnd = self.Femtet.hWnd
+
+            # terminate
+            util.close_femtet(hwnd, timeout, force)
+
+            try:
+                pid = _get_pid(hwnd)
+                start = time()
+                while psutil.pid_exists(pid):
+                    if time() - start > 30:  # 30 秒経っても存在するのは何かおかしい
+                        logger.error('Femtet の終了に失敗しました。')
+                        break
+                    sleep(1)
+                sleep(1)
+
+            except (AttributeError, OSError):  # already dead
+                pass
 
     def _setup_before_parallel(self, client):
         client.upload_file(
@@ -637,3 +652,128 @@ class FemtetInterface(FEMInterface):
 
     def _version(self):
         return _version(Femtet=self.Femtet)
+
+    def create_postprocess_args(self):
+        file_content = self.create_result_file_content()
+        jpg_content = self.create_jpg_content()
+
+        out = dict(
+            original_femprj_path=self.original_femprj_path,
+            model_name=self.model_name,
+            pdt_file_content=file_content,
+            jpg_file_content=jpg_content,
+        )
+        return out
+
+    @staticmethod
+    def postprocess_func(
+            trial: int,
+            original_femprj_path: str,
+            model_name: str,
+            pdt_file_content=None,
+            jpg_file_content=None,
+            dask_scheduler=None
+    ):
+        result_dir = original_femprj_path.replace('.femprj', '.Results')
+        if pdt_file_content is not None:
+            pdt_path = os.path.join(result_dir, model_name + f'_trial{trial}.pdt')
+            with open(pdt_path, 'wb') as f:
+                f.write(pdt_file_content)
+
+        if jpg_file_content is not None:
+            jpg_path = os.path.join(result_dir, model_name + f'_trial{trial}.jpg')
+            with open(jpg_path, 'wb') as f:
+                f.write(jpg_file_content)
+
+    def create_result_file_content(self):
+        """Called after solve"""
+        if self.save_pdt == 'all':
+            # 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
+
+            else:
+                raise Exception('pdt ファイルの保存でエラーが発生しました。')
+
+        else:
+            return None
+
+    def create_jpg_content(self):
+        result_dir = self.femprj_path.replace('.femprj', '.Results')
+        jpg_path = os.path.join(result_dir, self.model_name + '.jpg')
+
+        # モデル表示画面の設定
+        self.Femtet.SetWindowSize(200, 200)
+        self.Femtet.Fit()
+        self.Femtet.ViewNumeric.SetCoord(1, 1, 1)
+
+        # ---モデルの画面を保存---
+        self.Femtet.Redraw()  # 再描画
+        succeed = self.Femtet.SavePicture(jpg_path, 200, 200, 80)
+
+        self.Femtet.RedrawMode = True  # 逐一の描画をオン
+
+        if not succeed:
+            raise Exception('jpg ファイルの保存でエラーが発生しました。')
+
+        if not os.path.exists(jpg_path):
+            raise Exception('保存した jpg ファイルが見つかりませんでした。')
+
+        with open(jpg_path, 'rb') as f:
+            content = f.read()
+
+        return content
+
+
+from win32com.client import Dispatch, constants
+
+
+class _UnPicklableNoFEM(FemtetInterface):
+
+
+    original_femprj_path = 'dummy'
+    model_name = 'dummy'
+    parametric_output_indexes_use_as_objective = None
+    kwargs = dict()
+    Femtet = None
+    quit_when_destruct = False
+
+    def __init__(self):
+        CoInitialize()
+        self.unpicklable_member = Dispatch('FemtetMacro.Femtet')
+        self.cns = constants
+
+    def _setup_before_parallel(self, *args, **kwargs):
+        pass
+
+    def check_param_value(self, *args, **kwargs):
+        pass
+
+    def update_parameter(self, *args, **kwargs):
+        pass
+
+    def update(self, *args, **kwargs):
+        pass
+
+    def create_result_file_content(self):
+        """Called after solve"""
+
+        # save to worker space
+        with open(__file__, 'rb') as f:
+            content = f.read()
+
+        return content
+
+    def create_file_path(self, trial: int):
+        # return path of scheduler environment
+        here = os.path.dirname(__file__)
+        pdt_path = os.path.join(here, f'trial{trial}.pdt')
+        return pdt_path
+

pyfemtet/opt/interface/_femtet_with_nx/_interface.py

@@ -17,6 +17,10 @@ class FemtetWithNXInterface(FemtetInterface):
 
     Args:
         prt_path: The path to the prt file.
+        export_curves(bool or None): Parasolid export setting of NX. If None, PyFemtet does not change the setting of NX. Defaults to None.
+        export_surfaces(bool or None): Parasolid export setting of NX. If None, PyFemtet does not change the setting of NX. Defaults to None.
+        export_solids(bool or None): Parasolid export setting of NX. If None, PyFemtet does not change the setting of NX. Defaults to None.
+        export_flattened_assembly(bool or None): Parasolid export setting of NX. If None, PyFemtet does not change the setting of NX. Defaults to None.
 
     For details of The other arguments, see ``FemtetInterface``.
 
@@ -27,9 +31,12 @@ class FemtetWithNXInterface(FemtetInterface):
     def __init__(
             self,
             prt_path,
+            export_curves: bool or None = None,
+            export_surfaces: bool or None = None,
+            export_solids: bool or None = None,
+            export_flattened_assembly: bool or None = None,
             **kwargs
     ):
-
         # check NX installation
         self.run_journal_path = os.path.join(os.environ.get('UGII_BASE_DIR'), 'NXBIN', 'run_journal.exe')
         if not os.path.isfile(self.run_journal_path):
@@ -45,10 +52,19 @@ class FemtetWithNXInterface(FemtetInterface):
         except ValueError:  # get_worker に失敗した場合
             self.prt_path = os.path.abspath(prt_path)
 
+        self.export_curves = export_curves
+        self.export_surfaces = export_surfaces
+        self.export_solids = export_solids
+        self.export_flattened_assembly = export_flattened_assembly
+
         # FemtetInterface の設定 (femprj_path, model_name の更新など)
         # + restore 情報の上書き
         super().__init__(
             prt_path=self.prt_path,
+            export_curves=self.export_curves,
+            export_surfaces=self.export_surfaces,
+            export_solids=self.export_solids,
+            export_flattened_assembly=self.export_flattened_assembly,
             **kwargs
         )
 
@@ -86,10 +102,27 @@ class FemtetWithNXInterface(FemtetInterface):
             tmp_dict[row['name']] = row['value']
         str_json = json.dumps(tmp_dict)
 
+        # create dumped json of export settings
+        tmp_dict = dict(
+            include_curves=self.export_curves,
+            include_surfaces=self.export_surfaces,
+            include_solids=self.export_solids,
+            flatten_assembly=self.export_flattened_assembly,
+        )
+        dumped_json_export_settings = json.dumps(tmp_dict)
+
         # NX journal を使ってモデルを編集する
         env = os.environ.copy()
         subprocess.run(
-            [self.run_journal_path, self._JOURNAL_PATH, '-args', self.prt_path, str_json, x_t_path],
+            [
+                self.run_journal_path,  # run_journal.exe
+                self._JOURNAL_PATH,  # update_model.py
+                '-args',
+                self.prt_path,
+                str_json,
+                x_t_path,
+                dumped_json_export_settings,
+            ],
             env=env,
             shell=True,
             cwd=os.path.dirname(self.prt_path)

pyfemtet/opt/interface/_femtet_with_nx/update_model.py

@@ -1,35 +1,34 @@
 import os
 import sys
 import json
-import NXOpen
-
+from xml.etree.ElementInclude import include
 
-def main(prtPath:str, parameters:'dict as str', x_tPath:str = None):
-    '''
-    .prt ファイルのパスを受け取り、parameters に指定された変数を更新し、
-    x_tPath が None のときは.prt と同じディレクトリに
-    .x_t ファイルをエクスポートする
+import NXOpen
 
-    Parameters
-    ----------
-    prtPath : str
-        DESCRIPTION.
-    parameters : 'dict as str'
-        DESCRIPTION.
 
-    Returns
-    -------
-    None.
+def main(
+        prtPath: str,
+        parameters: str,  # dumped json
+        x_tPath: str,
+        dumped_json_export_settings: str,
+):
+    """Update the parameter of .prt file and export to .x_t file."""
 
-    '''    
     # 保存先の設定
-    prtPath = os.path.abspath(prtPath) # 一応
+    prtPath = os.path.abspath(prtPath)
     if x_tPath is None:
         x_tPath = os.path.splitext(prtPath)[0] + '.x_t'
 
     # 辞書の作成
     parameters = json.loads(parameters)
-    
+
+    # export 設定
+    settings = json.loads(dumped_json_export_settings)
+    include_curves = settings['include_curves']
+    include_surfaces = settings['include_surfaces']
+    include_solids = settings['include_solids']
+    flatten_assembly = settings['flatten_assembly']
+
     # session の取得とパートを開く
     theSession = NXOpen.Session.GetSession()
     theSession.Parts.OpenActiveDisplay(prtPath, NXOpen.DisplayPartOption.AllowAdditional)
@@ -40,7 +39,6 @@ def main(prtPath:str, parameters:'dict as str', x_tPath:str = None):
     displayPart = theSession.Parts.Display
 
     # 式を更新
-    unit_mm = workPart.UnitCollection.FindObject("MilliMeter")
     for k, v in parameters.items():
         try:
             exp = workPart.Expressions.FindObject(k)
@@ -48,14 +46,15 @@ def main(prtPath:str, parameters:'dict as str', x_tPath:str = None):
             print(f'├ 変数{k}は .prt ファイルに含まれていません。無視されます。')
             continue
 
-        workPart.Expressions.EditWithUnits(exp, unit_mm, str(v))
+        workPart.Expressions.Edit(exp, str(v))
         # 式の更新を適用
         id1 = theSession.NewestVisibleUndoMark
         try:
             nErrs1 = theSession.UpdateManager.DoUpdate(id1)
         # 更新に失敗
         except NXOpen.NXException as e:
-            print('└ 形状が破綻しました。操作を取り消します。')
+            print(f'├ ERROR! {e}')
+            print(f'└ 形状が破綻しました。操作を取り消します。')
             return None
 
     print('│ model 更新に成功しました。')
@@ -64,19 +63,28 @@ def main(prtPath:str, parameters:'dict as str', x_tPath:str = None):
         # parasolid のエクスポート
         parasolidExporter1 = theSession.DexManager.CreateParasolidExporter()
 
-        parasolidExporter1.ObjectTypes.Curves = False
-        parasolidExporter1.ObjectTypes.Surfaces = False
-        parasolidExporter1.ObjectTypes.Solids = True
+        if include_curves is not None:
+            parasolidExporter1.ObjectTypes.Curves = include_curves
+
+        if include_surfaces is not None:
+            parasolidExporter1.ObjectTypes.Surfaces = include_surfaces
+
+        if include_solids is not None:
+            parasolidExporter1.ObjectTypes.Solids = include_solids
+
+        if flatten_assembly is not None:
+            parasolidExporter1.FlattenAssembly = flatten_assembly
 
         parasolidExporter1.InputFile = prtPath
         parasolidExporter1.ParasolidVersion = NXOpen.ParasolidExporter.ParasolidVersionOption.Current
         parasolidExporter1.OutputFile = x_tPath
 
         parasolidExporter1.Commit()
-
         parasolidExporter1.Destroy()
-    except:
-        print('└ parasolid 更新に失敗しました。')
+
+    except Exception as e:
+        print(f'├ ERROR! {e}')
+        print(f'└ parasolid 更新に失敗しました。')
         return None
 
     print('└ parasolid 更新が正常に終了しました。')

pyfemtet/opt/opt/_base.py

@@ -88,6 +88,8 @@ class AbstractOptimizer(ABC):
             y,
             c,
             self.message,
+            postprocess_func=self.fem.postprocess_func,
+            postprocess_args=self.fem.create_postprocess_args(),
         )
 
         logger.debug('history.record end')

pyfemtet/opt/visualization/_graphs.py

@@ -2,9 +2,6 @@ import plotly.graph_objs as go
 import plotly.express as px
 
 
-_CUSTOM_DATA_DICT = {'trial': 0}  # 連番
-
-
 class _ColorSet:
     non_domi = {True: '#007bff', False: '#6c757d'}  # color
 
@@ -49,7 +46,7 @@ def update_hypervolume_plot(history, df):
         x="trial",
         y="hypervolume",
         markers=True,
-        custom_data=_CUSTOM_DATA_DICT.keys(),
+        custom_data=['trial'],
     )
 
     fig.update_layout(
@@ -67,13 +64,17 @@ def update_default_figure(history, df):
     obj_names = history.obj_names
 
     if len(obj_names) == 0:
-        return go.Figure()
+        fig = go.Figure()
 
     elif len(obj_names) == 1:
-        return update_single_objective_plot(history, df)
+        fig = update_single_objective_plot(history, df)
 
     elif len(obj_names) >= 2:
-        return update_multi_objective_pairplot(history, df)
+        fig = update_multi_objective_pairplot(history, df)
+
+    fig.update_traces(hoverinfo="none", hovertemplate=None)
+
+    return fig
 
 
 def update_single_objective_plot(history, df):
@@ -97,7 +98,7 @@ def update_single_objective_plot(history, df):
             _ls.feasible['label']: False,
             'trial': True,
         },
-        custom_data=_CUSTOM_DATA_DICT.keys(),
+        custom_data=['trial'],
     )
 
     fig.add_trace(
@@ -143,11 +144,7 @@ def update_multi_objective_pairplot(history, df):
             _ls.feasible[True]: _ss.feasible[True],
             _ls.feasible[False]: _ss.feasible[False],
         },
-        hover_data={
-            _ls.feasible['label']: False,
-            'trial': True,
-        },
-        custom_data=_CUSTOM_DATA_DICT.keys(),
+        custom_data=['trial'],
         category_orders={
             _ls.feasible['label']: (_ls.feasible[False], _ls.feasible[True]),
             _ls.non_domi['label']: (_ls.non_domi[False], _ls.non_domi[True]),

pyfemtet/opt/visualization/_monitor.py

@@ -1,4 +1,5 @@
 import os
+import base64
 from typing import Optional, List
 
 import json
@@ -6,10 +7,11 @@ import webbrowser
 from time import sleep
 from threading import Thread
 
+import numpy as np
 import pandas as pd
 import psutil
 from plotly.graph_objects import Figure
-from dash import Dash, html, dcc, Output, Input, State, callback_context, no_update
+from dash import Dash, html, dcc, Output, Input, State, callback_context, no_update, dash_table
 from dash.exceptions import PreventUpdate
 import dash_bootstrap_components as dbc
 
@@ -18,7 +20,6 @@ from pyfemtet.opt.interface import FemtetInterface
 from pyfemtet.opt.visualization._graphs import (
     update_default_figure,
     update_hypervolume_plot,
-    _CUSTOM_DATA_DICT
 )
 
 
@@ -28,6 +29,8 @@ logger = get_logger('viz')
 logger.setLevel(logging.INFO)
 
 
+here = os.path.dirname(__file__)
+
 DBC_COLUMN_STYLE_CENTER = {
     'display': 'flex',
     'justify-content': 'center',
@@ -458,7 +461,7 @@ class FemtetControl:
             points_dicts = selection_data['points']
             for points_dict in points_dicts:
                 logger.debug(points_dict)
-                trial = points_dict['customdata'][_CUSTOM_DATA_DICT['trial']]
+                trial = points_dict['customdata'][0]
                 logger.debug(trial)
                 index = trial - 1
                 names = [name for name in home.monitor.local_df.columns if name.startswith('prm_')]
@@ -556,6 +559,7 @@ class HomePageBase:
     ID_GRAPH_TABS = 'home-graph-tabs'
     ID_GRAPH_CARD_BODY = 'home-graph-card-body'
     ID_GRAPH = 'home-graph'
+    ID_GRAPH_TOOLTIP = 'home-graph-hover-tooltip'
     ID_SELECTION_DATA = 'home-selection-data'
 
     # selection data attribute
@@ -577,7 +581,6 @@ class HomePageBase:
         self.monitor = monitor
         self.app: Dash = monitor.app
         self.history = monitor.history
-        self.df = monitor.local_df
         self.setup_graph_card()
         self.setup_contents()
         self.setup_layout()
@@ -616,7 +619,12 @@ class HomePageBase:
                     children=[
                         # Loading : child が Output である callback について、
                         # それが発火してから return するまでの間 Spinner が出てくる
-                        dcc.Loading(dcc.Graph(id=self.ID_GRAPH)),
+                        html.Div([
+                            dcc.Loading(
+                                dcc.Graph(id=self.ID_GRAPH, clear_on_unhover=True, figure=self.get_fig_by_tab_id(default_tab)),
+                            ),
+                            dcc.Tooltip(id=self.ID_GRAPH_TOOLTIP),
+                        ]),
                     ],
                     id=self.ID_GRAPH_CARD_BODY,
                 ),
@@ -633,7 +641,7 @@ class HomePageBase:
                 Output(self.ID_GRAPH, 'figure'),
             ],
             [
-                Input(self.ID_GRAPH_CARD_BODY, 'children'),
+                Input(self.ID_DUMMY, 'children'),
             ],
             [
                 State(self.ID_GRAPH_TABS, 'active_tab'),
@@ -678,6 +686,72 @@ class HomePageBase:
             logger.debug(f'on_select: {selected_data}')
             return [selected_data]
 
+        # ホバーに画像を表示する callback
+        @self.monitor.app.callback(
+            Output(self.ID_GRAPH_TOOLTIP, "show"),
+            Output(self.ID_GRAPH_TOOLTIP, "bbox"),
+            Output(self.ID_GRAPH_TOOLTIP, "children"),
+            Input(self.ID_GRAPH, "hoverData"),
+        )
+        def display_hover(hoverData):
+            if hoverData is None:
+                return False, no_update, no_update
+
+            pt = hoverData["points"][0]
+            bbox = pt["bbox"]
+
+            # get row of the history
+            trial = pt['customdata'][0]
+            row = self.monitor.local_df[self.monitor.local_df['trial'] == trial]
+
+            # === create hovered data ===
+            # get encoded image from history.additional_metadata
+            img_url = None
+
+            # Femtet specified processing
+            metadata = self.history.metadata
+            if metadata[0] != '':
+                # get img path
+                d = json.loads(metadata[0])
+                femprj_path = d['femprj_path']
+                model_name = d['model_name']
+                femprj_result_dir = femprj_path.replace('.femprj', '.Results')
+                img_path = os.path.join(femprj_result_dir, f'{model_name}_trial{trial}.jpg')
+                if os.path.exists(img_path):
+                    # create encoded image
+                    with open(img_path, 'rb') as f:
+                        content = f.read()
+                    encoded_image = base64.b64encode(content).decode('utf-8')
+                    img_url = 'data:image/jpeg;base64, ' + encoded_image
+            html_img = html.Img(src=img_url, style={"width": "200px"}) if img_url is not None else html.Div()
+
+            # parameters
+            pd.options.display.float_format = '{:.4e}'.format
+            parameters = row.iloc[:, np.where(np.array(metadata) == 'prm')[0]]
+            names = parameters.columns
+            values = [f'{value:.3e}' for value in parameters.values.ravel()]
+            data = pd.DataFrame(dict(
+                name=names, value=values
+            ))
+
+            # descript result
+            desc = html.Div([
+                html.H3(f"trial{trial}", style={"color": "darkblue"}),
+                dash_table.DataTable(
+                    columns=[{'name': col, 'id': col} for col in data.columns],
+                    data=data.to_dict('records')
+                ),
+            ])
+
+            # make output
+            children = html.Div([
+                html.Div(html_img, style={'display': 'inline-block', 'margin-right': '10px', 'vertical-align': 'top'}),
+                html.Div(desc, style={'display': 'inline-block', 'margin-right': '10px'})
+            ])
+
+            return True, bbox, children
+
+
     def get_fig_by_tab_id(self, tab_id):
         if tab_id in self.graphs.keys():
             fig_func = self.graphs[tab_id]['fig_func']
@@ -712,8 +786,8 @@ class ResultViewerAppHomePage(HomePageBase):
             '---\n'
             '- 最適化の結果分析画面です。\n'
             '- 凡例をクリックすると、対応する要素の表示/非表示を切り替えます。\n'
-            '- ブラウザを使用しますが、ネットワーク通信は行いません。\n'
-            '- ブラウザを閉じてもプログラムは終了しません。'
+            '- ブラウザを使用しますが、解析結果のインターネット通信は行いません。\n'
+            '- ブラウザを閉じてもプログラムは終了しません。\n'
             '  - コマンドプロンプトを閉じるかコマンドプロンプトに `CTRL+C` を入力してプログラムを終了してください。\n'
         )
         self.contents.children = [
@@ -753,9 +827,10 @@ class ProcessMonitorAppHomePage(HomePageBase):
         note = dcc.Markdown(
             '---\n'
             '- 最適化の結果分析画面です。\n'
-            '- ブラウザを使用しますが、ネットワーク通信は行いません。\n'
+            '- ブラウザを使用しますが、解析結果のインターネット通信は行いません。\n'
             '- この画面を閉じても最適化は中断されません。\n'
             f'- この画面を再び開くにはブラウザのアドレスバーに「localhost:{self.monitor.DEFAULT_PORT}」と入力して下さい。\n'
+            '- __マウスオーバーで表示されるデータを見る場合は、「自動更新を一時停止する」ボタンを押してください。__\n'
         )
 
         self.contents.children = [
@@ -832,7 +907,10 @@ class ProcessMonitorAppHomePage(HomePageBase):
             # 1. interval => figure を更新する
             if (len(self.monitor.local_df) > 0) and (active_tab_id is not None):
                 fig = self.get_fig_by_tab_id(active_tab_id)
-                ret[card_body] = dcc.Graph(figure=fig, id=self.ID_GRAPH)  # list にせんとダメかも
+                ret[card_body] = [
+                    dcc.Graph(figure=fig, id=self.ID_GRAPH, clear_on_unhover=True),
+                    dcc.Tooltip(id=self.ID_GRAPH_TOOLTIP),
+                ]
 
             # 3. btn toggle => (toggle の children を切替) and (interval を切替)
             if toggle_n_clicks % 2 == 1:
@@ -1142,7 +1220,7 @@ class ProcessMonitorApp(AppBase):
             self.local_worker_status_int_list = [s.get() for s in self.worker_status_list]
 
             # terminate_all 指令があれば monitor server をホストするプロセスごと終了する
-            if self.status.get() == OptimizationStatus.TERMINATE_ALL:
+            if self.status.get() >= OptimizationStatus.TERMINATE_ALL:
                 return 0  # take server down with me
 
             # interval

pyfemtet/opt/visualization/result_viewer.py

@@ -0,0 +1,13 @@
+import argparse
+from pyfemtet.opt.visualization._graphs import show_static_monitor
+
+
+def main():
+    parser = argparse.ArgumentParser()
+
+    parser.add_argument('csv_path', help='pyfemtet を実行した結果の csv ファイルのパスを指定してください。', type=str)
+
+    args = parser.parse_args()
+
+    if args.csv_path:
+        show_static_monitor(args.csv_path)

{pyfemtet-0.4.7.dist-info → pyfemtet-0.4.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfemtet
-Version: 0.4.7
+Version: 0.4.9
 Summary: Design parameter optimization using Femtet.
 Home-page: https://github.com/pyfemtet/pyfemtet
 License: BSD-3-Clause

{pyfemtet-0.4.7.dist-info → pyfemtet-0.4.9.dist-info}/RECORD

@@ -12,69 +12,70 @@ 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=H-XEMfwNdLYsHizQIA9HjmQyc0e1i8XfavXH5Y7e3bU,21
-pyfemtet/_test_util.py,sha256=Qcf_g3Rz1yJMkTWmEW8Scl2U3h-Vj1h5u0Ejs3JgMYQ,2882
+pyfemtet/__init__.py,sha256=Awjzp7R_3igiNhiHUO_Jzt5iqhYXj8NZfpCn857chhM,21
+pyfemtet/_test_util.py,sha256=cxSPWvYbvAMAEoY_H3XpWlhhdS0MijwZEQgZ7aa4Fy8,3727
 pyfemtet/core.py,sha256=3lqfBGJ5IuKz2Nqj5pRo7YQqKwx_0ZDL72u95Ur_1p0,1386
 pyfemtet/dispatch_extensions.py,sha256=MhWiUXVt2Cq8vDeajMK4SrajjiAmb4m2fK8gXwHLrWA,16177
 pyfemtet/logger.py,sha256=JYD0FvzijMS2NvZN7VT7vZA5hqtHEkvS93AHlIMDePw,2507
 pyfemtet/opt/__init__.py,sha256=_P8unESvqCRD5pmuo6-5yo7BbrPi7c0aE6UZpqUD-_I,596
-pyfemtet/opt/_femopt.py,sha256=o2TLbmWwiOVdDsVHSh6j3k7fWktHJQxpTpeDmDkg5XE,22601
-pyfemtet/opt/_femopt_core.py,sha256=n_m-GIW82uvKNAn_N1ypBZQ4sOjngfNly7-SEkOXfuU,24774
+pyfemtet/opt/_femopt.py,sha256=nP9ApYS3dSi7ytSqMApmDFp1KKlqPX-KvVqBnXauQzA,22495
+pyfemtet/opt/_femopt_core.py,sha256=zB12rNBnWN-CuqGijgKL8RuBEdoyzfbNWQBTcBiTvcU,25490
 pyfemtet/opt/femprj_sample/cad_ex01_NX.femprj,sha256=KC8JlHqHzqgyKriK911QSnQByQpRlw-SX5OSQ_GNe5M,149193
 pyfemtet/opt/femprj_sample/cad_ex01_NX.prt,sha256=3okHLeMdslrRA_wkhppZtxIe-2-ZPMfNqWCdQwUV31o,226626
-pyfemtet/opt/femprj_sample/cad_ex01_NX.py,sha256=qpfbU41qsJSMWnROzTOU1mpmHngGoa0cjnLHqNkt0EY,4519
+pyfemtet/opt/femprj_sample/cad_ex01_NX.py,sha256=TmM8wQ5CuesS8-QWlQNwykoAJWaPxUfNjqjx7xhDqz8,4892
 pyfemtet/opt/femprj_sample/cad_ex01_NX_test_result.reccsv,sha256=hcOiI1Ct5o7k_tN8nB82kpVJpAtGvdLBjLwqEAFz49c,1029
 pyfemtet/opt/femprj_sample/cad_ex01_SW.SLDPRT,sha256=jjBi4aRRwZPK-4-YRKDC4eO_Ch2jwd7M7chvJlnBbZU,97158
 pyfemtet/opt/femprj_sample/cad_ex01_SW.femprj,sha256=knN0bBTHm5CqExLdmxdJvPldJ6ahnQesKt974qRjWh4,126837
-pyfemtet/opt/femprj_sample/cad_ex01_SW.py,sha256=HOpxWC_jxnKmabO4u5JrHNHPR8b7WFm-PauJSoTxRrQ,4586
+pyfemtet/opt/femprj_sample/cad_ex01_SW.py,sha256=AtKGRMMweXjIriYe5kxEecrNK5KPdf2XMNm54nVK-1o,4830
 pyfemtet/opt/femprj_sample/cad_ex01_SW_test_result.reccsv,sha256=hcOiI1Ct5o7k_tN8nB82kpVJpAtGvdLBjLwqEAFz49c,1029
 pyfemtet/opt/femprj_sample/gal_ex58_parametric.femprj,sha256=dbanN3W2eX_ciZ0wZGqK60mc4edSVh5G2OqbbMKyFng,74898
-pyfemtet/opt/femprj_sample/gal_ex58_parametric.py,sha256=yNAgkHknRY6CPnYR6ETl6ZNOElepvQNwwnofUGpFhVw,2485
+pyfemtet/opt/femprj_sample/gal_ex58_parametric.py,sha256=imD84lKenIbkxY9La37SWbPvJlhXJRnV_IFtE0tQ5ac,2729
 pyfemtet/opt/femprj_sample/gal_ex58_parametric_test_result.reccsv,sha256=hcOiI1Ct5o7k_tN8nB82kpVJpAtGvdLBjLwqEAFz49c,1029
 pyfemtet/opt/femprj_sample/gau_ex08_parametric.femprj,sha256=Yb9ILeTEKx5xfJGk8IZH_DVlgkpGB33Vy9-LGIEQboY,279251
-pyfemtet/opt/femprj_sample/gau_ex08_parametric.py,sha256=7SLe6Qbi2AGm1Li7kotyy2qSYynX2YitoW255XRxOOI,1956
+pyfemtet/opt/femprj_sample/gau_ex08_parametric.py,sha256=SzHKPrK05Muv5edvrMr91YYN6Zm51qHbWWLCWd94Ww8,2200
 pyfemtet/opt/femprj_sample/gau_ex08_parametric_test_result.reccsv,sha256=usCllUrcaDihii8rSyCcZDhXp1wJI01P-yzm-BHfhb4,2779
 pyfemtet/opt/femprj_sample/her_ex40_parametric.femprj,sha256=LLAUDlUo1dIpRzlKPs1lvACzJQxjnWW3xAGAodYEqRM,117221
-pyfemtet/opt/femprj_sample/her_ex40_parametric.py,sha256=9ubwnEavFpjbTAbH5RmYwYoGxATl-ehW_oH_kDLTlXs,4839
+pyfemtet/opt/femprj_sample/her_ex40_parametric.py,sha256=iEIkQLozBwQOBzv04nVH0JRUByPvfwPX50c1P9IRHfY,5083
 pyfemtet/opt/femprj_sample/her_ex40_parametric_test_result.reccsv,sha256=_vTN2GdxPcHZByNw14izdYB190Vn6WROp7-qOHW7QU8,2845
 pyfemtet/opt/femprj_sample/paswat_ex1_parametric.femprj,sha256=z2NHFJWiuiLv_zhxjFpLpmRbYVvQ43bAMj_NLioQGsk,262283
-pyfemtet/opt/femprj_sample/paswat_ex1_parametric.py,sha256=nFBQPr2gaCoLVxZDsKVUU_aZ3I9ZwbQCwz1_qJTSgOU,2388
-pyfemtet/opt/femprj_sample/paswat_ex1_parametric_parallel.py,sha256=2IPq3SMrd2TCQMKL0_NA7ELBAj9yqwNe2RiMWpopw_M,2499
+pyfemtet/opt/femprj_sample/paswat_ex1_parametric.py,sha256=HXbkWYUtGB5p1IyCfrg-CQ6Q5HXTEtgAtKwa75iGXBo,2632
+pyfemtet/opt/femprj_sample/paswat_ex1_parametric_parallel.py,sha256=Px8fS_WrQ0N3xaD5eHyYvx2-kcx8Mf84CIC2STS1kKw,2743
 pyfemtet/opt/femprj_sample/paswat_ex1_parametric_test_result.reccsv,sha256=RjENlloyx71dkZJ_fIY6FVWKnSBCT_RmV1dO98eJxyY,3303
 pyfemtet/opt/femprj_sample/wat_ex14_parametric.femprj,sha256=F-yu2dGrsbrIA1Lhizu2aHTjQFTohyBmOuJv-Iyl8jk,179596
-pyfemtet/opt/femprj_sample/wat_ex14_parametric.py,sha256=sGj0khYO7_yGyXGHbdWJ883XvzO1HUbrgBLjiS2d7TM,2240
+pyfemtet/opt/femprj_sample/wat_ex14_parametric.py,sha256=o_LeUpo779a8vCBjxqS6NNF5zS7ID4mBfFjHsYvI1vs,2484
 pyfemtet/opt/femprj_sample/wat_ex14_parametric_test_result.reccsv,sha256=92IkN7HdHBatyacO6aU3MVhOG6rkXlodlw34oF91BSM,3056
 pyfemtet/opt/femprj_sample_jp/cad_ex01_NX_jp.femprj,sha256=0RBhOGhtiFAp0QSCTBYEaDY9EZymn9hJYchAOJ6PaBA,143533
-pyfemtet/opt/femprj_sample_jp/cad_ex01_NX_jp.py,sha256=2LE-3d0XEChqCSwgUi45V8eAsF_YUGUgO9jLx5u5bjQ,4797
+pyfemtet/opt/femprj_sample_jp/cad_ex01_NX_jp.py,sha256=sqhOskvRn84e1xET5rTfvbu5WG0kXvLoNfdAJ3e_XqA,5205
 pyfemtet/opt/femprj_sample_jp/cad_ex01_SW_jp.femprj,sha256=ZZhT9XjB9Xu9YwHWv4gbvKBiUWlOFKEoHjAcGWb3vvQ,128026
-pyfemtet/opt/femprj_sample_jp/cad_ex01_SW_jp.py,sha256=o8P6o7Q0d0Jj02Qeij8kxbduyyKf_fNHSlXU_1H65S8,4864
+pyfemtet/opt/femprj_sample_jp/cad_ex01_SW_jp.py,sha256=qI_mU_0ype_6706CQphaLD_IF2ILawgNqPUCWsfbLsc,5143
 pyfemtet/opt/femprj_sample_jp/gal_ex58_parametric_jp.femprj,sha256=PzqtNVde6VnMHFpedRBsOq9JVhCY0ymQPVs54EKsNLw,75668
-pyfemtet/opt/femprj_sample_jp/gal_ex58_parametric_jp.py,sha256=gnCPiaxCPITAP-972DylFQ0BNpDJLeal9HPf5cfbhRI,2488
+pyfemtet/opt/femprj_sample_jp/gal_ex58_parametric_jp.py,sha256=MLLlWxpDo1JWWiglNc7XNoms3_IXPCj65aEPy_83tLs,2767
 pyfemtet/opt/femprj_sample_jp/gau_ex08_parametric_jp.femprj,sha256=TTXw_8YT8pzHQlu4ufGzTq1IFYSwcWWt4GA6sIY1YPM,295600
-pyfemtet/opt/femprj_sample_jp/gau_ex08_parametric_jp.py,sha256=GxfAb5_0F9tK_i9almLdQh7OjzdNFo_leoyIPtPCqvM,2114
+pyfemtet/opt/femprj_sample_jp/gau_ex08_parametric_jp.py,sha256=g8VYoibnKwnNpK7KPZ321jrlSL28xJ3dKzP3FacovNw,2393
 pyfemtet/opt/femprj_sample_jp/her_ex40_parametric_jp.femprj,sha256=OJ7f8iw0z1BZqanuNn71uEaoM2Kgb93ptUU8iYwYON0,129783
-pyfemtet/opt/femprj_sample_jp/her_ex40_parametric_jp.py,sha256=FFXO4GblaCHXrU7yUapBcescscESrVv-dutVYs4Fp4s,5272
+pyfemtet/opt/femprj_sample_jp/her_ex40_parametric_jp.py,sha256=eMrUZhyqIQ2jDl9kdHrTnpvmiw-6GkPJQBf7kaBilaI,5551
 pyfemtet/opt/femprj_sample_jp/paswat_ex1_parametric_jp.femprj,sha256=y7eURFBdqh6PmD4zbelGuB458HmfihVht0K4wVI-mik,265368
-pyfemtet/opt/femprj_sample_jp/paswat_ex1_parametric_jp.py,sha256=cm_P-qXX0p4GBzst6IUuarkSczrDhitCNodzlcbyRPM,2516
-pyfemtet/opt/femprj_sample_jp/paswat_ex1_parametric_parallel_jp.py,sha256=zpkGyKBhPJhEoc_pfYX6m27FgGcEV8D8HIBUg6EL_ps,2632
+pyfemtet/opt/femprj_sample_jp/paswat_ex1_parametric_jp.py,sha256=HwLhd1xIq_wdQchjttKmcT4EU1lpNkcaAZDcK-L8C_w,2795
+pyfemtet/opt/femprj_sample_jp/paswat_ex1_parametric_parallel_jp.py,sha256=utOjKYFSXqvrgPtphHMeYUQpDT20K7Iw2GBLG80ga5M,2911
 pyfemtet/opt/femprj_sample_jp/wat_ex14_parametric_jp.femprj,sha256=dMwQMt6yok_PbZLyxPYdmg5wJQwgQDZ4RhS76zdGLGk,177944
-pyfemtet/opt/femprj_sample_jp/wat_ex14_parametric_jp.py,sha256=vnfI4WuCvyjQN1MhnzyB-jcAPtTwz3yNiwtTm2yQZHU,2311
+pyfemtet/opt/femprj_sample_jp/wat_ex14_parametric_jp.py,sha256=W30jobW1eEYuAsJJR14-EifQ1fxeXlS-gRSFqgCP4BM,2590
 pyfemtet/opt/interface/__init__.py,sha256=qz5BszPuU3jZIoDnPjkPDAgvgHLlx1sYhuqh5ID798k,480
-pyfemtet/opt/interface/_base.py,sha256=lDjdvKYmBMxSc7SfoWSu91qVijGaQ2Ng-0C7z_f4eFM,2079
-pyfemtet/opt/interface/_femtet.py,sha256=ofX76BSWEnoMAvSbOIdkVA2CUPcJYJuG4UHWFQtFBg0,28601
+pyfemtet/opt/interface/_base.py,sha256=Ti2wCicyeofAZ0DzQLYoj9PBj1lyM5_lbLa0LBoypLM,2228
+pyfemtet/opt/interface/_femtet.py,sha256=PSy1AldNK7Yg7tmxzqEmwCb5oYXouh_Y6p2vrxtwnDY,33151
 pyfemtet/opt/interface/_femtet_parametric.py,sha256=l3Ka-e6WPTM4cerIFT4_qK6o80Lk9oHPsOnXUaJufm4,2883
 pyfemtet/opt/interface/_femtet_with_nx/__init__.py,sha256=-6W2g2FDEcKzGHmI5KAKQe-4U5jDpMj0CXuma-GZca0,83
-pyfemtet/opt/interface/_femtet_with_nx/_interface.py,sha256=kTEmfAyLMEZvYTYjGXgYnoyhi-wDzhKK7opyVp7rOcY,3931
-pyfemtet/opt/interface/_femtet_with_nx/update_model.py,sha256=t0AB7mKY7rmrI_9stP1-5qhzmugEQ19DnZ4CCrCdTSw,2856
+pyfemtet/opt/interface/_femtet_with_nx/_interface.py,sha256=8ZvD6ajNmKUqXPkDsGJ4tOHrQOYwWBlO9OSPaCO3ml0,5666
+pyfemtet/opt/interface/_femtet_with_nx/update_model.py,sha256=uFf_SU96_BYUmLBBR5w3NS3WqXvEvSbOoxVnz9FA3Ug,3187
 pyfemtet/opt/interface/_femtet_with_sldworks.py,sha256=400FidHp7mBAVLyxzLlLtGYNzK_TtK61ycd4vFjHES0,6254
 pyfemtet/opt/opt/__init__.py,sha256=eQh-7PJN2YEUbHZnjinbeIyb0bk1wSh76TaEAa2l8SU,191
-pyfemtet/opt/opt/_base.py,sha256=yEnPWAxFUIRNmUV-nbfCW4N3naDkkzQGME3qsDgEBFQ,7571
+pyfemtet/opt/opt/_base.py,sha256=PIEoahy7VdnrfR4jknGiB0ZzJTPzM7gEpErb6Zsm2l4,7692
 pyfemtet/opt/opt/_optuna.py,sha256=TWtp9auU6GBWtEJVOuo8aWSvLcCHCUNUyOQRnqyln4I,9996
 pyfemtet/opt/visualization/__init__.py,sha256=PUCHoZnuZrHjTd0QQQBgzWkCpKY2noBPTvi-lyvxQyw,193
-pyfemtet/opt/visualization/_graphs.py,sha256=34NPlvz7RkoBndvaVCNhlV37SLjpHTe7X3rnOZSmpYs,5553
-pyfemtet/opt/visualization/_monitor.py,sha256=X2KR6fd8qf1U58Qr_o0jn0FTm1w9ARMPhs4eMYgGipI,42100
-pyfemtet-0.4.7.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.4.7.dist-info/METADATA,sha256=e3obY8HzDscP_r-DC4qvF_CvAQ2go-XKYcZQLZQ4ZAs,3381
-pyfemtet-0.4.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyfemtet-0.4.7.dist-info/entry_points.txt,sha256=E_NUq8BEuKLM3z6Ou0sh6HyvaKE5O6NBDlmO-wgEGaQ,67
-pyfemtet-0.4.7.dist-info/RECORD,,
+pyfemtet/opt/visualization/_graphs.py,sha256=eovw8ShTGGWaDNr-nZuQZd3aa_gcYr-zziB0ZSI8JPg,5436
+pyfemtet/opt/visualization/_monitor.py,sha256=VxR1RutF_bfV37IETsUSIqjPdOPnm4OwrGVJi4eA9ag,45431
+pyfemtet/opt/visualization/result_viewer.py,sha256=n3yToETPO4eDrqBtbmkB1rg0BjRQjCLbdgR84PVLAjk,379
+pyfemtet-0.4.9.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
+pyfemtet-0.4.9.dist-info/METADATA,sha256=py3VvCY5zKdeATTFUj6rQ10lZUczWBjepZUqk_d4pTo,3381
+pyfemtet-0.4.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyfemtet-0.4.9.dist-info/entry_points.txt,sha256=gnfw44Hr_FcEOXVCJDSlvFzmJtmmV59gnPYChcKXem0,92
+pyfemtet-0.4.9.dist-info/RECORD,,

pyfemtet-0.4.9.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+pyfemtet-opt-result-viewer=pyfemtet.opt.visualization.result_viewer:main
+

pyfemtet-0.4.7.dist-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-opt-show=pyfemtet.opt.visualization:entry_point
-