pyfemtet 1.0.5__py3-none-any.whl → 1.0.7__py3-none-any.whl

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

@@ -722,6 +722,7 @@ class Tutorial(AbstractPage):
                 parameters=history._records.column_manager.parameters,
                 obj_names=history.obj_names,
                 cns_names=history.cns_names,
+                other_output_names=history.other_output_names,
                 sub_fidelity_names=history.sub_fidelity_names,
                 additional_data=additional_data,
             )

pyfemtet/opt/visualization/plotter/contour_creator.py

@@ -0,0 +1,105 @@
+import pandas as pd
+import plotly.graph_objects as go
+from plotly.subplots import make_subplots
+
+from pyfemtet.logger import get_module_logger
+
+
+__all__ = [
+    'contour_creator',
+]
+
+
+def contour_creator(df: pd.DataFrame) -> go.Figure | str:
+
+    logger = get_module_logger('opt.contour_creator')
+
+    target_column = tuple(df.columns)[-1]
+    explain_columns = [column for column in df.columns if column != target_column]
+
+    subplots = make_subplots(
+        rows=len(explain_columns),
+        cols=len(explain_columns),
+        shared_xaxes=True,
+        shared_yaxes=True,
+        row_titles=explain_columns,
+        column_titles=explain_columns,
+        start_cell='bottom-left',
+    )
+
+    is_first = True
+
+    for r, r_key in enumerate(explain_columns):
+        for c, c_key in enumerate(explain_columns):
+
+            r_dtype = df.dtypes[r_key]
+            c_dtype = df.dtypes[c_key]
+
+            if not ('float' in r_dtype.name or 'int' in r_dtype.name):
+                logger.error(f'dtype is {r_dtype}. Not implemented.')
+                return 'Not implemented: including categorical parameters.'
+            if not ('float' in c_dtype.name or 'int' in c_dtype.name):
+                logger.error(f'dtype is {c_dtype}. Not implemented.')
+                return 'Not implemented: including categorical parameters.'
+
+            x = df[c_key]
+            y = df[r_key]
+            z = df[target_column]
+
+            scatter = go.Scatter(
+                x=x, y=y, mode='markers',
+                marker=go.scatter.Marker(
+                    symbol='circle',
+                    color='black',
+                    size=5,
+                    line=dict(
+                        color='white',
+                        width=1,
+                    )
+                ),
+                name='points (click to switch visibility)',
+                legendgroup='points (click to switch visibility)',
+                showlegend=is_first,
+            )
+
+            is_first = False
+
+            if r == c:
+                pass
+
+            else:
+
+                contour = go.Contour(
+                    x=x, y=y, z=z,
+                    connectgaps=True,
+                    name=f'contour of\n{target_column}',
+                    colorscale='Turbo',
+                )
+
+                subplots.add_trace(contour, row=r + 1, col=c + 1)
+
+            subplots.add_trace(scatter, row=r + 1, col=c + 1)
+            subplots.update_layout(
+                legend=dict(
+                    orientation='h',
+                    xanchor='center',
+                    x=0.5,
+                    yanchor='bottom',
+                    y=-0.2,
+                    bgcolor='rgba(0, 0, 0, 0.15)',
+                ),
+                # margin=dict(b=50),
+            )
+
+    return subplots
+
+
+if __name__ == '__main__':
+    import numpy as np
+    contour_creator(pd.DataFrame(dict(
+        x1=np.random.rand(20),
+        x2=np.random.rand(20),
+        x3=np.random.rand(20),
+        x4=np.random.rand(20),
+        y=np.random.rand(20),
+    ))).show()

pyfemtet/opt/visualization/plotter/parallel_plot_creator.py

@@ -0,0 +1,33 @@
+import pandas as pd
+import plotly.graph_objects as go
+import plotly.express as px
+
+from pyfemtet.logger import get_module_logger
+
+
+__all__ = [
+    'parallel_plot',
+]
+
+
+def parallel_plot(df: pd.DataFrame) -> go.Figure | str:
+
+    logger = get_module_logger('opt.parallel_plot')
+
+    if any([
+        not ('float' in dtype.name or 'int' in dtype.name)
+        for dtype in df.dtypes.values
+    ]):
+        logger.error('Not implemented: including categorical parameters.')
+        # fig = px.parallel_categories()
+        fig = 'Not implemented: including categorical parameters.'
+
+    else:
+        fig = px.parallel_coordinates(
+            df,
+            dimensions=df.columns,
+            color=df.columns[-1],
+            color_continuous_scale=px.colors.sequential.Turbo
+        )
+
+    return fig

pyfemtet/opt/visualization/plotter/pm_graph_creator.py

@@ -341,18 +341,18 @@ def _plot(
         # layout
         fig.update_layout(
             title=_('Prediction Model'),
-            xaxis_title=prm_name1,
-            yaxis_title=obj_name,
+            scene=dict(
+                xaxis=dict(title=dict(text=prm_name1)),
+                yaxis=dict(title=dict(text=prm_name2)),
+                zaxis=dict(title=dict(text=obj_name)),
+            ),
         )
 
     else:
         fig.update_layout(
             title=_('Prediction Model'),
-            scene=dict(
-                xaxis_title=prm_name1,
-                yaxis_title=prm_name2,
-                zaxis_title=obj_name
-            ),
+            xaxis=dict(title=dict(text=prm_name1)),
+            yaxis=dict(title=dict(text=obj_name)),
             margin=dict(l=0, r=0, b=0, t=30),
         )
 

{pyfemtet-1.0.5.dist-info → pyfemtet-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyfemtet
-Version: 1.0.5
+Version: 1.0.7
 Summary: Design parameter optimization using Femtet.
 License: MIT
 Author: kazuma.naito

{pyfemtet-1.0.5.dist-info → pyfemtet-1.0.7.dist-info}/RECORD

@@ -29,9 +29,9 @@ pyfemtet/logger/__init__.py,sha256=lofBrZHr0P1hsxPUiPG1SQqKxCuSBk8zGnR7vUfCHYw,5
 pyfemtet/logger/_impl.py,sha256=uJ9el3kR-A4W2DvO_G5A6k9z2u1lkyl7GSvZ68uPy-U,6321
 pyfemtet/opt/__init__.py,sha256=1LcwTddtoi8plemxkzmX0YEKiNpAZvKn9OoNQysyDLE,339
 pyfemtet/opt/exceptions.py,sha256=M_O7jm20Y4e_QxsKF6tnEl-OrAtErUOj6hNT7eEXCO4,1327
-pyfemtet/opt/femopt.py,sha256=Ufp9qJuJIEtP_lJtR-FeCkGtH_Us8imlJ1c-FVrVyLU,23186
+pyfemtet/opt/femopt.py,sha256=4DqNhhykJKlE6g0aPv3MAG_Yrgzly84RE97MD_htQ6U,23438
 pyfemtet/opt/history/__init__.py,sha256=pUp3SO4R7RGzmpNDLBg_pQH0X2yzBd-oqsHXWmB33os,201
-pyfemtet/opt/history/_history.py,sha256=wyj0omvisQWz-BZ5mIFPyTJhJ77izOtdkGgjN6G4ZDA,51033
+pyfemtet/opt/history/_history.py,sha256=5b9ACZdsAL2pr0rcSQkTpHGcSKynxuCQo8ml44cfKtw,53492
 pyfemtet/opt/history/_hypervolume.py,sha256=_IvGH71ZNreWvDQCG815Q2hS1OEvPFPQhUnNXf1UxRQ,4449
 pyfemtet/opt/history/_optimality.py,sha256=6vLySZmrrklr04Qir0hGethTykf8NYFod88NDGrBrG0,2407
 pyfemtet/opt/interface/__init__.py,sha256=wiVSUlzLF_6gFXBw0T_JOKOOg5l5SJ24-HfaYWp7E0Y,1459
@@ -63,7 +63,7 @@ pyfemtet/opt/meta_script/__main__.py,sha256=9-QM6eZOLpZ_CxERpRu3RAMqpudorSJdPCiK
 pyfemtet/opt/meta_script/sample/sample.bas,sha256=2iuSYMgPDyAdiSDVGxRu3avjcZYnULz0l8e25YBa7SQ,27966
 pyfemtet/opt/meta_script/sample/sample.femprj,sha256=6_0ywhgXxZjdzZzQFog8mgMUEjKNCFVNlEgAWoptovk,292885
 pyfemtet/opt/optimizer/__init__.py,sha256=A4QYeF0KHEFdwoxLfkDND7ikDQ186Ryy3oXEGdakFSg,463
-pyfemtet/opt/optimizer/_base_optimizer.py,sha256=GVE4HKQI-l0WvVM3xmrm3sQ04A9tJKfiA-5SECfG6aM,31683
+pyfemtet/opt/optimizer/_base_optimizer.py,sha256=4Jcnj5WTKXpuHzMgjsBk1W8nhUbbBFfHUybQF2jB5kw,33495
 pyfemtet/opt/optimizer/optuna_optimizer/__init__.py,sha256=u2Bwc79tkZTU5dMbhzzrPQi0RlFg22UgXc-m9K9G6wQ,242
 pyfemtet/opt/optimizer/optuna_optimizer/_optuna_attribute.py,sha256=7eZsruVCGgMlcnf3a9Vf55FOEE-D7V777MJQajI12Cw,1842
 pyfemtet/opt/optimizer/optuna_optimizer/_optuna_optimizer.py,sha256=UWD2o0pUqsQg8ZGE2J847czmNYmAbXvQpVSsDxWmElI,28772
@@ -80,10 +80,10 @@ pyfemtet/opt/prediction/_gpytorch_modules_extension.py,sha256=B_qUtFn06dQENOmUOO
 pyfemtet/opt/prediction/_helper.py,sha256=7MyVSISOVqBksKxLAE-cCbsVLcAJPbadNWUlk4-q5Ew,4370
 pyfemtet/opt/prediction/_model.py,sha256=rqp_CT3c3ddu-pT2f2_msoQjlv0CVKS2B5OyD45gVEE,3873
 pyfemtet/opt/problem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyfemtet/opt/problem/problem.py,sha256=ohdZ450XH4YoFK4T9t52t8BSja6DpFTfMePQM1DdllU,9782
+pyfemtet/opt/problem/problem.py,sha256=X9mro2yVJ6Uw9ck0F0OjG-0M2ReKtuWltu-JUEFIkzQ,10025
 pyfemtet/opt/problem/variable_manager/__init__.py,sha256=uzuraWUZfLzB3uZHIQHFL7uMxWvv7Oaf940zEozXtNY,476
 pyfemtet/opt/problem/variable_manager/_string_as_expression.py,sha256=aTJ9W9Gs6BS0Z_OsxWByJs9dAt32opD2_9913MCggPg,3626
-pyfemtet/opt/problem/variable_manager/_variable_manager.py,sha256=XrcmFIfE4J_5zkz4Yx6j4QyDAuJX3M2zJ4wESf8oE1Q,12697
+pyfemtet/opt/problem/variable_manager/_variable_manager.py,sha256=o6wtaHlgZ-1gbMrLrZYX555M_gTkLDO4p-VHIXE42-k,12725
 pyfemtet/opt/visualization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/_create_wrapped_components.py,sha256=9AltJHr1DM6imZfpNp867rC-uAYqQ-emdgTLChKDrl8,2513
 pyfemtet/opt/visualization/history_viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -93,10 +93,12 @@ pyfemtet/opt/visualization/history_viewer/_common_pages.py,sha256=uslb21IG3Ll58H
 pyfemtet/opt/visualization/history_viewer/_complex_components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/history_viewer/_complex_components/alert_region.py,sha256=0plsq5cqVFiPPYCLtvDlmf_S_onjyOhrWvU2aWcQ-8o,2097
 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=JafoGlLGFrOH7XQe46DWjg5TftqVs27gpLO4sEBssF8,24769
+pyfemtet/opt/visualization/history_viewer/_detail_page.py,sha256=2LdCFSCcxZkAH6QMa9q6QX-KLYhVrRf-iTh7jNPrnnA,3406
 pyfemtet/opt/visualization/history_viewer/_process_monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyfemtet/opt/visualization/history_viewer/_process_monitor/_application.py,sha256=XROddkYHVVgy8QsQxUpqdcwFsl4NGRwde_98YfNMtiI,5888
+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
 pyfemtet/opt/visualization/history_viewer/_wrapped_components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/history_viewer/_wrapped_components/dbc.py,sha256=8kCNhr1HZOgKc6XV5VLUjiEEjqraPcx9p2f_X-r9uDM,42130
@@ -106,8 +108,8 @@ pyfemtet/opt/visualization/history_viewer/_wrapped_components/str_enum.py,sha256
 pyfemtet/opt/visualization/history_viewer/result_viewer/.gitignore,sha256=ryvb4aqbbsHireHWlPQfxxqDHQJo6YkVYhE9imKt0b8,6
 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=bhAi8xraVhOmjjY-RhFGIW8zjCOVJnw3wwdbr8rAOa0,1696
-pyfemtet/opt/visualization/history_viewer/result_viewer/_pages.py,sha256=9Z1EAAvBiEC6oTKk4Y_8AEZFMGVwVlCqk_dutIk11WA,33313
+pyfemtet/opt/visualization/history_viewer/result_viewer/_application.py,sha256=iq9Eyj0G7vtz-SGmkr8n4tVjmyARz5_qKd3UGZH7gTQ,1764
+pyfemtet/opt/visualization/history_viewer/result_viewer/_pages.py,sha256=4QAVY2GUtfqActhZlCEAFcBwOL8hSTEWEOGsa478_tg,33376
 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
@@ -160,13 +162,15 @@ pyfemtet/opt/visualization/history_viewer/result_viewer/tutorial_files/tutorial_
 pyfemtet/opt/visualization/history_viewer/result_viewer/tutorial_files/tutorial_gau_ex08_parametric.Results/ex8_trial_9.pdt,sha256=LTC70uuGAtMvY0i-LNqOMvvSp4X8uVEDvugJ31jsp6o,6828366
 pyfemtet/opt/visualization/history_viewer/result_viewer/tutorial_files/tutorial_gau_ex08_parametric.femprj,sha256=uPqOara56FAt_T4x2P6tvcIXnISw_fX7RECbVoJlAFs,280214
 pyfemtet/opt/visualization/plotter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyfemtet/opt/visualization/plotter/contour_creator.py,sha256=bvGGWNBLZawHq0fAIHfZOUAXw0f9GTlNROiJThoXZ2A,3043
 pyfemtet/opt/visualization/plotter/main_figure_creator.py,sha256=9RXz6Wt52MiSz3Hbew6sDq6KZrYU8ojvhCTHSEup6Ys,16403
-pyfemtet/opt/visualization/plotter/pm_graph_creator.py,sha256=hUvvYeckMhkE1nH0FAOkXrA5K3A8PbfpxKYaYnBllB4,10864
+pyfemtet/opt/visualization/plotter/parallel_plot_creator.py,sha256=VRhT0CUG1mCHDoVO8e6LR_-FiD0QB3GsB95016iXmYc,802
+pyfemtet/opt/visualization/plotter/pm_graph_creator.py,sha256=hds2Z9jGnj4exFrj-gdfr4RmvfmzhsfHItKeKKC7Wt4,10950
 pyfemtet/opt/wat_ex14_parametric_jp.femprj,sha256=dMwQMt6yok_PbZLyxPYdmg5wJQwgQDZ4RhS76zdGLGk,177944
 pyfemtet/opt/worker_status.py,sha256=xSVW9lcw5jzYBwnmlVzk-1zCCyvmXVOH6EoRjqVbE9M,3605
-pyfemtet-1.0.5.dist-info/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
-pyfemtet-1.0.5.dist-info/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
-pyfemtet-1.0.5.dist-info/METADATA,sha256=yorqWz1uHFA05tLR0Mr7nGJTc9vBjfEOWx0J4Z6ww9U,3471
-pyfemtet-1.0.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pyfemtet-1.0.5.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
-pyfemtet-1.0.5.dist-info/RECORD,,
+pyfemtet-1.0.7.dist-info/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
+pyfemtet-1.0.7.dist-info/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
+pyfemtet-1.0.7.dist-info/METADATA,sha256=O8oC45bYbEfJHUGtf04oNkwwBq-HEMMHsX-xYGz56tI,3471
+pyfemtet-1.0.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pyfemtet-1.0.7.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
+pyfemtet-1.0.7.dist-info/RECORD,,