pyfemtet 1.1.0__py3-none-any.whl → 1.1.1__py3-none-any.whl

pyfemtet/_util/df_util.py

@@ -1,3 +1,4 @@
+from typing import TypeAlias, Literal
 from math import isnan
 import pandas as pd
 
@@ -8,7 +9,10 @@ __all__ = [
 ]
 
 
-def get_index(df, equality_filters):
+_Method: TypeAlias = Literal['all', 'any', 'all-exclude']
+
+
+def get_index(df, equality_filters, method: _Method = 'all'):
     # 値渡しに変換
     equality_filters = equality_filters.copy()
 
@@ -24,17 +28,25 @@ def get_index(df, equality_filters):
 
     # na 以外の比較
     # noinspection PyUnresolvedReferences
-    out: pd.Series = (df[list(equality_filters.keys())] == pd.Series(equality_filters)).all(axis=1)
+    if 'all' in method.lower():
+        out: pd.Series = (df[list(equality_filters.keys())] == pd.Series(equality_filters)).all(axis=1)
+    elif 'any' in method.lower():
+        out: pd.Series = (df[list(equality_filters.keys())] == pd.Series(equality_filters)).any(axis=1)
+    else:
+        raise NotImplementedError(f'Unknown method: {method}')
 
     # na との比較
     for key in want_na_keys:
         out = out & df[key].isna()
 
+    if 'exclude' in method:
+        out = ~out
+
     return out
 
 
-def get_partial_df(df: pd.DataFrame, equality_filters: dict):
-    return df[get_index(df, equality_filters)]
+def get_partial_df(df: pd.DataFrame, equality_filters: dict, method: _Method = 'all'):
+    return df[get_index(df, equality_filters, method=method)]
 
 
 def apply_partial_df(df: pd.DataFrame, partial_df: pd.DataFrame, equality_filters: dict):

pyfemtet/opt/visualization/history_viewer/_complex_components/pm_graph.py

@@ -17,8 +17,9 @@ from pyfemtet.opt.prediction._model import *
 from pyfemtet.opt.prediction._helper import *
 from pyfemtet.opt.visualization.plotter.pm_graph_creator import plot2d, plot3d
 from pyfemtet.opt.visualization.history_viewer._base_application import AbstractPage, logger
-from pyfemtet.opt.visualization.history_viewer._helper import has_full_bound
+from pyfemtet.opt.visualization.history_viewer._helper import has_full_bound, control_visibility_by_style
 from pyfemtet._i18n import Msg, _
+from pyfemtet._util.df_util import *
 
 
 __all__ = [
@@ -144,6 +145,22 @@ class PredictionModelGraph(AbstractPage):
             value=[],
         )
 
+        # consider sub sampling or not
+        self.SUB_SAMPLING_CHECKED = 'sub_sampling_checked'
+        self.switch_about_sub_sampling = dbc.Checklist(
+            options=[
+                dict(
+                    label=_('Consider sub sampling when the model re-calc', 'モデル再計算時にサブサンプリングのみを考慮'),
+                    value=self.SUB_SAMPLING_CHECKED,  # チェックされたら value (list) の要素に "sub_sampling_checked" が入る
+                )
+            ],
+            switch=True,
+            value=[],  # 初期状態ではチェックされている値なし
+            style=control_visibility_by_style(
+                visible=False, current_style={}
+            ),
+        )
+
         # alert region subpage
         self.alert_region: AlertRegion = AlertRegion()
         self.add_subpage(self.alert_region)
@@ -200,7 +217,10 @@ class PredictionModelGraph(AbstractPage):
                         self.command_manager
                     ],
                     direction='horizontal', gap=2),
-                self.switch_3d,
+                dbc.Row((
+                    dbc.Col(self.switch_3d),
+                    dbc.Col(self.switch_about_sub_sampling)
+                )),
                 *dropdown_rows,
                 self.slider_container,
                 self.slider_stack_data,
@@ -276,9 +296,10 @@ class PredictionModelGraph(AbstractPage):
             Output(self.command_manager, self.command_manager_prop, allow_duplicate=True),
             Output(self.graph, 'figure', allow_duplicate=True),  # for show spinner during calculation
             Input(self.command_manager, self.command_manager_prop),
+            State(self.switch_about_sub_sampling, 'value'),
             prevent_initial_call=True,
         )
-        def recalculate_rsm(command):
+        def recalculate_rsm(command, is_sub_sampling):
             # just in case
             if callback_context.triggered_id is None:
                 raise PreventUpdate
@@ -295,12 +316,29 @@ class PredictionModelGraph(AbstractPage):
             if len(self.application.get_df()) == 0:
                 return self.CommandState.redraw.value, no_update  # error handling in the next `redraw_graph()` callback
 
+            # switch the consideration of sub_sampling
+            df = self.application.get_df()
+            equality_filters = {'sub_sampling': float('nan')}
+
+            if self.SUB_SAMPLING_CHECKED in is_sub_sampling:
+                df = get_partial_df(
+                    df,
+                    equality_filters=equality_filters,
+                    method='all-exclude',  # nan 以外 = sampling のみ
+                )
+            else:
+                df = get_partial_df(
+                    df,
+                    equality_filters=equality_filters,
+                    method='all',  # nan のみ全て
+                )
+
             # create model
             model = SingleTaskGPModel()
             self.pyfemtet_model.update_model(model)
             self.pyfemtet_model.fit(
                 self.application.history,
-                self.application.get_df(),
+                df,
                 **{}
             )
 
@@ -475,10 +513,12 @@ class PredictionModelGraph(AbstractPage):
             Output(self.axis3_obj_dropdown, 'children'),
             Output(self.slider_container, 'children'),
             Output(self.slider_stack_data, self.slider_stack_data_prop, allow_duplicate=True),
+            Output(self.switch_about_sub_sampling, 'style'),
             Input(self.location, self.location.Prop.pathname),
+            State(self.switch_about_sub_sampling, 'style'),
             prevent_initial_call=True,
         )
-        def setup_dropdown_and_sliders(*_):
+        def setup_dropdown_and_sliders(_, current_style):
             # just in case
             if callback_context.triggered_id is None:
                 raise PreventUpdate
@@ -578,7 +618,20 @@ class PredictionModelGraph(AbstractPage):
                 )
                 sliders.append(stack)
 
-            return axis1_dropdown_items, axis2_dropdown_items, axis3_dropdown_items, sliders, slider_values
+            # ひとつでも sub sampling があれば visible=True
+            visible = (~df['sub_sampling'].isna()).any()
+            switch_style = control_visibility_by_style(
+                visible, current_style
+            )
+
+            return (
+                axis1_dropdown_items,
+                axis2_dropdown_items,
+                axis3_dropdown_items,
+                sliders,
+                slider_values,
+                switch_style,
+            )
 
         # ===== control dropdown and slider visibility =====
         @app.callback(

pyfemtet/opt/visualization/history_viewer/_helper.py

@@ -26,3 +26,16 @@ def has_full_bound(history: History, prm_name, df: pd.DataFrame = None) -> bool:
         return False
 
     return True
+
+
+def control_visibility_by_style(visible: bool, current_style: dict):
+
+    visibility = 'inline' if visible else 'none'
+    part = {'display': visibility}
+
+    if current_style is None:
+        return part
+
+    else:
+        current_style.update(part)
+        return current_style

pyfemtet/opt/visualization/history_viewer/result_viewer/_pages.py

@@ -14,6 +14,7 @@ from pyfemtet.opt.visualization.history_viewer._base_application import *
 from pyfemtet.opt.visualization.history_viewer._complex_components.main_graph import *
 from pyfemtet.opt.visualization.history_viewer._complex_components.control_femtet import *
 from pyfemtet.opt.visualization.history_viewer._complex_components.alert_region import *
+from pyfemtet.opt.visualization.history_viewer._helper import control_visibility_by_style
 
 from pyfemtet._i18n import Msg, _
 
@@ -752,13 +753,4 @@ class Tutorial(AbstractPage):
 
     @staticmethod
     def control_visibility_by_style(visible: bool, current_style: dict):
-
-        visibility = 'inline' if visible else 'none'
-        part = {'display': visibility}
-
-        if current_style is None:
-            return part
-
-        else:
-            current_style.update(part)
-            return current_style
+        return control_visibility_by_style(visible, current_style)

pyfemtet/opt/visualization/plotter/pm_graph_creator.py

@@ -6,6 +6,7 @@ from pyfemtet._util.df_util import *
 from pyfemtet.opt.history import *
 from pyfemtet.opt.prediction._model import *
 from pyfemtet.opt.prediction._helper import *
+from pyfemtet.opt.problem.problem import MAIN_FIDELITY_NAME
 
 
 __all__ = [
@@ -217,6 +218,32 @@ def _plot(
             name='trial',
         ))
 
+        # sub sampling
+        buff = get_partial_df(
+            df,
+            {'sub_fidelity_name': MAIN_FIDELITY_NAME},
+        )
+        df_main_sub_sampling = get_partial_df(
+            buff,
+            {'sub_sampling': float('nan')},
+            method='all-exclude',
+        )
+        fig.add_trace(go.Scatter3d(
+            x=df_main_sub_sampling[prm_name1],
+            y=df_main_sub_sampling[prm_name2],
+            z=df_main_sub_sampling[obj_name],
+            mode='markers',
+            marker=dict(
+                size=3,
+                line=dict(
+                    width=1,
+                    color='gray',
+                ),
+                symbol='square-open'
+            ),
+            name='trial (sub sampling)',
+        ))
+
         # sub fidelity
         for (
                 sub_fidelity_name,
@@ -228,7 +255,7 @@ def _plot(
             # px.colors.qualitative.G10[::-1]
         ):
 
-            if sub_fidelity_name == MAIN_FILTER:
+            if sub_fidelity_name == MAIN_FIDELITY_NAME:
                 continue
             df_sub = get_partial_df(df, equality_filters=dict(sub_fidelity_name=sub_fidelity_name))
 
@@ -239,7 +266,7 @@ def _plot(
                     size=3,
                     line=dict(
                         width=1,
-                        color='white',
+                        color='green',
                     ),
                     symbol='square-open',  # TODO: sequence 化
                 ),

{pyfemtet-1.1.0.dist-info → pyfemtet-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyfemtet
-Version: 1.1.0
+Version: 1.1.1
 Summary: Design parameter optimization using Femtet.
 License: MIT
 Author: pyfemtet

{pyfemtet-1.1.0.dist-info → pyfemtet-1.1.1.dist-info}/RECORD

@@ -11,7 +11,7 @@ pyfemtet/_i18n/messages.py,sha256=mzTARnpZPZ-Pmcq8RdOyy5a4XGCCSxwxuoHjN_HJ0TM,17
 pyfemtet/_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/_util/closing.py,sha256=JPcgHDbW249YF20bMOX6UX-LquWoCWA14KhX-qFouR4,502
 pyfemtet/_util/dask_util.py,sha256=Wm_1p_LR1yhhZNaGgazf-yQ-eialLfmqtgBjxha6qWk,2159
-pyfemtet/_util/df_util.py,sha256=V38c5avzKEvLiSEDLpdo6eTXxDgasCXn3RB1IUF-bNU,1431
+pyfemtet/_util/df_util.py,sha256=UVJZcTqVe_98aGAqF9Sp4b6BC5c_c3ADRsZ2RUJcN0Y,1889
 pyfemtet/_util/excel_macro_util.py,sha256=pUCpENpM1q6AbC7wH7rMXwnQ7nIFnabQ4xlbsli9VzM,8028
 pyfemtet/_util/excel_parse_util.py,sha256=k8Y5EI9r0txwkieKUzlZqQ93b-9SMXldNIfq5ksWg28,5525
 pyfemtet/_util/femtet_access_inspection.py,sha256=91E-7wzQTZum1UIsccW26717GnTM2jxf3HeOOR7-lv0,3999
@@ -97,9 +97,9 @@ pyfemtet/opt/visualization/history_viewer/_complex_components/alert_region.py,sh
 pyfemtet/opt/visualization/history_viewer/_complex_components/control_femtet.py,sha256=FQUR9bYtMoj_3bvHXfzAhYMoYpbIWcDP8j7M2EwnYQM,6253
 pyfemtet/opt/visualization/history_viewer/_complex_components/detail_graphs.py,sha256=friaHAJOG5BEUAkoy7ukpO-vUhJ0DlJFwMB2ayNJ4so,19134
 pyfemtet/opt/visualization/history_viewer/_complex_components/main_graph.py,sha256=dMphOHbSV2R3oQvPlIQj7GwtV0phPiBwKniblxTAxMY,25978
-pyfemtet/opt/visualization/history_viewer/_complex_components/pm_graph.py,sha256=WtdEogjDl-RxXzw53_N_gyrFHHl6KaJ1ieKBMrFcpcs,27725
+pyfemtet/opt/visualization/history_viewer/_complex_components/pm_graph.py,sha256=-fihXFDe_RdUTjaPepiVMWM4zVYAf6oD8QrPVdvA_wA,29840
 pyfemtet/opt/visualization/history_viewer/_detail_page.py,sha256=2LdCFSCcxZkAH6QMa9q6QX-KLYhVrRf-iTh7jNPrnnA,3406
-pyfemtet/opt/visualization/history_viewer/_helper.py,sha256=b3Tlo2_qAdbe7Hqs520BpVHjYy6jygCn1DFR5B0Ru1M,727
+pyfemtet/opt/visualization/history_viewer/_helper.py,sha256=276488eouQEo-haK4XXCVM1Vy8_28Vyp5g0l7zt4Sfc,1009
 pyfemtet/opt/visualization/history_viewer/_process_monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/history_viewer/_process_monitor/_application.py,sha256=sP2oOIy5u4gtyMq428NKBFECsYxHCJthMFHJkqyWZcI,5956
 pyfemtet/opt/visualization/history_viewer/_process_monitor/_pages.py,sha256=v6ytmJgtBql0pKn7O0UAeyX0P_V_nFX1KW4esBzHdJg,10921
@@ -112,7 +112,7 @@ pyfemtet/opt/visualization/history_viewer/result_viewer/.gitignore,sha256=ryvb4a
 pyfemtet/opt/visualization/history_viewer/result_viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/history_viewer/result_viewer/__main__.py,sha256=5bskvqYMxmgktfoakI19zgy08XlKOkuVhID6MNZNIyE,154
 pyfemtet/opt/visualization/history_viewer/result_viewer/_application.py,sha256=iq9Eyj0G7vtz-SGmkr8n4tVjmyARz5_qKd3UGZH7gTQ,1764
-pyfemtet/opt/visualization/history_viewer/result_viewer/_pages.py,sha256=bJIq-Spp9C7EkUH7re0HqWPLdvwXYf3sX30sVshRrKE,33352
+pyfemtet/opt/visualization/history_viewer/result_viewer/_pages.py,sha256=vUZXg1uKPyGeXpnz_uUOFfIjWlRObYKWa7cutGy7RPc,33270
 pyfemtet/opt/visualization/history_viewer/result_viewer/tutorial_files/tutorial_gau_ex08.csv,sha256=O-6cGVjr4xMYgpkGUDyfm02ccE42cE9DyLl7ioeGbL0,3319
 pyfemtet/opt/visualization/history_viewer/result_viewer/tutorial_files/tutorial_gau_ex08.db,sha256=4WWrvxgWAFdL36Kk7XxK02RvZbOgGkVMerrRfoF_oJw,122880
 pyfemtet/opt/visualization/history_viewer/result_viewer/tutorial_files/tutorial_gau_ex08_parametric.Results/ex8.jpg,sha256=yC5EAxhDCB2Vm0eKH1Ufjp7vdt1GPQWr9Y3rlay-U2E,49141
@@ -168,12 +168,12 @@ pyfemtet/opt/visualization/plotter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 pyfemtet/opt/visualization/plotter/contour_creator.py,sha256=bvGGWNBLZawHq0fAIHfZOUAXw0f9GTlNROiJThoXZ2A,3043
 pyfemtet/opt/visualization/plotter/main_figure_creator.py,sha256=a_HK6EUruQBncI8vEIZnrDorPr2EdPICLKU4Er97WtQ,17761
 pyfemtet/opt/visualization/plotter/parallel_plot_creator.py,sha256=VRhT0CUG1mCHDoVO8e6LR_-FiD0QB3GsB95016iXmYc,802
-pyfemtet/opt/visualization/plotter/pm_graph_creator.py,sha256=V26HIbPF1jEVAZ9r1Izsi2zcVz84l4RhZUTJV9jPqp8,11019
+pyfemtet/opt/visualization/plotter/pm_graph_creator.py,sha256=7EwmoJlnHwDrpw65NchiA63FIjgGTLq6vTcpTzrSnJo,11841
 pyfemtet/opt/wat_ex14_parametric_jp.femprj,sha256=dMwQMt6yok_PbZLyxPYdmg5wJQwgQDZ4RhS76zdGLGk,177944
 pyfemtet/opt/worker_status.py,sha256=xSVW9lcw5jzYBwnmlVzk-1zCCyvmXVOH6EoRjqVbE9M,3605
-pyfemtet-1.1.0.dist-info/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
-pyfemtet-1.1.0.dist-info/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
-pyfemtet-1.1.0.dist-info/METADATA,sha256=U-_Mn8IbOEgQjZ6IGa85S6pccNEW6Mq_t8XtkW2svVY,3503
-pyfemtet-1.1.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pyfemtet-1.1.0.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
-pyfemtet-1.1.0.dist-info/RECORD,,
+pyfemtet-1.1.1.dist-info/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
+pyfemtet-1.1.1.dist-info/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
+pyfemtet-1.1.1.dist-info/METADATA,sha256=S8YJfsDcQoxdsbLRUw8e_oaz8NXCc76t4dXpi_kpc58,3503
+pyfemtet-1.1.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pyfemtet-1.1.1.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
+pyfemtet-1.1.1.dist-info/RECORD,,