pyfemtet 0.8.4__py3-none-any.whl → 0.8.6__py3-none-any.whl

pyfemtet/__init__.py

@@ -1 +1 @@
-__version__ = "0.8.4"
+__version__ = "0.8.6"

pyfemtet/opt/_femopt.py

@@ -27,6 +27,7 @@ from pyfemtet.opt._femopt_core import (
     History,
     OptimizationStatus,
     logger,
+    MonitorHostRecord,
 )
 from pyfemtet._message import Msg, encoding
 from pyfemtet.opt.optimizer.parameter import Parameter, Expression
@@ -135,6 +136,7 @@ class FEMOpt:
         self.monitor_process_future = None
         self.monitor_server_kwargs = dict()
         self.monitor_process_worker_name = None
+        self.monitor_host_record = None
         self._hv_reference = None
         self._extra_space_dir = None
 
@@ -403,7 +405,7 @@ class FEMOpt:
 
         if names is not None:
             if isinstance(names, str):
-                names = [f'name_{i}' for i in range(n_return)]
+                names = [f'{names}_{i}' for i in range(n_return)]
             else:
                 # names = names
                 pass
@@ -679,11 +681,11 @@ class FEMOpt:
         # ===== fem の設定 ==--=
 
         # Femtet 特有の処理
-        metadata = None
+        extra_data = dict()
         if isinstance(self.fem, FemtetInterface):
 
             # 結果 csv に記載する femprj に関する情報の作成
-            metadata = json.dumps(
+            extra_data.update(
                 dict(
                     femprj_path=self.fem.original_femprj_path,
                     model_name=self.fem.model_name
@@ -774,23 +776,25 @@ class FEMOpt:
 
         with self.client.cluster as _cluster, self.client as _client:
 
-            # actor の設定
+            # ===== status actor の設定 =====
             self.status = OptimizationStatus(_client, worker_address=self.monitor_process_worker_name)
             self.worker_status_list = [OptimizationStatus(_client, worker_address=self.monitor_process_worker_name, name=name) for name in worker_addresses]  # tqdm 検討
             self.status.set(OptimizationStatus.SETTING_UP)
+            self.monitor_host_record = MonitorHostRecord(_client, self.monitor_process_worker_name)
+            logger.info('Status Actor initialized successfully.')
+
+            # ===== initialize history =====
             self.history = History(
                 self.history_path,
                 self.opt.variables.get_parameter_names(),
                 list(self.opt.objectives.keys()),
                 list(self.opt.constraints.keys()),
                 _client,
-                metadata,
                 self._hv_reference
             )
-            logger.info('Status Actor initialized successfully.')
 
+            # ===== launch monitor =====
             # launch monitor
-            # noinspection PyTypeChecker
             self.monitor_process_future = _client.submit(
                 # func
                 _start_monitor_server,
@@ -799,6 +803,7 @@ class FEMOpt:
                 self.status,
                 worker_addresses,
                 self.worker_status_list,
+                self.monitor_host_record,
                 # kwargs
                 **self.monitor_server_kwargs,
                 # kwargs of submit
@@ -807,6 +812,16 @@ class FEMOpt:
             )
             logger.info('Process monitor initialized successfully.')
 
+            # update extra_data of history to notify
+            # how to emit interruption signal by
+            # external processes
+            start = time()
+            while len(self.monitor_host_record.get()) == 0:
+                sleep(0.1)
+            extra_data.update(self.monitor_host_record.get())
+            self.history.extra_data.update(extra_data)
+
+            # ===== setup fem and opt before parallelization =====
             # fem
             self.fem._setup_before_parallel(_client)
 
@@ -817,6 +832,11 @@ class FEMOpt:
             self.opt.history = self.history
             self.opt._setup_before_parallel()
 
+            # ===== 最適化ループ開始 =====
+            # opt から non-serializable な com を
+            # 有している可能性のある fem を削除
+            # ただし main process の sub thread では
+            # これをそのまま使うので buff に退避
             buff = self.opt.fem
             del self.opt.fem
 
@@ -832,8 +852,12 @@ class FEMOpt:
                 allow_other_workers=False,
             )
 
+            # 退避した fem を戻す
             self.opt.fem = buff
 
+            # リモートクラスタではない場合
+            # main process の sub thread で
+            # 計算開始
             t_main = None
             if not self.opt.is_cluster:
                 # ローカルプロセスでの計算(opt._run 相当の処理)
@@ -857,7 +881,7 @@ class FEMOpt:
                 )
                 t_main.start()
 
-            # save history
+            # ===== save history during optimization =====
             def save_history():
                 while True:
                     sleep(2)
@@ -872,7 +896,6 @@ class FEMOpt:
             t_save_history.start()
 
             # ===== 終了 =====
-
             # クラスターの Unexpected Exception のリストを取得
             opt_exceptions: list[Exception or None] = _client.gather(calc_futures)  # gather() で終了待ちも兼ねる
 
@@ -884,7 +907,7 @@ class FEMOpt:
                     local_opt_exception = self.opt._exception  # Exception を取得
             opt_exceptions.append(local_opt_exception)
 
-            # 終了
+            # 終了シグナルを送る
             self.status.set(OptimizationStatus.TERMINATED)
             end = time()
 
@@ -910,6 +933,8 @@ class FEMOpt:
                     print()
 
             # monitor worker を残してユーザーが結果を確認できるようにする
+            # with 文を抜けると monitor worker が終了して
+            # daemon thread である run_forever が終了する
             if confirm_before_exit:
                 print()
                 print('='*len(Msg.CONFIRM_BEFORE_EXIT))
@@ -945,6 +970,7 @@ def _start_monitor_server(
         status,
         worker_addresses,
         worker_status_list,
+        host_record,
         host=None,
         port=None,
 ):
@@ -955,5 +981,6 @@ def _start_monitor_server(
         worker_status_list,
         host,
         port,
+        host_record,
     )
     return 'Exit monitor server process gracefully'

pyfemtet/opt/_femopt_core.py

@@ -1,4 +1,5 @@
 # typing
+import json
 from typing import List, TYPE_CHECKING
 
 # built-in
@@ -524,7 +525,6 @@ class History:
         obj_names (List[str], optional): The names of objectives. Defaults to None.
         cns_names (List[str], optional): The names of constraints. Defaults to None.
         client (dask.distributed.Client): Dask client.
-        additional_metadata (str, optional): metadata of optimization process.
         hv_reference (str or list[float or np.ndarray, optional):
             The method to calculate hypervolume or
             the reference point itself.
@@ -550,7 +550,6 @@ class History:
             obj_names=None,
             cns_names=None,
             client=None,
-            additional_metadata=None,
             hv_reference=None,
     ):
         # hypervolume 計算メソッド
@@ -561,7 +560,8 @@ class History:
         self.prm_names = prm_names
         self.obj_names = obj_names
         self.cns_names = cns_names
-        self.additional_metadata = additional_metadata or ''
+        self.extra_data = dict()
+        self.meta_columns = None
         self.__scheduler_address = client.scheduler.address if client is not None else None
 
         # 最適化実行中かどうか
@@ -575,15 +575,15 @@ class History:
 
             # 続きからなら df を読み込んで df にコピー
             if self.is_restart:
-                self.load()
+                self.load()  # 中で meta_columns を読む
 
             # そうでなければ df を初期化
             else:
-                columns, metadata = self.create_df_columns()
+                columns, meta_columns = self.create_df_columns()
                 df = pd.DataFrame()
                 for c in columns:
                     df[c] = None
-                self.metadata = metadata
+                self.meta_columns = meta_columns
                 self.set_df(df)
 
             # 一時ファイルに書き込みを試み、UnicodeEncodeError が出ないかチェック
@@ -609,16 +609,16 @@ class History:
         # df を読み込む
         df = pd.read_csv(self.path, encoding=self.ENCODING, header=self.HEADER_ROW)
 
-        # metadata を読み込む
+        # meta_columns を読み込む
         with open(self.path, mode='r', encoding=self.ENCODING, newline='\n') as f:
             reader = csv.reader(f, delimiter=',')
-            self.metadata = reader.__next__()
+            self.meta_columns = reader.__next__()
 
         # 最適化問題を読み込む
         columns = df.columns
-        prm_names = [column for i, column in enumerate(columns) if self.metadata[i] == 'prm']
-        obj_names = [column for i, column in enumerate(columns) if self.metadata[i] == 'obj']
-        cns_names = [column for i, column in enumerate(columns) if self.metadata[i] == 'cns']
+        prm_names = [column for i, column in enumerate(columns) if self.meta_columns[i] == 'prm']
+        obj_names = [column for i, column in enumerate(columns) if self.meta_columns[i] == 'obj']
+        cns_names = [column for i, column in enumerate(columns) if self.meta_columns[i] == 'cns']
 
         # is_restart の場合、読み込んだ names と引数の names が一致するか確認しておく
         if self.is_restart:
@@ -662,7 +662,7 @@ class History:
                         logger.debug('Access df of History before it is initialized.')
                         return pd.DataFrame()
             except OSError:
-                logger.error('Scheduler is already dead. Most frequent reasen to show this message is that the pyfemtet monitor UI is not refreshed even if the main optimization process is terminated.')
+                logger.error('Scheduler is already dead. Most frequent reason to show this message is that the pyfemtet monitor UI is not refreshed even if the main optimization process is terminated.')
                 return pd.DataFrame()
 
     def set_df(self, df: pd.DataFrame):
@@ -687,46 +687,46 @@ class History:
         columns = list()
 
         # columns のメタデータを作成
-        metadata = list()
+        meta_columns = list()
 
         # trial
         columns.append('trial')  # index
-        metadata.append(self.additional_metadata)
+        meta_columns.append('')  # extra_data. save 時に中身を記入する。
 
         # parameter
         for prm_name in self.prm_names:
             columns.extend([prm_name, prm_name + '_lower_bound', prm_name + '_upper_bound'])
-            metadata.extend(['prm', 'prm_lb', 'prm_ub'])
+            meta_columns.extend(['prm', 'prm_lb', 'prm_ub'])
 
         # objective relative
         for name in self.obj_names:
             columns.append(name)
-            metadata.append('obj')
+            meta_columns.append('obj')
             columns.append(name + '_direction')
-            metadata.append('obj_direction')
+            meta_columns.append('obj_direction')
         columns.append('non_domi')
-        metadata.append('')
+        meta_columns.append('')
 
         # constraint relative
         for name in self.cns_names:
             columns.append(name)
-            metadata.append('cns')
+            meta_columns.append('cns')
             columns.append(name + '_lower_bound')
-            metadata.append('cns_lb')
+            meta_columns.append('cns_lb')
             columns.append(name + '_upper_bound')
-            metadata.append('cns_ub')
+            meta_columns.append('cns_ub')
         columns.append('feasible')
-        metadata.append('')
+        meta_columns.append('')
 
         # the others
         columns.append('hypervolume')
-        metadata.append('')
+        meta_columns.append('')
         columns.append('message')
-        metadata.append('')
+        meta_columns.append('')
         columns.append('time')
-        metadata.append('')
+        meta_columns.append('')
 
-        return columns, metadata
+        return columns, meta_columns
 
     def record(
             self,
@@ -973,13 +973,16 @@ class History:
 
         df = self.get_df()
 
+        # extra_data の更新
+        self.meta_columns[0] = json.dumps(self.extra_data)
+
         if _f is None:
             # save df with columns with prefix
             with open(self.path, 'w', encoding=self.ENCODING) as f:
                 writer = csv.writer(f, delimiter=',', lineterminator="\n")
-                writer.writerow(self.metadata)
+                writer.writerow(self.meta_columns)
                 for i in range(self.HEADER_ROW-1):
-                    writer.writerow([''] * len(self.metadata))
+                    writer.writerow([''] * len(self.meta_columns))
                 df.to_csv(f, index=None, encoding=self.ENCODING, lineterminator='\n')
         else:  # test
             df.to_csv(_f, index=None, encoding=self.ENCODING, lineterminator='\n')
@@ -1088,3 +1091,35 @@ class OptimizationStatus:
     def get_text(self) -> str:
         """Get optimization status message."""
         return self._actor.status
+
+
+class _MonitorHostRecordActor:
+    host = None
+    port = None
+
+    def set(self, host, port):
+        self.host = host
+        self.port = port
+
+
+class MonitorHostRecord:
+
+    def __init__(self, client, worker_name):
+        self._future = client.submit(
+            _MonitorHostRecordActor,
+            actor=True,
+            workers=(worker_name,),
+            allow_other_workers=False,
+        )
+        self._actor = self._future.result()
+
+    def set(self, host, port):
+        self._actor.set(host, port).result()
+
+    def get(self):
+        host = self._actor.host
+        port = self._actor.port
+        if host is None and port is None:
+            return dict()
+        else:
+            return dict(host=host, port=port)

pyfemtet/opt/_test_utils/record_history.py

@@ -10,7 +10,7 @@ from pyfemtet.opt import FEMOpt
 from pyfemtet._message import encoding as ENCODING
 
 
-def remove_femprj_metadata_from_csv(csv_path, encoding=ENCODING):
+def remove_extra_data_from_csv(csv_path, encoding=ENCODING):
 
     with open(csv_path, mode="r", encoding=encoding, newline="\n") as f:
         reader = csv.reader(f, delimiter=",")
@@ -59,32 +59,39 @@ def _get_obj_from_csv(csv_path, encoding=ENCODING):
         reader = csv.reader(f, delimiter=",")
         meta = reader.__next__()
     obj_indices = np.where(np.array(meta) == "obj")[0]
-    out = df.iloc[:, obj_indices]
+    out: pd.DataFrame = df.iloc[:, obj_indices]
+    out = out.dropna(axis=0)
     return out, columns
 
 
-def is_equal_result(ref_path, dif_path, log_path):
+def is_equal_result(ref_path, dif_path, log_path=None, threashold=0.05):
     """Check the equality of two result csv files."""
     ref_df, ref_columns = _get_obj_from_csv(ref_path)
     dif_df, dif_columns = _get_obj_from_csv(dif_path)
 
-    with open(log_path, "a", newline="\n", encoding=ENCODING) as f:
-        f.write("\n\n===== 結果の分析 =====\n\n")
-        f.write(f"        \tref\tdif\n")
-        f.write(f"---------------------\n")
-        f.write(f"len(col)\t{len(ref_columns)}\t{len(dif_columns)}\n")
-        f.write(f"len(df) \t{len(ref_df)}\t{len(dif_df)}\n")
-        try:
-            difference = (
+    if log_path is not None:
+        with open(log_path, "a", newline="\n", encoding=ENCODING) as f:
+            f.write("\n\n===== 結果の分析 =====\n\n")
+            f.write(f"        \tref\tdif\n")
+            f.write(f"---------------------\n")
+            f.write(f"len(col)\t{len(ref_columns)}\t{len(dif_columns)}\n")
+            f.write(f"len(df) \t{len(ref_df)}\t{len(dif_df)}\n")
+            try:
+                difference = (
+                    np.abs(ref_df.values - dif_df.values) / np.abs(dif_df.values)
+                ).mean()
+                f.write(f"diff    \t{int(difference*100)}%\n")
+            except Exception:
+                f.write(f"diff    \tcannot calc\n")
+
+    else:
+        difference = (
                 np.abs(ref_df.values - dif_df.values) / np.abs(dif_df.values)
-            ).mean()
-            f.write(f"diff    \t{int(difference*100)}%\n")
-        except Exception:
-            f.write(f"diff    \tcannot calc\n")
+        ).mean()
 
     assert len(ref_columns) == len(dif_columns), "結果 csv の column 数が異なります。"
     assert len(ref_df) == len(dif_df), "結果 csv の row 数が異なります。"
-    assert difference <= 0.05, "前回の結果との平均差異が 5% を超えています。"
+    assert difference <= threashold*100, f"前回の結果との平均差異が {int(difference)}% で {int(threashold*100)}% を超えています。"
 
 
 def _get_simplified_df_values(csv_path, exclude_columns=None):

pyfemtet/opt/interface/__init__.py

@@ -21,7 +21,9 @@ else:
     FemtetWithNXInterface = type('FemtetWithNXInterface', (FemtetInterface,), {})
     ExcelInterface = type('FemtetInterface', (NotAvailableForWindows,), {})
 
-from pyfemtet.opt.interface._surrogate import PoFBoTorchInterface
+from pyfemtet.opt.interface._surrogate._base import SurrogateModelInterfaceBase
+from pyfemtet.opt.interface._surrogate._singletaskgp import PoFBoTorchInterface
+
 
 __all__ =[
     'FEMInterface',
@@ -30,5 +32,6 @@ __all__ =[
     'FemtetWithSolidworksInterface',
     'FemtetWithNXInterface',
     'ExcelInterface',
+    'SurrogateModelInterfaceBase',
     'PoFBoTorchInterface',
 ]

pyfemtet/opt/interface/_surrogate/_base.py

@@ -17,6 +17,7 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
             self,
             history_path: str = None,
             history: History = None,
+            override_objective: bool = True,
     ):
 
         self.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.override_objective: bool = override_objective
 
         # history_path が与えられた場合、history をコンストラクトする
         if history_path is not None:
@@ -57,27 +59,25 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
         FEMInterface.__init__(
             self,
             history=history,  # コンストラクト済み history を渡せば並列計算時も何もしなくてよい
+            override_objective=self.override_objective
         )
 
     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:
             # calculated or not
-            y = np.zeros_like(y)
-            y[feasible_idx] = 1.
-            # satisfy weak feasibility or not
-            infeasible_idx = np.where(~self.history.get_df()['feasible'].values)
-            y[infeasible_idx] = .0
-            return x, y.reshape((-1, 1))
+            feas = np.zeros((len(y), 1), dtype=float)
+            feas[feasible_idx] = 1.
+            return x, feas
         else:
             return x[feasible_idx], y[feasible_idx]
 
     def _setup_after_parallel(self, *args, **kwargs):
-
-        opt: AbstractOptimizer = kwargs['opt']
-        obj: Objective
-        for obj_name, obj in opt.objectives.items():
-            obj.fun = lambda: self.obj[obj_name]
+        if self.override_objective:
+            opt: AbstractOptimizer = kwargs['opt']
+            obj: Objective
+            for obj_name, obj in opt.objectives.items():
+                obj.fun = lambda obj_name_=obj_name: self.obj[obj_name_]
 
     def update_parameter(self, parameters: pd.DataFrame, with_warning=False) -> Optional[List[str]]:
         for i, row in parameters.iterrows():

pyfemtet/opt/interface/_surrogate/_singletaskgp.py

@@ -27,8 +27,8 @@ class PoFBoTorchInterface(SurrogateModelInterfaceBase):
     def train_f(self):
         # df そのまま用いて training する
         x, y = self.filter_feasible(self.df_prm.values, self.df_obj.values, return_feasibility=True)
-        if y.min() == 1:
-            self.model_f.predict = lambda *args, **kwargs: (1., 0.001)
+        if y.min() == 1:  # feasible values only
+            self.model_f.predict = lambda *args, **kwargs: (1., 0.001)  # mean, std
         self.model_f.fit(x, y)
 
     def _setup_after_parallel(self, *args, **kwargs):
@@ -64,7 +64,8 @@ class PoFBoTorchInterface(SurrogateModelInterfaceBase):
             raise SolveError(Msg.INFO_POF_IS_LESS_THAN_THRESHOLD)
 
         # 実際の計算(mean は history.obj_names 順)
-        mean, _ = self.model.predict(np.array([x]))
+        _mean, _std = self.model.predict(np.array([x]))
+        mean = _mean[0]
 
         # 目的関数の更新
         self.obj = {obj_name: value for obj_name, value in zip(self.history.obj_names, mean)}

pyfemtet/opt/prediction/single_task_gp.py

@@ -42,16 +42,16 @@ class SingleTaskGPModel(PredictionModelBase):
     def set_bounds_from_history(self, history, df=None):
         from pyfemtet.opt._femopt_core import History
         history: History
-        metadata: str
+        meta_column: str
 
         if df is None:
             df = history.get_df()
 
         columns = df.columns
-        metadata_columns = history.metadata
+
         target_columns = [
-            col for col, metadata in zip(columns, metadata_columns)
-            if metadata == 'prm_lb' or metadata == 'prm_ub'
+            col for col, meta_column in zip(columns, history.meta_columns)
+            if meta_column == 'prm_lb' or meta_column == 'prm_ub'
         ]
 
         bounds_buff = df.iloc[0][target_columns].values  # 2*len(prm_names) array
@@ -85,6 +85,8 @@ class SingleTaskGPModel(PredictionModelBase):
         fit_gpytorch_mll(mll)
 
     def predict(self, x: np.ndarray) -> tuple[np.ndarray, np.ndarray]:
+        assert len(x.shape) >= 2
+
         X = tensor(x)
 
         post = self.gp.posterior(X)

pyfemtet/opt/visualization/_base.py

@@ -2,6 +2,7 @@
 from dash.development.base_component import Component
 
 # application
+from flask import Flask
 from dash import Dash
 import webbrowser
 
@@ -20,6 +21,7 @@ from pyfemtet.opt.visualization._wrapped_components import html, dcc, dbc
 from abc import ABC, abstractmethod
 import logging
 import psutil
+import json
 from pyfemtet.logger import get_module_logger, get_dash_logger
 
 logger = get_module_logger('opt.monitor', __name__)
@@ -132,15 +134,19 @@ class SidebarApplicationBase:
         # define app
         self.title = title if title is not None else 'App'
         self.subtitle = subtitle if title is not None else ''
+        self.server = Flask(__name__)
         self.app = Dash(
             __name__,
             external_stylesheets=[dash_bootstrap_components.themes.BOOTSTRAP],
             title=title,
             update_title=None,
+            server=self.server,
         )
         self.pages = dict()
         self.nav_links = dict()
         self.page_objects = []
+        self.host = None
+        self.port = None
 
     def add_page(self, page: AbstractPage, order: int = None):
         page.set_application(self)
@@ -191,7 +197,7 @@ class SidebarApplicationBase:
                     className="p-3 bg-light rounded-3",
                 )
 
-    def run(self, host='localhost', port=None, debug=False):
+    def run(self, host='localhost', port=None, debug=False, host_record=None):
         self._setup_layout()
         port = port or self.DEFAULT_PORT
         # port を検証
@@ -201,6 +207,11 @@ class SidebarApplicationBase:
             webbrowser.open(f'http://localhost:{str(port)}')
         else:
             webbrowser.open(f'http://{host}:{str(port)}')
+        self.host = host
+        self.port = port
+        if host_record is not None:
+            host_record.set(self.host, self.port)
+
         self.app.run(debug=debug, host=host, port=port)
 
 

pyfemtet/opt/visualization/_complex_components/control_femtet.py

@@ -138,18 +138,18 @@ class FemtetControl(AbstractPage):
 
         # check holding history
         if self.application.history is None:
-            return kwargs, Msg.ERR_HISTORY_CSV_NOT_READ
+            return kwargs, Msg.WARN_HISTORY_CSV_NOT_READ
 
-        # get metadata
-        additional_metadata = self.application.history.metadata[0]
+        # get extra_data
+        extra_data = self.application.history.meta_columns[0]
 
-        # check metadata exists
-        if additional_metadata == '':
+        # check extra_data exists
+        if extra_data == '':
             return kwargs, Msg.WARN_INVALID_METADATA
 
-        # check the metadata is valid json
+        # check the extra_data is valid json
         try:
-            d = json.loads(additional_metadata)
+            d = json.loads(extra_data)
             femprj_path = os.path.abspath(d['femprj_path'])
         except (TypeError, json.decoder.JSONDecodeError, KeyError):
             return kwargs, Msg.WARN_INVALID_METADATA

pyfemtet/opt/visualization/_complex_components/main_graph.py

@@ -447,17 +447,50 @@ class MainGraph(AbstractPage):
             Output(self.tooltip.id, "show"),
             Output(self.tooltip.id, "bbox"),
             Output(self.tooltip.id, "children"),
-            Input(self.graph.id, "hoverData"),)
-        def show_hover(hoverData):
+            Output(self.tooltip.id, "direction"),
+            Input(self.graph.id, "hoverData"),
+            State(self.graph.id, "figure"),
+        )
+        def show_hover(hoverData, figure):
             if hoverData is None:
-                return False, no_update, no_update
+                return False, no_update, no_update, no_update
 
             if self.application.history is None:
                 raise PreventUpdate
 
-            # get hover location
+            # pt = {'curveNumber': 1, 'pointNumber': 0, 'pointIndex': 0, 'x': 1, 'y': 2369132.929996869, 'bbox': {'x0': 341.5, 'x1': 350.5, 'y0': 235, 'y1': 244}, 'customdata': [1]}
+            # bbox = {'x0': 341.5, 'x1': 350.5, 'y0': 235, 'y1': 244}  # point の大きさ？
+            # figure = {'data': [{'customdata': [[1], [2], [3], [4], [5]], 'marker': {'color': '#6c757d', 'size': 6}, 'mode': 'markers', 'name': 'すべての解', 'x': [1, 2, 3, 4, 5], 'y': [2369132.929996866, 5797829.746579617, 1977631.590419346, 2083867.2403273676, 1539203.6452652698], 'type': 'scatter', 'hoverinfo': 'none'}, {'customdata': [[1], [3], [5]], 'legendgroup': 'optimal', 'line': {'color': '#6c757d', 'width': 1}, 'marker': {'color': '#007bff', 'size': 9}, 'mode': 'markers+lines', 'name': '最適解の推移', 'x': [1, 3, 5], 'y': [2369132.929996866, 1977631.590419346, 1539203.6452652698], 'type': 'scatter', 'hoverinfo': 'none'}, {'legendgroup': 'optimal', 'line': {'color': '#6c757d', 'dash': 'dash', 'width': 0.5}, 'mode': 'lines', 'showlegend': False, 'x': [5, 5], 'y': [1539203.6452652698, 1539203.6452652698], 'type': 'scatter', 'hoverinfo': 'none'}], 'layout': {'template': {'data': {'histogram2dcontour': [{'type': 'histogram2dcontour', 'colorbar': {'outlinewidth': 0, 'ticks': ''}, 'colorscale': [[0, '#0d0887'], [0.1111111111111111, '#46039f'], [0.2222222222222222, '#7201a8'], [0.3333333333333333, '#9c179e'], [0.4444444444444444, '#bd3786'], [0.5555555555555556, '#d8576b'], [0.6666666666666666, '#ed7953'], [0.7777777777777778, '#fb9f3a'], [0.8888888888888888, '#fdca26'], [1, '#f0f921']]}], 'choropleth': [{'type': 'choropleth', 'colorbar': {'outlinewidth': 0, 'ticks': ''}}], 'histogram2d': [{'type': 'histogram2d', 'colorbar': {'outlinewidth': 0, 'ticks': ''}, 'colorscale': [[0, '#0d0887'], [0.1111111111111111, '#46039f'], [0.2222222222222222, '#7201a8'], [0.3333333333333333, '#9c179e'], [0.4444444444444444, '#bd3786'], [0.5555555555555556, '#d8576b'], [0.6666666666666666, '#ed7953'], [0.7777777777777778, '#fb9f3a'], [0.8888888888888888, '#fdca26'], [1, '#f0f921']]}], 'heatmap': [{'type': 'heatmap', 'colorbar': {'outlinewidth': 0, 'ticks': ''}, 'colorscale': [[0, '#0d0887'], [0.1111111111111111, '#46039f'], [0.2222222222222222, '#7201a8'], [0.3333333333333333, '#9c179e'], [0.4444444444444444, '#bd3786'], [0.5555555555555556, '#d8576b'], [0.6666666666666666, '#ed7953'], [0.7777777777777778, '#fb9f3a'], [0.8888888888888888, '#fdca26'], [1, '#f0f921']]}], 'heatmapgl': [{'type': 'heatmapgl', 'colorbar': {'outlinewidth': 0, 'ticks': ''}, 'colorscale': [[0, '#0d0887'], [0.1111111111111111, '#46039f'], [0.2222222222222222, '#7201a8'], [0.3333333333333333, '#9c179e'], [0.4444444444444444, '#bd3786'], [0.5555555555555556, '#d8576b'], [0.6666666666666666, '#ed7953'], [0.7777777777777778, '#fb9f3a'], [0.8888888888888888, '#fdca26'], [1, '#f0f921']]}], 'contourcarpet': [{'type': 'contourcarpet', 'colorbar': {'outlinewidth': 0, 'ticks': ''}}], 'contour': [{'type': 'contour', 'colorbar': {'outlinewidth': 0, 'ticks': ''}, 'colorscale': [[0, '#0d0887'], [0.1111111111111111, '#46039f'], [0.2222222222222222, '#7201a8'], [0.3333333333333333, '#9c179e'], [0.4444444444444444, '#bd3786'], [0.5555555555555556, '#d8576b'], [0.6666666666666666, '#ed7953'], [0.7777777777777778, '#fb9f3a'], [0.8888888888888888, '#fdca26'], [1, '#f0f921']]}], 'surface': [{'type': 'surface', 'colorbar': {'outlinewidth': 0, 'ticks': ''}, 'colorscale': [[0, '#0d0887'], [0.1111111111111111, '#46039f'], [0.2222222222222222, '#7201a8'], [0.3333333333333333, '#9c179e'], [0.4444444444444444, '#bd3786'], [0.5555555555555556, '#d8576b'], [0.6666666666666666, '#ed7953'], [0.7777777777777778, '#fb9f3a'], [0.8888888888888888, '#fdca26'], [1, '#f0f921']]}], 'mesh3d': [{'type': 'mesh3d', 'colorbar': {'outlinewidth': 0, 'ticks': ''}}], 'scatter': [{'fillpattern': {'fillmode': 'overlay', 'size': 10, 'solidity': 0.2}, 'type': 'scatter'}], 'parcoords': [{'type': 'parcoords', 'line': {'colorbar': {'outlinewidth': 0, 'ticks': ''}}}], 'scatterpolargl': [{'type': 'scatterpolargl', 'marker': {'colorbar': {'outlinewidth': 0, 'ticks': ''}}}], 'bar': [{'error_x': {'color': '#2a3f5f'}, 'error_y': {'color': '#2a3f5f'}, 'marker': {'line': {'color': '#E5ECF6', 'width': 0.5}, 'pattern': {'fillmode': 'overlay', 'size': 10, 'solidity': 0.2}}, 'type': 'bar'}], 'scattergeo': [{'type': 'scattergeo', 'marker': {'colorbar': {'outlinewidth': 0, 'ticks': ''}}}], 'scatterpolar': [{'type': 'scatterpolar', 'marker': {'colorbar': {'outlinewidth': 0, 'ticks': ''}}}], 'histogram': [{'marker': {'pattern': {'fillmode': 'overlay', 'size': 10, 'solidity': 0.2}}, 'type': 'histogram'}], 'scattergl': [{'type': 'scattergl', 'marker': {'colorbar': {'outlinewidth': 0, 'ticks': ''}}}], 'scatter3d': [{'type': 'scatter3d', 'line': {'colorbar': {'outlinewidth': 0, 'ticks': ''}}, 'marker': {'colorbar': {'outlinewidth': 0, 'ticks': ''}}}], 'scattermapbox': [{'type': 'scattermapbox', 'marker': {'colorbar': {'outlinewidth': 0, 'ticks': ''}}}], 'scatterternary': [{'type': 'scatterternary', 'marker': {'colorbar': {'outlinewidth': 0, 'ticks': ''}}}], 'scattercarpet': [{'type': 'scattercarpet', 'marker': {'colorbar': {'outlinewidth': 0, 'ticks': ''}}}], 'carpet': [{'aaxis': {'endlinecolor': '#2a3f5f', 'gridcolor': 'white', 'linecolor': 'white', 'minorgridcolor': 'white', 'startlinecolor': '#2a3f5f'}, 'baxis': {'endlinecolor': '#2a3f5f', 'gridcolor': 'white', 'linecolor': 'white', 'minorgridcolor': 'white', 'startlinecolor': '#2a3f5f'}, 'type': 'carpet'}], 'table': [{'cells': {'fill': {'color': '#EBF0F8'}, 'line': {'color': 'white'}}, 'header': {'fill': {'color': '#C8D4E3'}, 'line': {'color': 'white'}}, 'type': 'table'}], 'barpolar': [{'marker': {'line': {'color': '#E5ECF6', 'width': 0.5}, 'pattern': {'fillmode': 'overlay', 'size': 10, 'solidity': 0.2}}, 'type': 'barpolar'}], 'pie': [{'automargin': True, 'type': 'pie'}]}, 'layout': {'autotypenumbers': 'strict', 'colorway': ['#636efa', '#EF553B', '#00cc96', '#ab63fa', '#FFA15A', '#19d3f3', '#FF6692', '#B6E880', '#FF97FF', '#FECB52'], 'font': {'color': '#2a3f5f'}, 'hovermode': 'closest', 'hoverlabel': {'align': 'left'}, 'paper_bgcolor': 'white', 'plot_bgcolor': '#E5ECF6', 'polar': {'bgcolor': '#E5ECF6', 'angularaxis': {'gridcolor': 'white', 'linecolor': 'white', 'ticks': ''}, 'radialaxis': {'gridcolor': 'white', 'linecolor': 'white', 'ticks': ''}}, 'ternary': {'bgcolor': '#E5ECF6', 'aaxis': {'gridcolor': 'white', 'linecolor': 'white', 'ticks': ''}, 'baxis': {'gridcolor': 'white', 'linecolor': 'white', 'ticks': ''}, 'caxis': {'gridcolor': 'white', 'linecolor': 'white', 'ticks': ''}}, 'coloraxis': {'colorbar': {'outlinewidth': 0, 'ticks': ''}}, 'colorscale': {'sequential': [[0, '#0d0887'], [0.1111111111111111, '#46039f'], [0.2222222222222222, '#7201a8'], [0.3333333333333333, '#9c179e'], [0.4444444444444444, '#bd3786'], [0.5555555555555556, '#d8576b'], [0.6666666666666666, '#ed7953'], [0.7777777777777778, '#fb9f3a'], [0.8888888888888888, '#fdca26'], [1, '#f0f921']], 'sequentialminus': [[0, '#0d0887'], [0.1111111111111111, '#46039f'], [0.2222222222222222, '#7201a8'], [0.3333333333333333, '#9c179e'], [0.4444444444444444, '#bd3786'], [0.5555555555555556, '#d8576b'], [0.6666666666666666, '#ed7953'], [0.7777777777777778, '#fb9f3a'], [0.8888888888888888, '#fdca26'], [1, '#f0f921']], 'diverging': [[0, '#8e0152'], [0.1, '#c51b7d'], [0.2, '#de77ae'], [0.3, '#f1b6da'], [0.4, '#fde0ef'], [0.5, '#f7f7f7'], [0.6, '#e6f5d0'], [0.7, '#b8e186'], [0.8, '#7fbc41'], [0.9, '#4d9221'], [1, '#276419']]}, 'xaxis': {'gridcolor': 'white', 'linecolor': 'white', 'ticks': '', 'title': {'standoff': 15}, 'zerolinecolor': 'white', 'automargin': True, 'zerolinewidth': 2}, 'yaxis': {'gridcolor': 'white', 'linecolor': 'white', 'ticks': '', 'title': {'standoff': 15}, 'zerolinecolor': 'white', 'automargin': True, 'zerolinewidth': 2}, 'scene': {'xaxis': {'backgroundcolor': '#E5ECF6', 'gridcolor': 'white', 'linecolor': 'white', 'showbackground': True, 'ticks': '', 'zerolinecolor': 'white', 'gridwidth': 2}, 'yaxis': {'backgroundcolor': '#E5ECF6', 'gridcolor': 'white', 'linecolor': 'white', 'showbackground': True, 'ticks': '', 'zerolinecolor': 'white', 'gridwidth': 2}, 'zaxis': {'backgroundcolor': '#E5ECF6', 'gridcolor': 'white', 'linecolor': 'white', 'showbackground': True, 'ticks': '', 'zerolinecolor': 'white', 'gridwidth': 2}}, 'shapedefaults': {'line': {'color': '#2a3f5f'}}, 'annotationdefaults': {'arrowcolor': '#2a3f5f', 'arrowhead': 0, 'arrowwidth': 1}, 'geo': {'bgcolor': 'white', 'landcolor': '#E5ECF6', 'subunitcolor': 'white', 'showland': True, 'showlakes': True, 'lakecolor': 'white'}, 'title': {'x': 0.05}, 'mapbox': {'style': 'light'}}}, 'title': {'text': '目的関数プロット'}, 'xaxis': {'title': {'text': '成功した解析数'}, 'type': 'linear', 'range': [0.7173255954539959, 5.282674404546004], 'autorange': False}, 'yaxis': {'title': {'text': 'Mises Stress'}, 'type': 'linear', 'range': [1194338.1744483153, 6109662.126322151], 'autorange': False}, 'transition': {'duration': 1000}, 'clickmode': 'event+select'}}
+
+            # get point location
             pt = hoverData["points"][0]
-            bbox = pt["bbox"]
+
+            # get the bounding box of target
+            bbox = pt['bbox']
+
+            # get relative location of point
+            xrange = figure['layout']['xaxis']['range']
+            # yrange = figure['layout']['yaxis']['range']
+
+            is_left = pt['x'] < np.mean(xrange)
+
+            # デフォルトでは Hover が Point に重なり、
+            # Hover した瞬間に Un-hover する場合があるので
+            # offset を追加
+            if is_left:
+                direction = 'right'
+                bbox['x0'] = bbox['x0'] + 40
+                bbox['x1'] = bbox['x1'] + 40
+
+            else:
+                direction = 'left'
+                bbox['x0'] = bbox['x0'] + 15
+                bbox['x1'] = bbox['x1'] + 15
+
+            # ついでに縦方向も適当に調整
+            bbox['y0'] = bbox['y0'] + 80
+            bbox['y1'] = bbox['y1'] + 80
+
 
             # get row of the history from customdata defined in main_figure
             if 'customdata' not in pt.keys():
@@ -482,18 +515,20 @@ class MainGraph(AbstractPage):
                 title_component,
                 tbl_component_prm,
             ])
-            tooltip_layout = html.Div([
-                html.Div(img_component, style={'display': 'inline-block', 'margin-right': '10px', 'vertical-align': 'top'}),
-                html.Div(description, style={'display': 'inline-block', 'margin-right': '10px'}),
-                html.Div(tbl_component_obj, style={'display': 'inline-block', 'margin-right': '10px'}),
-            ])
+            tooltip_layout = html.Div(
+                children=[
+                    html.Div(img_component, style={'display': 'inline-block', 'margin-right': '10px'}),
+                    html.Div(description, style={'display': 'inline-block', 'margin-right': '10px'}),
+                    html.Div(tbl_component_obj, style={'display': 'inline-block', 'margin-right': '10px'}),
+                ],
+            )
 
-            return True, bbox, tooltip_layout
+            return True, bbox, tooltip_layout, direction
 
     def create_formatted_parameter(self, row) -> Component:
-        metadata = self.application.history.metadata
+        meta_columns = self.application.history.meta_columns
         pd.options.display.float_format = '{:.4e}'.format
-        parameters = row.iloc[:, np.where(np.array(metadata) == 'prm')[0]]
+        parameters = row.iloc[:, np.where(np.array(meta_columns) == 'prm')[0]]
         names = parameters.columns
         values = [f'{value:.3e}' for value in parameters.values.ravel()]
         data = pd.DataFrame(dict(
@@ -506,9 +541,9 @@ class MainGraph(AbstractPage):
         return table
 
     def create_formatted_objective(self, row) -> Component:
-        metadata = self.application.history.metadata
+        meta_columns = self.application.history.meta_columns
         pd.options.display.float_format = '{:.4e}'.format
-        objectives = row.iloc[:, np.where(np.array(metadata) == 'obj')[0]]
+        objectives = row.iloc[:, np.where(np.array(meta_columns) == 'obj')[0]]
         names = objectives.columns
         values = [f'{value:.3e}' for value in objectives.values.ravel()]
         data = pd.DataFrame(dict(
@@ -522,20 +557,21 @@ class MainGraph(AbstractPage):
 
     def create_image_content_if_femtet(self, trial) -> Component:
         img_url = None
-        metadata = self.application.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
+        meta_columns = self.application.history.meta_columns
+        if meta_columns[0] != '':
+            extra_data = json.loads(meta_columns[0])
+            if 'femprj_path' in extra_data.keys():
+                # get img path
+                femprj_path = extra_data['femprj_path']
+                model_name = extra_data['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
         return html.Img(src=img_url, style={"width": "200px"}) if img_url is not None else html.Div()
 
     def get_fig_by_tab_id(self, tab_id, with_length=False, kwargs: dict = None):

pyfemtet/opt/visualization/_complex_components/pm_graph.py

@@ -547,9 +547,9 @@ class PredictionModelGraph(AbstractPage):
             return tuple(ret.values())
 
     def create_formatted_parameter(self, row) -> Component:
-        metadata = self.application.history.metadata
+        meta_columns = self.application.history.meta_columns
         pd.options.display.float_format = '{:.4e}'.format
-        parameters = row.iloc[:, np.where(np.array(metadata) == 'prm')[0]]
+        parameters = row.iloc[:, np.where(np.array(meta_columns) == 'prm')[0]]
         names = parameters.columns
         values = [f'{value:.3e}' for value in parameters.values.ravel()]
         data = pd.DataFrame(dict(
@@ -563,20 +563,21 @@ class PredictionModelGraph(AbstractPage):
 
     def create_image_content_if_femtet(self, trial) -> Component:
         img_url = None
-        metadata = self.application.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
+        meta_columns = self.application.history.meta_columns
+        if meta_columns[0] != '':
+            extra_data = json.loads(meta_columns[0])
+            if 'femprj_path' in extra_data:
+                # get img path
+                femprj_path = extra_data['femprj_path']
+                model_name = extra_data['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
         return html.Img(src=img_url, style={"width": "200px"}) if img_url is not None else html.Div()
 
     # def get_fig_by_tab_id(self, tab_id, with_length=False):

pyfemtet/opt/visualization/_process_monitor/application.py

@@ -3,6 +3,7 @@ from time import sleep
 from threading import Thread
 
 import pandas as pd
+from flask import jsonify
 
 from pyfemtet.opt.visualization._base import PyFemtetApplicationBase, logger
 from pyfemtet.opt.visualization._process_monitor.pages import HomePage, WorkerPage, PredictionModelPage, OptunaVisualizerPage
@@ -80,7 +81,22 @@ class ProcessMonitorApplication(PyFemtetApplicationBase):
         if not debug:
             super().setup_callback()
 
-    def start_server(self, host=None, port=None):
+        from pyfemtet.opt._femopt_core import OptimizationStatus
+
+        @self.server.route('/interrupt')
+        def some_command():
+
+            # If the entire_state < INTERRUPTING, set INTERRUPTING
+            if self.local_entire_status_int < OptimizationStatus.INTERRUPTING:
+                self.local_entire_status_int = OptimizationStatus.INTERRUPTING
+                result = {"message": "Interrupting signal emitted successfully."}
+
+            else:
+                result = {"message": "Interrupting signal is already emitted."}
+
+            return jsonify(result)
+
+    def start_server(self, host=None, port=None, host_record=None):
         """Callback の中で使いたい Actor のデータを Application クラスのメンバーとやり取りしつつ、server を落とす関数"""
 
         self._should_get_actor_data = True
@@ -95,6 +111,7 @@ class ProcessMonitorApplication(PyFemtetApplicationBase):
         server_thread = Thread(
             target=self.run,
             args=(host, port,),
+            kwargs=dict(host_record=host_record),
             daemon=True,
         )
         server_thread.start()
@@ -188,7 +205,7 @@ def g_debug():
     g_application.run(debug=False)
 
 
-def main(history, status, worker_addresses, worker_status_list, host=None, port=None):
+def main(history, status, worker_addresses, worker_status_list, host=None, port=None, host_record=None):
     g_application = ProcessMonitorApplication(history, status, worker_addresses, worker_status_list)
 
     g_home_page = HomePage(Msg.PAGE_TITLE_PROGRESS)
@@ -202,7 +219,7 @@ def main(history, status, worker_addresses, worker_status_list, host=None, port=
     g_application.add_page(g_worker_page, 3)
     g_application.setup_callback()
 
-    g_application.start_server(host, port)
+    g_application.start_server(host, port, host_record)
 
 
 if __name__ == '__main__':

pyfemtet/opt/visualization/_process_monitor/pages.py

@@ -209,11 +209,11 @@ class HomePage(AbstractPage):
                           Input('debug-button-2', 'n_clicks'),
                           prevent_initial_call=True)
             def add_data(*_):
-                metadata = self.application.history.metadata
+                meta_columns = self.application.history.meta_columns
                 df = self.application.local_data
 
                 new_row = df.iloc[-2:]
-                obj_index = np.where(np.array(metadata) == 'obj')[0]
+                obj_index = np.where(np.array(meta_columns) == 'obj')[0]
                 for idx in obj_index:
                     new_row.iloc[:, idx] = np.random.rand(len(new_row))
 

pyfemtet/opt/visualization/result_viewer/pages.py

@@ -183,11 +183,11 @@ class HomePage(AbstractPage):
                 return alerts
 
             # get femprj in history csv
-            kwargs = self.femtet_control.create_femtet_interface_args()[0]  # read metadata from history.
+            kwargs = self.femtet_control.create_femtet_interface_args()[0]  # read extra_data from history.
             femprj_path = kwargs['femprj_path']
             model_name = kwargs['model_name']
 
-            # check metadata is valid
+            # check extra_data is valid
             if femprj_path is None:
                 msg = Msg.ERR_FEMPRJ_IN_CSV_NOT_FOUND
                 alerts = self.alert_region.create_alerts(msg, color='danger')
@@ -283,8 +283,8 @@ class HomePage(AbstractPage):
                 # get parameter and update model
                 df = self.application.history.get_df(valid_only=True)
                 row = df[df['trial'] == trial]
-                metadata = np.array(self.application.history.metadata)
-                idx = np.where(metadata == 'prm')[0]
+                meta_columns = np.array(self.application.history.meta_columns)
+                idx = np.where(meta_columns == 'prm')[0]
 
                 names = np.array(row.columns)[idx]
                 values = np.array(row.iloc[:, idx]).ravel()
@@ -346,7 +346,7 @@ class HomePage(AbstractPage):
 
             # check the corresponding between history and Femtet
             # ├ history-side
-            kwargs = self.femtet_control.create_femtet_interface_args()[0]  # read metadata from history.
+            kwargs = self.femtet_control.create_femtet_interface_args()[0]  # read extra_data from history.
             femprj_path_history_on_history: str or None = kwargs['femprj_path']
             model_name_on_history: str or None = kwargs['model_name']
             # ├ Femtet-side
@@ -673,7 +673,7 @@ class Tutorial(AbstractPage):
             destination_folder = source_folder.replace('wat_ex14_parametric', 'tutorial')
             shutil.copytree(source_folder, destination_folder, dirs_exist_ok=True)
 
-            self.application.history.metadata[0] = json.dumps(
+            self.application.history.meta_columns[0] = json.dumps(
                 dict(
                     femprj_path=destination_file,
                     model_name='Ex14',

{pyfemtet-0.8.4.dist-info → pyfemtet-0.8.6.dist-info}/METADATA

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

{pyfemtet-0.8.4.dist-info → pyfemtet-0.8.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyfemtet/__init__.py,sha256=oR63M0ef9dMrWZnMjTb9xk69cW2iS6rluqpyJ5_0C84,21
+pyfemtet/__init__.py,sha256=B72_7DUBCOMnhKCvBwcwiuuCre398QDqqytHa0lXG-Q,21
 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
@@ -24,12 +24,12 @@ 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=vqLUGMMHn0lp0bRE_FEV0sOoUcVAbohy9_8OLYw3ZrU,39217
-pyfemtet/opt/_femopt_core.py,sha256=mA2wQ5h_mmbTQ9ilhDHLUyN-jsWFDpJE2r5guUWlS10,38083
+pyfemtet/opt/_femopt.py,sha256=ZhwOK1QYwo7Xk67qEOm4biKXzdIW2AUHYvgklBREDm8,40587
+pyfemtet/opt/_femopt_core.py,sha256=kxKh4_TdXR4LBgv8WibPiZ5Pe9apJd5ArBCfnhBwcCQ,38969
 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=JCNJLZMCNTpJ6VT7iwEt2DIbwmsuQmgC0ClQSfcatj4,3915
+pyfemtet/opt/_test_utils/record_history.py,sha256=zsa1w73K7NLBqbj7yuv0fWVJvZtWdiI0eCaUoAn5Bjg,4239
 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/pyfemtet-core.py,sha256=aF2TWXdbt7dnkeBqqVO6GvIExozjFp0mxx3BX8rpYNc,9879
@@ -39,7 +39,7 @@ 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=dkQ8PoIzYJVRtckNN2VgL7FEwci9RbYM3owOvqnPm80,1219
+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=teALmp66aJ_rrmtEOjCGDG1jGLTZr2AmvMFmuuXRQkw,34634
@@ -49,9 +49,9 @@ pyfemtet/opt/interface/_femtet_with_nx/_interface.py,sha256=LkaODUSpBLq05uz5Jf-J
 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=-k02jRywxaSKMDzGitPE_qBj5nUxC7OL6guF4y6F1Zw,2923
+pyfemtet/opt/interface/_surrogate/_base.py,sha256=bQMoztVq1b-3BW5Z1V-dSROplMHutrblDI289j0cC-E,3001
 pyfemtet/opt/interface/_surrogate/_chaospy.py,sha256=gL72bCgs1AY_EZdJtcifSC-apwsZzp4zsWYxcpVKvtw,1969
-pyfemtet/opt/interface/_surrogate/_singletaskgp.py,sha256=YBRm-8MRwK26qg6T5LKaAhwPfF3jLcKQV-fycP6dnlA,2406
+pyfemtet/opt/interface/_surrogate/_singletaskgp.py,sha256=ojZHsxGxSc8ZJqJQ_uMHvpK98TPUsHzXP0q4tmM0YPQ,2471
 pyfemtet/opt/optimizer/__init__.py,sha256=Ia6viowECkG0IFXtFef0tJ4jDKsoDzJLqMJ9xLFH2LQ,543
 pyfemtet/opt/optimizer/_base.py,sha256=j8aQc3fGehZTJT9ETf9cr3VWYs2FYk1F8fO3f7QyKAU,13099
 pyfemtet/opt/optimizer/_optuna/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -64,7 +64,7 @@ pyfemtet/opt/optimizer/_scipy_scalar.py,sha256=rGvrLjrgfYzxK9GA0-r2Hhoaqt6A0TQsT
 pyfemtet/opt/optimizer/parameter.py,sha256=YLE9lmYRaZA8isnTPJnbYXpUn6zsJFW4xg03QaSWey8,3950
 pyfemtet/opt/prediction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/prediction/_base.py,sha256=dEyEur3IntNokYK8NhPndHb2pWY_A4C1SjEejOTCUGw,2048
-pyfemtet/opt/prediction/single_task_gp.py,sha256=6NMSjTtzXJWaW7NEqfqOjz_37mbHpXh9Oo5_KjivRU0,3922
+pyfemtet/opt/prediction/single_task_gp.py,sha256=t4Vby0Llh7ZcVQ6M5zYqwmmo-NwSXwWRExLtqzmPcu8,3929
 pyfemtet/opt/samples/femprj_sample/ParametricIF.femprj,sha256=9BtDHmc3cdom0Zq33DTdZ0mDAsIUY6i8SRkkg-n7GO0,442090
 pyfemtet/opt/samples/femprj_sample/ParametricIF.py,sha256=oXzchBZEbH69xacDht5HDnbZzKwapXsn6bp9qihY17Y,707
 pyfemtet/opt/samples/femprj_sample/ParametricIF_test_result.reccsv,sha256=TiOAqEDMub6SCGYClBv1JvQxphDOY3iIdr_pMmGgJ9M,2859
@@ -116,18 +116,18 @@ pyfemtet/opt/samples/femprj_sample_jp/wat_ex14_parametric_jp.femprj,sha256=dMwQM
 pyfemtet/opt/samples/femprj_sample_jp/wat_ex14_parametric_jp.py,sha256=vMy-KUP1wEMV9Rt6yXjkE40Fcs1t1cpQK-nQJK8hHao,2284
 pyfemtet/opt/samples/femprj_sample_jp/wat_ex14_parametric_parallel_jp.py,sha256=4X0cl3YWpYarcNBCH79mrlyFuKUYSqvnGzokEbv9ILk,2335
 pyfemtet/opt/visualization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyfemtet/opt/visualization/_base.py,sha256=xh6yIkoyBrV670JhAnR9rRewpH7P25wz0pnr0JH0pvc,7623
+pyfemtet/opt/visualization/_base.py,sha256=b1oWPsCTFmoHRjFWhysmpE3VmaB7e-FNq6V9eMTZRz8,7934
 pyfemtet/opt/visualization/_complex_components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/_complex_components/alert_region.py,sha256=sX8xqT4NqhACagK4YgumF4ResrTqhOKQ8dN4q58shI8,2106
-pyfemtet/opt/visualization/_complex_components/control_femtet.py,sha256=LcMoh_MQQ1-hiz7nMGOmxSSoJLOX8viVxZB6uIggg_g,6243
+pyfemtet/opt/visualization/_complex_components/control_femtet.py,sha256=sY0YH56MgDWtfFfEkFsfzpr0VbP8dRT0KrhhGzeRiRE,6227
 pyfemtet/opt/visualization/_complex_components/main_figure_creator.py,sha256=Wt_aL6srMNW-84LeZ86_OtljzmFoF9v0yklVpPAgNDE,9480
-pyfemtet/opt/visualization/_complex_components/main_graph.py,sha256=qcofnuWfItYQJWs16zY1p7L4vE_rr5mHEtj9poU0i5I,21711
-pyfemtet/opt/visualization/_complex_components/pm_graph.py,sha256=eh9rQYUcEefwN3eb7AnXXKFyknl_P_3xt4kl3Y4woI8,25010
+pyfemtet/opt/visualization/_complex_components/main_graph.py,sha256=WbV0oW6nUS734688Zd4H1OpDrBBWJEu6u4u7lqoqnSQ,31975
+pyfemtet/opt/visualization/_complex_components/pm_graph.py,sha256=FnxerXoddflukSj_BdhjK7jBl83qSDFsTUcQzs8Nij8,25153
 pyfemtet/opt/visualization/_complex_components/pm_graph_creator.py,sha256=f-ikYAPChazqyRQ0Y-tKrYrMBHzFHJJ4uV6QXBEBRKI,7304
 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=l9Z1SS4r1BXH6JlccjDyJNanG2JTu4OALbEdZje0XrY,7955
-pyfemtet/opt/visualization/_process_monitor/pages.py,sha256=VEyP7cRyVjLOgKD6KUHu3AivbwbmjTucQWv-obH-HY0,15135
+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/_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
@@ -136,9 +136,9 @@ pyfemtet/opt/visualization/_wrapped_components/str_enum.py,sha256=NZqbh2jNEAckvJ
 pyfemtet/opt/visualization/result_viewer/.gitignore,sha256=ryvb4aqbbsHireHWlPQfxxqDHQJo6YkVYhE9imKt0b8,6
 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=zcsRmVpVK7xbmOpnKkSypNPsRyHcV3ingfNmuqln6nw,32171
-pyfemtet-0.8.4.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.8.4.dist-info/METADATA,sha256=gm8_jNbFddbgs4cCz1XchxJDMSfcTlBn-GHxCu0ikrE,3509
-pyfemtet-0.8.4.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-pyfemtet-0.8.4.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.8.4.dist-info/RECORD,,
+pyfemtet/opt/visualization/result_viewer/pages.py,sha256=MZAjzbuq0toZrR-iJhElM3A12_jHVCTt65gz1kdNPbw,32193
+pyfemtet-0.8.6.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
+pyfemtet-0.8.6.dist-info/METADATA,sha256=Nygc04MFehj-ZvJ5e3KuWq3CL2C94_tbTezHQdp5ubg,3509
+pyfemtet-0.8.6.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+pyfemtet-0.8.6.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.8.6.dist-info/RECORD,,