pyfemtet 0.4.25__py3-none-any.whl → 0.5.1__py3-none-any.whl

pyfemtet/opt/samples/femprj_sample_jp/constrained_pipe_jp.py

@@ -0,0 +1,93 @@
+"""拘束付き最適化を実装するサンプル。
+
+このセクションでは、拘束の種類と、拘束を必要とするモデルで
+最適化を実行する手順について説明します。
+
+"""
+
+from optuna_integration import BoTorchSampler
+from pyfemtet.opt import FEMOpt, OptunaOptimizer
+
+
+def mises_stress(Femtet):
+    """フォンミーゼス応力を目的関数として計算します。
+
+    この関数は、最適化の実行中に FEMOpt オブジェクトによって
+    自動的に呼び出されます。
+
+    引数:
+        Femtet: PyFemtet を使用して目的関数または拘束関数を
+            定義する場合、最初の引数は Femtet インスタンスを
+            取る必要があります。
+
+    戻り値:
+        float: 目的または拘束関数は単一の float を返すよう定義してください。
+    """
+    return Femtet.Gogh.Galileo.GetMaxStress_py()[2]
+
+
+def radius_diff(Femtet, opt):
+    """パイプの外側の半径と内側の半径の差を計算します。
+
+    この拘束は、最適化の実行中にパイプの内側の半径が
+    外側の半径を超えないようにするために呼び出されます。
+
+    注意:
+        OptunaOptimizer の BoTorchSampler を使用していて、
+        strict な拘束を使用する場合、パラメータを提案するため
+        に繰り返し計算が必要になるため、Femtet へのアクセスが
+        非常に遅くなる可能性があることに注意してください。
+        この関数の例のように、Femtet にアクセスするのではなく、
+        Optimizer オブジェクトを介してパラメータを取得して計算
+        を実行することをお勧めします。
+
+        非推奨::
+
+            p = Femtet.GetVariableValue('p')
+
+        代わりに::
+
+            params = opt.get_parameter()
+            p = params['p']
+
+    引数:
+        Femtet: PyFemtet を使用して目的関数または拘束関数を
+            定義する場合、最初の引数は Femtet インスタンスを
+            取る必要があります。
+        opt: このオブジェクトを使用すると、Femtet を経由せず
+            に外側の半径と内側の半径の値を取得できます。
+    """
+    params = opt.get_parameter()
+    internal_r = params['internal_r']
+    external_r = params['external_r']
+    return external_r - internal_r
+
+
+if __name__ == '__main__':
+    # 最適化手法のセットアップ
+    opt = OptunaOptimizer(
+        sampler_class=BoTorchSampler,
+        sampler_kwargs=dict(
+            n_startup_trials=3,  # 最初の 3 回はランダムサンプリングを行います。
+        )
+    )
+    femopt = FEMOpt(opt=opt)
+
+    # 変数の追加
+    femopt.add_parameter("external_r", 10, lower_bound=0.1, upper_bound=10)
+    femopt.add_parameter("internal_r", 5, lower_bound=0.1, upper_bound=10)
+
+    # 最適化の実行中に外側の半径を超えないように strict 拘束を追加します。
+    femopt.add_constraint(
+        radius_diff,  # 拘束関数 (ここでは 外半径 - 内半径).
+        name='管厚さ',  # 拘束関数にはプログラム上の名前とは別に自由な名前を付与できます.
+        lower_bound=1,  # 拘束関数の下限 (ここでは管の厚みを最低 1 とする).
+        args=(femopt.opt,)  # 拘束関数に渡される、Femtet 以外の追加の引数.
+    )
+
+    # 目的関数の追加
+    femopt.add_objective(mises_stress, name='ミーゼス応力')
+
+    # 最適化の実行
+    femopt.set_random_seed(42)
+    femopt.optimize(n_trials=10)

pyfemtet/opt/{femprj_sample_jp → samples/femprj_sample_jp}/her_ex40_parametric_jp.py

@@ -80,7 +80,7 @@ class SParameterCalculator:
         return self.resonance_frequency  # 単位: Hz
         
 
-def antenna_is_smaller_than_substrate(Femtet):
+def antenna_is_smaller_than_substrate(Femtet, opt):
     """アンテナの大きさと基板の大きさの関係を計算します。
 
     この関数は、変数の更新によってモデル形状が破綻しないように
@@ -92,15 +92,17 @@ def antenna_is_smaller_than_substrate(Femtet):
     Returns:
         float: 基板エッジとアンテナエッジの間隙。1 mm 以上が必要です。
     """
-    r = Femtet.GetVariableValue('antenna_radius')
-    w = Femtet.GetVariableValue('substrate_w')
+    params = opt.get_parameter()
+    r = params['antenna_radius']
+    w = params['substrate_w']
     return w / 2 - r  # 単位: mm
 
 
-def port_is_inside_antenna(Femtet):
+def port_is_inside_antenna(Femtet, opt):
     """給電ポートの位置とアンテナの大きさの関係を計算します。"""
-    r = Femtet.GetVariableValue('antenna_radius')
-    x = Femtet.GetVariableValue('port_x')
+    params = opt.get_parameter()
+    r = params['antenna_radius']
+    x = params['port_x']
     return r - x  # 単位: mm。1 mm 以上が必要です。
 
 
@@ -125,8 +127,8 @@ if __name__ == '__main__':
     femopt.add_parameter('port_x', 5, 1, 20)
 
     # 拘束関数を最適化問題に追加
-    femopt.add_constraint(antenna_is_smaller_than_substrate, 'アンテナと基板エッジの間隙', lower_bound=1)
-    femopt.add_constraint(port_is_inside_antenna, 'アンテナエッジと給電ポートの間隙', lower_bound=1)
+    femopt.add_constraint(antenna_is_smaller_than_substrate, 'アンテナと基板エッジの間隙', lower_bound=1, args=(opt,))
+    femopt.add_constraint(port_is_inside_antenna, 'アンテナエッジと給電ポートの間隙', lower_bound=1, args=(opt,))
 
     # 目的関数を最適化問題に追加
     # 共振周波数の目標は 3.0 GHz です。

pyfemtet/opt/visualization/complex_components/main_figure_creator.py

@@ -1,3 +1,4 @@
+import pandas as pd
 import plotly.graph_objs as go
 import plotly.express as px
 
@@ -200,3 +201,71 @@ def _get_multi_objective_pairplot(history, df):
     )
 
     return fig
+
+
+def get_objective_plot(history: History, df: pd.DataFrame, obj_names: list[str]) -> go.Figure:
+    df = _ls.localize(df)
+    df.columns = [c.replace(' / ', '<BR>/ ') for c in df.columns]
+    obj_names = [o.replace(' / ', '<BR>/ ') for o in obj_names]
+
+    common_kwargs = dict(
+        color=_ls.non_domi['label'],
+        color_discrete_map={
+            _ls.non_domi[True]: _cs.non_domi[True],
+            _ls.non_domi[False]: _cs.non_domi[False],
+        },
+        symbol=_ls.feasible['label'],
+        symbol_map={
+            _ls.feasible[True]: _ss.feasible[True],
+            _ls.feasible[False]: _ss.feasible[False],
+        },
+        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]),
+        },
+    )
+
+    if len(obj_names) == 2:
+        fig = px.scatter(
+            data_frame=df,
+            x=obj_names[0],
+            y=obj_names[1],
+            **common_kwargs,
+        )
+        fig.update_layout(
+            dict(
+                xaxis_title=obj_names[0],
+                yaxis_title=obj_names[1],
+            )
+        )
+
+    elif len(obj_names) == 3:
+        fig = px.scatter_3d(
+            df,
+            x=obj_names[0],
+            y=obj_names[1],
+            z=obj_names[2],
+            **common_kwargs,
+        )
+        fig.update_layout(
+            margin=dict(l=0, r=0, b=0, t=30),
+        )
+        fig.update_traces(
+            marker=dict(
+                size=3,
+            ),
+        )
+
+    else:
+        raise Exception
+
+    fig.update_layout(
+        dict(
+            title_text="Objective plot",
+        )
+    )
+
+    fig.update_traces(hoverinfo="none", hovertemplate=None)
+
+    return fig

pyfemtet/opt/visualization/complex_components/main_graph.py

@@ -2,7 +2,7 @@
 from dash.development.base_component import Component
 
 # callback
-from dash import Output, Input, State, no_update, callback_context
+from dash import Output, Input, State, no_update, callback_context, ALL
 from dash.exceptions import PreventUpdate
 
 # components
@@ -21,7 +21,7 @@ import json
 import numpy as np
 
 from pyfemtet.opt.visualization.complex_components import main_figure_creator
-from pyfemtet.opt.visualization.base import PyFemtetApplicationBase, AbstractPage, logger
+from pyfemtet.opt.visualization.base import AbstractPage, logger
 from pyfemtet.message import Msg
 
 
@@ -45,12 +45,17 @@ class MainGraph(AbstractPage):
     | | |  graph <-------- ToolTip
     | | +---------+ | |
     | +-------------+ |
+    +-----------------+
+    |                 | <- CardFooter (depends on tab)
     +=================+
 
         Data(data-selection)
 
     """
 
+    TAB_ID_OBJECTIVE_PLOT = 'tab-objectives-plot'
+    TAB_ID_HYPERVOLUME_PLOT = 'tab-hypervolume-plot'
+
     def __init__(self):
         self.setup_figure_creator()
         super().__init__()
@@ -60,12 +65,17 @@ class MainGraph(AbstractPage):
         # list[0] is the default tab
         self.figure_creators = [
             dict(
-                tab_id='tab-objective-plot',
-                label=Msg.TAB_LABEL_OBJECTIVES,
+                tab_id='tab-objectives-scatterplot',
+                label=Msg.TAB_LABEL_OBJECTIVE_SCATTERPLOT,
                 creator=main_figure_creator.get_default_figure,
             ),
             dict(
-                tab_id='tab-hypervolume-plot',
+                tab_id=self.TAB_ID_OBJECTIVE_PLOT,
+                label=Msg.TAB_LABEL_OBJECTIVE_PLOT,
+                creator=main_figure_creator.get_objective_plot,
+            ),
+            dict(
+                tab_id=self.TAB_ID_HYPERVOLUME_PLOT,
                 label='Hypervolume',
                 creator=main_figure_creator.get_hypervolume_plot,
             ),
@@ -76,13 +86,65 @@ class MainGraph(AbstractPage):
         self.location = dcc.Location(id='main-graph-location', refresh=True)
 
         # setup header
-        self.tab_list = [dbc.Tab(label=d['label'], tab_id=d['tab_id']) for d in self.figure_creators]
+        tab_list = []
+        for d in self.figure_creators:
+            is_objective_plot = d['tab_id'] == self.TAB_ID_OBJECTIVE_PLOT  # Objective plot tab is only shown in obj_names > 3. Set this via callback.
+            is_hypervolume_plot = d['tab_id'] == self.TAB_ID_HYPERVOLUME_PLOT  # same above
+
+            if is_objective_plot or is_hypervolume_plot:
+                style = {'display': 'none'}
+            else:
+                style = None
+
+            tab_list.append(
+                dbc.Tab(
+                    label=d['label'],
+                    tab_id=d['tab_id'],
+                    tab_style=style,
+                )
+            )
+        self.tab_list = tab_list
         self.tabs = dbc.Tabs(self.tab_list, id='main-graph-tabs')
         self.card_header = dbc.CardHeader(self.tabs)
 
         # setup body
         self.tooltip = dcc.Tooltip(id='main-graph-tooltip')
 
+        # setup footer components for objective plot
+        self.axis1_dropdown = dbc.DropdownMenu()
+        self.axis2_dropdown = dbc.DropdownMenu()
+        self.axis3_dropdown = dbc.DropdownMenu()
+        self.switch_3d = dbc.Checklist(
+            options=[
+                dict(
+                    label="3D",
+                    disabled=False,
+                    value=False,
+                )
+            ],
+            switch=True,
+            value=[],
+        )
+        self.objective_plot_controller: html.Div = html.Div(
+            [
+                self.switch_3d,
+                dbc.Stack(
+                    children=['X axis', self.axis1_dropdown],
+                    direction='horizontal', gap=2),
+                dbc.Stack(
+                    children=['Y axis', self.axis2_dropdown],
+                    direction='horizontal', gap=2),
+                dbc.Stack(
+                    children=['Z axis', self.axis3_dropdown],
+                    direction='horizontal', gap=2),
+            ]
+        )
+
+        # setup footer
+        self.card_footer: dbc.CardFooter = dbc.CardFooter(
+            self.objective_plot_controller
+        )
+
         # set kwargs of Graph to reconstruct Graph in ProcessMonitor.
         self.graph_kwargs = dict(
             id='main-graph',
@@ -127,6 +189,7 @@ class MainGraph(AbstractPage):
                 self.data_length,
                 self.card_header,
                 self.card_body,
+                self.card_footer,
                 self.selection_data,
             ],
             # style=FLEXBOX_STYLE_ALLOW_VERTICAL_FILL,
@@ -140,15 +203,236 @@ class MainGraph(AbstractPage):
 
         app = self.application.app
 
-        # ===== Update Graph =====
+        # ===== Change visibility of plot tab =====
+        objective_plot_tab = [t for t in self.tab_list if t.tab_id == self.TAB_ID_OBJECTIVE_PLOT][0]
+        hypervolume_plot_tab = [t for t in self.tab_list if t.tab_id == self.TAB_ID_HYPERVOLUME_PLOT][0]
+        @app.callback(
+            output=(
+                Output(objective_plot_tab, 'tab_style'),
+                Output(hypervolume_plot_tab, 'tab_style'),
+            ),
+            inputs=dict(
+                _=(
+                    Input(self.tabs, 'active_tab'),
+                    Input(self.location, 'pathname'),
+                ),
+                current_styles=dict(
+                    obj=State(objective_plot_tab, 'tab_style'),
+                    hv=State(hypervolume_plot_tab, 'tab_style'),
+                ),
+            ),
+            prevent_initial_call=True,
+        )
+        def set_disabled(_, current_styles):
+            obj_style: dict = no_update
+            hv_style: dict = no_update
+
+            # load history
+            if self.application.history is None:
+                raise PreventUpdate
+            obj_names = self.application.history.obj_names
+
+            # show objective plot with 3 or more objectives
+            if len(obj_names) < 3:
+                if 'display' not in current_styles['obj'].keys():
+                    obj_style = current_styles['obj']
+                    obj_style.update({'display': 'none'})
+            else:
+                if 'display' in current_styles['obj'].keys():
+                    obj_style = current_styles['obj']
+                    obj_style.pop('display')
+
+            # show hypervolume plot with 2 or more objectives
+            if len(obj_names) < 2:
+                if 'display' not in current_styles['hv'].keys():
+                    hv_style = current_styles['hv']
+                    hv_style.update({'display': 'none'})
+            else:
+                if 'display' in current_styles['hv'].keys():
+                    hv_style = current_styles['hv']
+                    hv_style.pop('display')
+
+            return obj_style, hv_style
+
+        # ===== Change visibility of dropdown menus =====
+        @app.callback(
+            Output(self.objective_plot_controller, 'hidden'),
+            Input(self.tabs, 'active_tab'),
+            prevent_initial_call=True,
+        )
+        def invisible_controller(active_tab):
+            return active_tab != self.TAB_ID_OBJECTIVE_PLOT
+
+        # ===== Change accessibility of axis3 dropdown =====
+        @app.callback(
+            Output(self.axis3_dropdown, 'disabled'),
+            Input(self.switch_3d, 'value'),
+            Input(self.location, 'pathname'),
+            prevent_initial_call=True,
+        )
+        def disable_axis_3_dropdown_menu(is_3d, _):
+            return not is_3d
+
+        # ===== Initialize Dropdown menus =====
+        @app.callback(
+            output=dict(
+                items_list=[
+                    Output(self.axis1_dropdown, 'children'),
+                    Output(self.axis2_dropdown, 'children'),
+                    Output(self.axis3_dropdown, 'children'),
+                ],
+                labels=[
+                    Output(self.axis1_dropdown, 'label'),
+                    Output(self.axis2_dropdown, 'label'),
+                    Output(self.axis3_dropdown, 'label'),
+                ]
+            ),
+            inputs=[Input(self.location, 'pathname')],
+            prevent_initial_call=True,
+        )
+        def init_dropdown_menus(*_, **__):
+            # just in case
+            if callback_context.triggered_id is None:
+                raise PreventUpdate
+
+            # load history
+            if self.application.history is None:
+                logger.error(Msg.ERR_NO_HISTORY_SELECTED)
+                raise PreventUpdate
+
+            # assert 3 or more objectives
+            obj_names = self.application.history.obj_names
+            if len(obj_names) < 3:
+                raise PreventUpdate
+
+            # add dropdown item to dropdown
+            axis1_dropdown_items = []
+            axis2_dropdown_items = []
+            axis3_dropdown_items = []
+
+            for i, obj_name in enumerate(obj_names):
+                axis1_dropdown_items.append(
+                    dbc.DropdownMenuItem(
+                        children=obj_name,
+                        id={'type': 'objective-axis1-dropdown-menu-item', 'index': obj_name},
+                    )
+                )
+
+                axis2_dropdown_items.append(
+                    dbc.DropdownMenuItem(
+                        children=obj_name,
+                        id={'type': 'objective-axis2-dropdown-menu-item', 'index': obj_name},
+                    )
+                )
+
+                axis3_dropdown_items.append(
+                    dbc.DropdownMenuItem(
+                        children=obj_name,
+                        id={'type': 'objective-axis3-dropdown-menu-item', 'index': obj_name},
+                    )
+                )
+
+            items_list = [axis1_dropdown_items, axis2_dropdown_items, axis3_dropdown_items]
+
+            ret = dict(
+                items_list=items_list,
+                labels=obj_names[:3],
+            )
+
+            return ret
+
+        # ===== Update Dropdown menus =====
+        @app.callback(
+            output=dict(
+                label_1=Output(self.axis1_dropdown, 'label', allow_duplicate=True),  # label of dropdown
+                label_2=Output(self.axis2_dropdown, 'label', allow_duplicate=True),
+                label_3=Output(self.axis3_dropdown, 'label', allow_duplicate=True),
+            ),
+            inputs=dict(
+                _=(  # when the dropdown item is clicked
+                    Input({'type': 'objective-axis1-dropdown-menu-item', 'index': ALL}, 'n_clicks'),
+                    Input({'type': 'objective-axis2-dropdown-menu-item', 'index': ALL}, 'n_clicks'),
+                    Input({'type': 'objective-axis3-dropdown-menu-item', 'index': ALL}, 'n_clicks'),
+                ),
+                current_labels=dict(  # for exclusive selection
+                    label_1=State(self.axis1_dropdown, 'label'),
+                    label_2=State(self.axis2_dropdown, 'label'),
+                    label_3=State(self.axis3_dropdown, 'label'),
+                ),
+            ),
+            prevent_initial_call=True,
+        )
+        def update_dropdowns(_, current_labels):
+            # just in case
+            if callback_context.triggered_id is None:
+                raise PreventUpdate
+
+            # load history
+            if self.application.history is None:
+                logger.error(Msg.ERR_NO_HISTORY_SELECTED)
+                raise PreventUpdate
+            obj_names = self.application.history.obj_names
+
+            if len(obj_names) < 3:
+                raise PreventUpdate
+
+            # default return values
+            ret = dict(
+                label_1=no_update,
+                label_2=no_update,
+                label_3=no_update,
+            )
+
+            # ===== update dropdown label =====
+            new_label = callback_context.triggered_id['index']
+
+            # example of triggerd_id: {'index': 'max_displacement', 'type': 'objective-axis1-dropdown-menu-item'}
+            if callback_context.triggered_id['type'] == 'objective-axis1-dropdown-menu-item':
+                ret["label_1"] = new_label
+                if current_labels["label_2"] == new_label:
+                    ret["label_2"] = current_labels["label_1"]
+                if current_labels["label_3"] == new_label:
+                    ret["label_3"] = current_labels["label_1"]
+            if callback_context.triggered_id['type'] == 'objective-axis2-dropdown-menu-item':
+                ret["label_2"] = new_label
+                if current_labels["label_3"] == new_label:
+                    ret["label_3"] = current_labels["label_2"]
+                if current_labels["label_1"] == new_label:
+                    ret["label_1"] = current_labels["label_2"]
+            if callback_context.triggered_id['type'] == 'objective-axis3-dropdown-menu-item':
+                ret["label_3"] = new_label
+                if current_labels["label_1"] == new_label:
+                    ret["label_1"] = current_labels["label_3"]
+                if current_labels["label_2"] == new_label:
+                    ret["label_2"] = current_labels["label_3"]
+
+            return ret
+
+        # ===== Update Graph (by tab selection or dropdown changed) =====
         @app.callback(
             Output(self.graph.id, 'figure'),
             Output(self.data_length.id, self.data_length_prop),  # To determine whether Process Monitor should update the graph, the main graph remembers the current amount of data.
-            Input(self.tabs.id, 'active_tab'),
-            Input(self.dummy, 'children'),
-            prevent_initial_call=False,)
-        def redraw_main_graph(active_tab_id, _):
-            figure, length = self.get_fig_by_tab_id(active_tab_id, with_length=True)
+            inputs=dict(
+                active_tab_id=Input(self.tabs.id, 'active_tab'),
+                _=Input(self.dummy, 'children'),
+                is_3d=Input(self.switch_3d, 'value'),
+                obj_names=(
+                    Input(self.axis1_dropdown, 'label'),
+                    Input(self.axis2_dropdown, 'label'),
+                    Input(self.axis3_dropdown, 'label'),
+                ),
+            ),
+            prevent_initial_call=False,
+        )
+        def redraw_main_graph(active_tab_id, _, is_3d, obj_names):
+            kwargs = {}
+            if active_tab_id == self.TAB_ID_OBJECTIVE_PLOT:
+                if not is_3d:
+                    obj_names = obj_names[:-1]
+                kwargs = dict(
+                    obj_names=obj_names
+                )
+            figure, length = self.get_fig_by_tab_id(active_tab_id, with_length=True, kwargs=kwargs)
             return figure, length
 
         # ===== Save Selection =====
@@ -248,7 +532,7 @@ class MainGraph(AbstractPage):
                 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):
+    def get_fig_by_tab_id(self, tab_id, with_length=False, kwargs: dict = None):
         # If the history is not loaded, do nothing
         if self.application.history is None:
             raise PreventUpdate
@@ -264,7 +548,8 @@ class MainGraph(AbstractPage):
 
         # create figure
         df = self.data_accessor()
-        fig = creator(self.application.history, df)
+        kwargs = kwargs or {}
+        fig = creator(self.application.history, df, **kwargs)
         if with_length:
             return fig, len(df)
         else:

pyfemtet/opt/visualization/process_monitor/pages.py

@@ -389,5 +389,5 @@ class OptunaVisualizerPage(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/result_viewer/application.py

@@ -52,4 +52,4 @@ def main():
 
 
 if __name__ == '__main__':
-    debug()
+    main()

pyfemtet/opt/visualization/result_viewer/pages.py

@@ -522,6 +522,7 @@ class Tutorial(AbstractPage):
             Input(self.tutorial_mode_switch, 'value'),
             Input(self.load_sample_csv_button, 'n_clicks'),  # load button clicked
             Input(self.main_graph.selection_data, self.main_graph.selection_data_property),  # selection changed
+            Input(self.femtet_control.femtet_state.id, self.femtet_control.femtet_state_prop),  # connection established
             Input(self.control_visibility_input_dummy, 'children'),
             State(self.load_sample_csv_badge, 'style'),  # switch visibility
             State(self.load_sample_csv_div, 'style'),  # switch visibility
@@ -533,9 +534,10 @@ class Tutorial(AbstractPage):
         )
         def control_visibility(
                 is_tutorial,
-                _1,
-                selection_data,
-                _2,
+                _1,  # load_sample clicked
+                selection_data,  # data selected
+                _2,  # result of connect_femtet clicked
+                _3,  # dummy component loaded
                 load_sample_csv_badge_current_style,
                 load_sample_csv_div_current_style,
                 file_picker_current_style,
@@ -596,13 +598,12 @@ class Tutorial(AbstractPage):
 
             # if history is not None,
             else:
-                print('=====')
-                # if a point is already selected, show badge to open-pdt or connect-femtet
+                # if a point is already selected,
+                # show badge to open-pdt or connect-femtet
                 if self.check_point_selected(selection_data):
-                    print(1)
+
                     # if femtet is connected, show badge to open-pdt
                     if self.femtet_control.check_femtet_state() is FemtetState.connected:
-                        print(2)
                         ret[open_pdt_badge_style] = self.control_visibility_by_style(
                             True,
                             open_pdt_badge_current_style,
@@ -610,7 +611,6 @@ class Tutorial(AbstractPage):
 
                     # else, show femtet-connect badge
                     else:
-                        print('3')
                         ret[connect_femtet_badge_style] = self.control_visibility_by_style(
                             True,
                             connect_femtet_badge_current_style,
@@ -646,7 +646,7 @@ class Tutorial(AbstractPage):
             # get sample file
             import pyfemtet
             package_root = os.path.dirname(pyfemtet.__file__)
-            sample_dir = os.path.join(package_root, 'opt', 'femprj_sample')  # FIXME: locale によってパスを変える
+            sample_dir = os.path.join(package_root, 'opt', 'samples', 'femprj_sample')  # FIXME: locale によってパスを変える
             path = os.path.join(sample_dir, 'wat_ex14_parametric_test_result.reccsv')
 
             if not os.path.exists(path):

{pyfemtet-0.4.25.dist-info → pyfemtet-0.5.1.dist-info}/METADATA

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