pyfemtet 0.4.20__py3-none-any.whl → 0.4.23__py3-none-any.whl

pyfemtet/opt/parameter.py

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

pyfemtet/opt/visualization/complex_components/main_graph.py

@@ -184,16 +184,18 @@ class MainGraph(AbstractPage):
             # create component
             title_component = html.H3(f"trial{trial}", style={"color": "darkblue"})
             img_component = self.create_image_content_if_femtet(trial)
-            tbl_component = self.create_formatted_parameter(row)
+            tbl_component_prm = self.create_formatted_parameter(row)
+            tbl_component_obj = self.create_formatted_objective(row)
 
             # create layout
             description = html.Div([
                 title_component,
-                tbl_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(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
@@ -205,7 +207,22 @@ class MainGraph(AbstractPage):
         names = parameters.columns
         values = [f'{value:.3e}' for value in parameters.values.ravel()]
         data = pd.DataFrame(dict(
-            name=names, value=values
+            parameter=names, value=values
+        ))
+        table = dash_table.DataTable(
+            columns=[{'name': col, 'id': col} for col in data.columns],
+            data=data.to_dict('records')
+        )
+        return table
+
+    def create_formatted_objective(self, row) -> Component:
+        metadata = self.application.history.metadata
+        pd.options.display.float_format = '{:.4e}'.format
+        objectives = row.iloc[:, np.where(np.array(metadata) == 'obj')[0]]
+        names = objectives.columns
+        values = [f'{value:.3e}' for value in objectives.values.ravel()]
+        data = pd.DataFrame(dict(
+            objective=names, value=values
         ))
         table = dash_table.DataTable(
             columns=[{'name': col, 'id': col} for col in data.columns],
@@ -258,5 +275,5 @@ class MainGraph(AbstractPage):
         if isinstance(self.application, ProcessMonitorApplication):
             df = self.application.local_data
         else:
-            df = self.application.history.local_data
+            df = self.application.history.get_df()
         return df

pyfemtet/opt/visualization/complex_components/pm_graph.py

@@ -129,6 +129,19 @@ class PredictionModelGraph(AbstractPage):
         self.slider_stack_data = html.Data(**{self.slider_stack_data_prop: {}})
         self.slider_container = html.Div()
 
+        # 2d or 3d
+        self.switch_3d = dbc.Checklist(
+            options=[
+                dict(
+                    label=Msg.LABEL_SWITCH_PREDICTION_MODEL_3D,
+                    disabled=False,
+                    value=False,
+                )
+            ],
+            switch=True,
+            value=[],
+        )
+
     def setup_layout(self):
         self.card_header = dbc.CardHeader(self.tabs)
 
@@ -151,6 +164,7 @@ class PredictionModelGraph(AbstractPage):
                         self.command_manager
                     ],
                     direction='horizontal', gap=2),
+                self.switch_3d,
                 *dropdown_rows,
                 self.slider_container,
                 self.slider_stack_data,
@@ -193,13 +207,15 @@ class PredictionModelGraph(AbstractPage):
             Output(self.redraw_graph_button_spinner, 'spinner_style', allow_duplicate=True),
             Output(self.redraw_graph_button, 'disabled', allow_duplicate=True),
             Output(self.command_manager, self.command_manager_prop, allow_duplicate=True),
+            Output(self.switch_3d, 'options', allow_duplicate=True),
             Input(self.fit_rsm_button, 'n_clicks'),
             Input(self.redraw_graph_button, 'n_clicks'),
             State(self.fit_rsm_button_spinner, 'spinner_style'),
             State(self.redraw_graph_button_spinner, 'spinner_style'),
+            State(self.switch_3d, 'options'),
             prevent_initial_call=True,
         )
-        def disable_fit_button(_1, _2, state1, state2):
+        def disable_fit_button(_1, _2, state1, state2, switch_options):
             # spinner visibility
             if 'display' in state1.keys(): state1.pop('display')
             if 'display' in state2.keys(): state2.pop('display')
@@ -210,7 +226,12 @@ class PredictionModelGraph(AbstractPage):
             else:
                 command = self.CommandState.redraw.value
 
-            return state1, True, state2, True, command
+            # disable switch
+            option = switch_options[0]
+            option.update({'disabled': True})
+            switch_options[0] = option
+
+            return state1, True, state2, True, command, switch_options
 
         # ===== recreate RSM =====
         @app.callback(
@@ -256,9 +277,10 @@ class PredictionModelGraph(AbstractPage):
             State(self.axis3_obj_dropdown, 'label'),
             State(self.slider_container, 'children'),  # for callback chain
             State({'type': 'prm-slider', 'index': ALL}, 'value'),
+            State(self.switch_3d, 'value'),
             prevent_initial_call=True,
         )
-        def redraw_graph(command, active_tab_id, axis1_label, axis2_label, axis3_label, _2, prm_values):
+        def redraw_graph(command, active_tab_id, axis1_label, axis2_label, axis3_label, _2, prm_values, is_3d):
             # just in case
             if callback_context.triggered_id is None:
                 raise PreventUpdate
@@ -283,6 +305,9 @@ class PredictionModelGraph(AbstractPage):
                 logger.error(Msg.ERR_NO_PREDICTION_MODEL)
                 return no_update, self.CommandState.ready.value  # to re-enable buttons, fire callback chain
 
+            if not is_3d:
+                axis2_label = None
+
             # get indices to remove
             idx1 = prm_names.index(axis1_label) if axis1_label in prm_names else None
             idx2 = prm_names.index(axis2_label) if axis2_label in prm_names else None
@@ -307,23 +332,31 @@ class PredictionModelGraph(AbstractPage):
 
             return fig, self.CommandState.ready.value
 
-        # ===== When the graph is updated, enable buttons =====
+        # ===== re-enable buttons when the graph is updated,  =====
         @app.callback(
             Output(self.fit_rsm_button, 'disabled', allow_duplicate=True),
             Output(self.fit_rsm_button_spinner, 'spinner_style', allow_duplicate=True),
             Output(self.redraw_graph_button, 'disabled', allow_duplicate=True),
             Output(self.redraw_graph_button_spinner, 'spinner_style', allow_duplicate=True),
+            Output(self.switch_3d, 'options', allow_duplicate=True),
             Input(self.command_manager, self.command_manager_prop),
             State(self.fit_rsm_button_spinner, 'spinner_style'),
             State(self.redraw_graph_button_spinner, 'spinner_style'),
+            State(self.switch_3d, 'options'),
             prevent_initial_call=True,
         )
-        def enable_buttons(command, state1, state2):
+        def enable_buttons(command, state1, state2, switch_options):
             if command != self.CommandState.ready.value:
                 raise PreventUpdate
             state1.update({'display': 'none'})
             state2.update({'display': 'none'})
-            return False, state1, False, state2
+
+            # enable switch
+            option = switch_options[0]
+            option.update({'disabled': False})
+            switch_options[0] = option
+
+            return False, state1, False, state2, switch_options
 
         # ===== setup dropdown and sliders from history =====
         @app.callback(
@@ -414,6 +447,7 @@ class PredictionModelGraph(AbstractPage):
             Input({'type': 'axis2-dropdown-menu-item', 'index': ALL}, 'n_clicks'),
             Input({'type': 'axis3-dropdown-menu-item', 'index': ALL}, 'n_clicks'),
             Input(self.axis1_prm_dropdown, 'children'),  # for callback chain timing
+            Input(self.switch_3d, 'value'),
             State(self.axis1_prm_dropdown, 'label'),
             State(self.axis2_prm_dropdown, 'label'),
             State(self.axis3_obj_dropdown, 'label'),
@@ -422,10 +456,10 @@ class PredictionModelGraph(AbstractPage):
         )
         def update_controller(*args):
             # argument processing
-            current_ax1_label = args[4]
-            current_ax2_label = args[5]
-            # current_ax3_label = args[6]
-            current_styles: list[dict] = args[7]
+            current_ax1_label = args[5]
+            current_ax2_label = args[6]
+            current_styles: list[dict] = args[8]
+            is_3d = args[4]
 
             # just in case
             if callback_context.triggered_id is None:
@@ -451,6 +485,10 @@ class PredictionModelGraph(AbstractPage):
             if len(prm_names) < 2:
                 ret[ax2_hidden] = True
 
+            # ===== hide dropdown of axis 2 if not is_3d =====
+            if not is_3d:
+                ret[ax2_hidden] = True
+
             # ===== update dropdown label =====
 
             # by callback chain on loaded after setup_dropdown_and_sliders()
@@ -466,29 +504,43 @@ class PredictionModelGraph(AbstractPage):
 
                 # ax1
                 if callback_context.triggered_id['type'] == 'axis1-dropdown-menu-item':
-                    if new_label != current_ax2_label:
-                        ret[ax1_label_key] = new_label
-                    else:
-                        logger.error(Msg.ERR_CANNOT_SELECT_SAME_PARAMETER)
+                    ret[ax1_label_key] = new_label
+                    if new_label == current_ax2_label:
+                        ret[ax2_label_key] = current_ax1_label
+
 
                 # ax2
                 elif callback_context.triggered_id['type'] == 'axis2-dropdown-menu-item':
-                    if new_label != current_ax1_label:
-                        ret[ax2_label_key] = new_label
-                    else:
-                        logger.error(Msg.ERR_CANNOT_SELECT_SAME_PARAMETER)
+                    ret[ax2_label_key] = new_label
+                    if new_label == current_ax1_label:
+                        ret[ax1_label_key] = current_ax2_label
+
 
                 # ax3
                 elif callback_context.triggered_id['type'] == 'axis3-dropdown-menu-item':
                     ret[ax3_label_key] = new_label
 
             # ===== update visibility of sliders =====
-            for label_key, current_label in zip((ax1_label_key, ax2_label_key), (current_ax1_label, current_ax2_label)):
-                # get label of output
-                label = ret[label_key] if ret[label_key] != no_update else current_label
-                # update display style of slider
-                idx = prm_names.index(label) if label in prm_names else None
-                if idx is not None:
+
+            # invisible the slider correspond to the dropdown-1
+            label_key, current_label = ax1_label_key, current_ax1_label
+            # get label of output
+            label = ret[label_key] if ret[label_key] != no_update else current_label
+            # update display style of slider
+            idx = prm_names.index(label) if label in prm_names else None
+            if idx is not None:
+                current_styles[idx].update({'display': 'none'})
+                ret[slider_style_list_key][idx] = current_styles[idx]
+
+            # invisible the slider correspond to the dropdown-2
+            label_key, current_label = ax2_label_key, current_ax2_label
+            # get label of output
+            label = ret[label_key] if ret[label_key] != no_update else current_label
+            # update display style of slider
+            idx = prm_names.index(label) if label in prm_names else None
+            if idx is not None:
+                # if 2d, should not disable the slider correspond to dropdown-2.
+                if is_3d:
                     current_styles[idx].update({'display': 'none'})
                     ret[slider_style_list_key][idx] = current_styles[idx]
 
@@ -554,5 +606,5 @@ class PredictionModelGraph(AbstractPage):
         if isinstance(self.application, ProcessMonitorApplication):
             df = self.application.local_data
         else:
-            df = self.application.history.local_data
+            df = self.application.history.get_df()
         return df

pyfemtet/opt/visualization/complex_components/pm_graph_creator.py

@@ -183,4 +183,11 @@ class PredictionModelCreator:
                 )
             )
 
+            # layout
+            fig.update_layout(
+                title=Msg.GRAPH_TITLE_PREDICTION_MODEL,
+                xaxis_title=prm_name_1,
+                yaxis_title=obj_name,
+            )
+
         return fig

pyfemtet/opt/visualization/process_monitor/application.py

@@ -5,7 +5,7 @@ from threading import Thread
 import pandas as pd
 
 from pyfemtet.opt.visualization.base import PyFemtetApplicationBase, logger
-from pyfemtet.opt.visualization.process_monitor.pages import HomePage, WorkerPage, PredictionModelPage
+from pyfemtet.opt.visualization.process_monitor.pages import HomePage, WorkerPage, PredictionModelPage, OptunaVisualizerPage
 from pyfemtet.message import Msg
 
 
@@ -67,14 +67,14 @@ class ProcessMonitorApplication(PyFemtetApplicationBase):
         if self._should_get_actor_data:
             return self._df
         else:
-            return self.history.local_data
+            return self.history.get_df()
 
     @local_data.setter
     def local_data(self, value: pd.DataFrame):
         if self._should_get_actor_data:
             raise NotImplementedError('If should_get_actor_data, ProcessMonitorApplication.local_df is read_only.')
         else:
-            self.history.local_data = value
+            self.history.set_df(value)
 
     def setup_callback(self, debug=False):
         if not debug:
@@ -112,7 +112,7 @@ class ProcessMonitorApplication(PyFemtetApplicationBase):
                     worker_status.set(OptimizationStatus.INTERRUPTING)
 
             # status と df を actor から application に反映する
-            self._df = self.history.actor_data.copy()
+            self._df = self.history.get_df().copy()
             self.local_entire_status_int = self.entire_status.get()
             self.local_worker_status_int_list = [s.get() for s in self.worker_status_list]
 
@@ -176,11 +176,13 @@ def g_debug():
 
     g_home_page = HomePage(Msg.PAGE_TITLE_PROGRESS)
     g_rsm_page = PredictionModelPage(Msg.PAGE_TITLE_PREDICTION_MODEL, '/prediction-model', g_application)
+    g_optuna = OptunaVisualizerPage(Msg.PAGE_TITLE_OPTUNA_VISUALIZATION, '/optuna', g_application)
     g_worker_page = WorkerPage(Msg.PAGE_TITLE_WORKERS, '/workers', g_application)
 
     g_application.add_page(g_home_page, 0)
     g_application.add_page(g_rsm_page, 1)
-    g_application.add_page(g_worker_page, 2)
+    g_application.add_page(g_optuna, 2)
+    g_application.add_page(g_worker_page, 3)
     g_application.setup_callback(debug=False)
 
     g_application.run(debug=False)
@@ -191,11 +193,13 @@ def main(history, status, worker_addresses, worker_status_list, host=None, port=
 
     g_home_page = HomePage(Msg.PAGE_TITLE_PROGRESS)
     g_rsm_page = PredictionModelPage(Msg.PAGE_TITLE_PREDICTION_MODEL, '/prediction-model', g_application)
+    g_optuna = OptunaVisualizerPage(Msg.PAGE_TITLE_OPTUNA_VISUALIZATION, '/optuna', g_application)
     g_worker_page = WorkerPage(Msg.PAGE_TITLE_WORKERS, '/workers', g_application)
 
     g_application.add_page(g_home_page, 0)
     g_application.add_page(g_rsm_page, 1)
-    g_application.add_page(g_worker_page, 2)
+    g_application.add_page(g_optuna, 2)
+    g_application.add_page(g_worker_page, 3)
     g_application.setup_callback()
 
     g_application.start_server(host, port)

pyfemtet/opt/visualization/process_monitor/pages.py

@@ -1,6 +1,8 @@
 import numpy as np
 import pandas as pd
 
+import optuna
+
 from dash import Output, Input, State, callback_context, no_update, ALL
 from dash.exceptions import PreventUpdate
 
@@ -289,3 +291,103 @@ class PredictionModelPage(AbstractPage):
 
     def setup_layout(self):
         self.layout = self.rsm_graph.layout
+
+
+class OptunaVisualizerPage(AbstractPage):
+
+    def __init__(self, title, rel_url, application):
+        from pyfemtet.opt.visualization.process_monitor.application import ProcessMonitorApplication
+        self.application: ProcessMonitorApplication = None
+        super().__init__(title, rel_url, application)
+
+    def setup_component(self):
+        self.location = dcc.Location(id='optuna-page-location', refresh=True)
+        self._layout = html.Div(children=[Msg.DETAIL_PAGE_TEXT_BEFORE_LOADING])
+        self.layout = [self.location, self._layout]
+
+    def _setup_layout(self):
+
+        study = self.application.history.create_optuna_study()
+        prm_names = self.application.history.prm_names
+        obj_names = self.application.history.obj_names
+
+        layout = []
+
+        layout.append(html.H2(Msg.DETAIL_PAGE_HISTORY_HEADER))
+        layout.append(html.H4(Msg.DETAIL_PAGE_HISTORY_DESCRIPTION))
+        for i, obj_name in enumerate(obj_names):
+            fig = optuna.visualization.plot_optimization_history(
+                study,
+                target=lambda t: t.values[i],
+                target_name=obj_name
+            )
+            layout.append(dcc.Graph(figure=fig, style={'height': '70vh'}))
+
+        layout.append(html.H2(Msg.DETAIL_PAGE_PARALLEL_COOR_HEADER))
+        layout.append(html.H4(Msg.DETAIL_PAGE_PARALLEL_COOR_DESCRIPTION))
+        for i, obj_name in enumerate(obj_names):
+            fig = optuna.visualization.plot_parallel_coordinate(
+                study,
+                target=lambda t: t.values[i],
+                target_name=obj_name
+            )
+            layout.append(dcc.Graph(figure=fig, style={'height': '70vh'}))
+
+        layout.append(html.H2(Msg.DETAIL_PAGE_CONTOUR_HEADER))
+        layout.append(html.H4(Msg.DETAIL_PAGE_CONTOUR_DESCRIPTION))
+        for i, obj_name in enumerate(obj_names):
+            fig = optuna.visualization.plot_contour(
+                study,
+                target=lambda t: t.values[i],
+                target_name=obj_name
+            )
+            layout.append(dcc.Graph(figure=fig, style={'height': '90vh'}))
+
+        # import itertools
+        # for (i, j) in itertools.combinations(range(len(obj_names)), 2):
+        #     fig = optuna.visualization.plot_pareto_front(
+        #         study,
+        #         targets=lambda t: (t.values[i], t.values[j]),
+        #         target_names=[obj_names[i], obj_names[j]],
+        #     )
+        #     self.graphs.append(dcc.Graph(figure=fig, style={'height': '50vh'}))
+
+        layout.append(html.H2(Msg.DETAIL_PAGE_SLICE_HEADER))
+        layout.append(html.H4(Msg.DETAIL_PAGE_SLICE_DESCRIPTION))
+        for i, obj_name in enumerate(obj_names):
+            fig = optuna.visualization.plot_slice(
+                study,
+                target=lambda t: t.values[i],
+                target_name=obj_name
+            )
+            layout.append(dcc.Graph(figure=fig, style={'height': '70vh'}))
+
+        return layout
+
+    def setup_callback(self):
+        app = self.application.app
+
+        @app.callback(
+            Output(self._layout, 'children'),
+            Input(self.location, 'pathname'),  # on page load
+        )
+        def update_page(_):
+            if self.application.history is None:
+                return Msg.ERR_NO_HISTORY_SELECTED
+
+            if len(self.data_accessor()) == 0:
+                return Msg.ERR_NO_FEM_RESULT
+
+            return self._setup_layout()
+
+
+    def setup_layout(self):
+        pass
+
+    def data_accessor(self) -> pd.DataFrame:
+        from pyfemtet.opt.visualization.process_monitor.application import ProcessMonitorApplication
+        if isinstance(self.application, ProcessMonitorApplication):
+            df = self.application.local_data
+        else:
+            df = self.application.history.local_data
+        return df

pyfemtet/opt/visualization/result_viewer/application.py

@@ -1,5 +1,7 @@
 from pyfemtet.opt.visualization.base import PyFemtetApplicationBase
 from pyfemtet.opt.visualization.result_viewer.pages import HomePage, PredictionModelPage
+from pyfemtet.opt.visualization.process_monitor.pages import OptunaVisualizerPage
+
 from pyfemtet.message import Msg
 
 
@@ -24,9 +26,11 @@ def debug():
 
     g_home_page = HomePage(Msg.PAGE_TITLE_RESULT)
     g_rsm_page = PredictionModelPage(Msg.PAGE_TITLE_PREDICTION_MODEL, '/prediction-model', g_application)
+    g_optuna = OptunaVisualizerPage(Msg.PAGE_TITLE_OPTUNA_VISUALIZATION, '/optuna', g_application)
 
     g_application.add_page(g_home_page, 0)
     g_application.add_page(g_rsm_page, 1)
+    g_application.add_page(g_optuna, 2)
     g_application.setup_callback()
 
     g_application.run(debug=True)
@@ -37,9 +41,11 @@ def main():
 
     g_home_page = HomePage(Msg.PAGE_TITLE_RESULT)
     g_rsm_page = PredictionModelPage(Msg.PAGE_TITLE_PREDICTION_MODEL, '/prediction-model', g_application)
+    g_optuna = OptunaVisualizerPage(Msg.PAGE_TITLE_OPTUNA_VISUALIZATION, '/optuna', g_application)
 
     g_application.add_page(g_home_page, 0)
     g_application.add_page(g_rsm_page, 1)
+    g_application.add_page(g_optuna, 2)
     g_application.setup_callback()
 
     g_application.run()

pyfemtet/opt/visualization/result_viewer/pages.py

@@ -281,7 +281,7 @@ class HomePage(AbstractPage):
                 trial = pt['customdata'][0]
 
                 # get parameter and update model
-                df = self.application.history.local_data
+                df = self.application.history.get_df()
                 row = df[df['trial'] == trial]
                 metadata = np.array(self.application.history.metadata)
                 idx = np.where(metadata == 'prm')[0]

{pyfemtet-0.4.20.dist-info → pyfemtet-0.4.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfemtet
-Version: 0.4.20
+Version: 0.4.23
 Summary: Design parameter optimization using Femtet.
 Home-page: https://github.com/pyfemtet/pyfemtet
 License: BSD-3-Clause
@@ -13,8 +13,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: babel (>=2.15.0,<3.0.0)
-Requires-Dist: botorch (>=0.9.5) ; python_version >= "3.12" and python_version < "3.13"
-Requires-Dist: botorch (>=0.9.5,<0.10.0) ; python_version < "3.12"
+Requires-Dist: botorch (==0.9.5)
 Requires-Dist: colorlog (>=6.8.0,<7.0.0)
 Requires-Dist: dash (>=2.17.0,<3.0.0)
 Requires-Dist: dash-bootstrap-components (>=1.5.0,<2.0.0)
@@ -28,9 +27,9 @@ Requires-Dist: optuna-integration (>=3.6.0,<4.0.0)
 Requires-Dist: pandas (>=2.1.3,<3.0.0)
 Requires-Dist: plotly (>=5.22.0,<6.0.0)
 Requires-Dist: psutil (>=5.9.6,<6.0.0)
-Requires-Dist: pytest-dashboard (>=0.1.2,<0.2.0)
 Requires-Dist: pywin32 (>=306,<307)
 Requires-Dist: scipy (>=1.11.4,<2.0.0)
+Requires-Dist: torch (>=2.3.0,<2.4.0)
 Requires-Dist: tqdm (>=4.66.1,<5.0.0)
 Project-URL: Repository, https://github.com/pyfemtet/pyfemtet
 Description-Content-Type: text/markdown