pyfemtet 0.6.2__py3-none-any.whl → 0.6.3__py3-none-any.whl

pyfemtet/opt/visualization/_complex_components/main_figure_creator.py

@@ -103,35 +103,96 @@ def _get_single_objective_plot(history, df):
     df.columns = [c.replace(' / ', '<BR>/ ') for c in df.columns]
     obj_name = obj_name.replace(' / ', '<BR>/ ')
 
-    fig = px.scatter(
-        df,
-        x='trial',
-        y=obj_name,
-        symbol=_ls.feasible['label'],
-        symbol_map={
-            _ls.feasible[True]: _ss.feasible[True],
-            _ls.feasible[False]: _ss.feasible[False],
-        },
-        hover_data={
-            _ls.feasible['label']: False,
-            'trial': True,
-        },
-        custom_data=['trial'],
-    )
+    # ===== base figure =====
+    fig = go.Figure()
 
+    # ===== i 番目が、その時点までで最適かどうか =====
+    # その時点までの最適な点 index
+    indices = []
+    anti_indices = []
+    objectives = df[obj_name].values
+    objective_directions = df[f'{obj_name}_direction'].values
+    for i, (obj, direction) in enumerate(zip(objectives, objective_directions)):
+        # DESCRIPTION: 最適化中に direction は変化しない前提
+        if direction == 'maximize':
+            if obj == max(objectives[:i+1]):
+                indices.append(i)
+            else:
+                anti_indices.append(i)
+        elif direction == 'minimize':
+            if obj == min(objectives[:i+1]):
+                indices.append(i)
+            else:
+                anti_indices.append(i)
+        else:
+            residuals = (objectives - objective_directions) ** 2
+            residual = residuals[i]
+            if residual == min(residuals[:i+1]):
+                indices.append(i)
+            else:
+                anti_indices.append(i)
+
+    # ===== 最適でない点を灰色で打つ =====
     fig.add_trace(
         go.Scatter(
             x=df['trial'],
             y=df[obj_name],
-            mode="lines",
-            line=go.scatter.Line(
-                width=0.5,
-                color='#6c757d',
-            ),
-            showlegend=False
+            customdata=df['trial'].values.reshape((-1, 1)),
+            # x=df['trial'][anti_indices],
+            # y=df[obj_name][anti_indices],
+            # customdata=df['trial'][anti_indices].values.reshape((-1, 1)),
+            mode="markers",
+            marker=dict(color='#6c757d', size=6),
+            name=Msg.LEGEND_LABEL_ALL_SOLUTIONS,
         )
     )
 
+    # ===== その時点までの最小の点を青で打つ =====
+    fig.add_trace(
+        go.Scatter(
+            x=df['trial'][indices],
+            y=df[obj_name][indices],
+            mode="markers+lines",
+            marker=dict(color='#007bff', size=9),
+            name=Msg.LEGEND_LABEL_OPTIMAL_SOLUTIONS,
+            line=dict(width=1, color='#6c757d',),
+            customdata=df['trial'][indices].values.reshape((-1, 1)),
+            legendgroup='optimal',
+        )
+    )
+
+    # ===== その時点までの最小の点から現在までの平行点線を引く =====
+    if len(indices) > 1:
+        x = [df['trial'][indices].iloc[-1], df['trial'].iloc[-1]]
+        y = [df[obj_name][indices].iloc[-1]] * 2
+        fig.add_trace(
+            go.Scatter(
+                x=x,
+                y=y,
+                mode="lines",
+                line=dict(width=0.5, color='#6c757d', dash='dash'),
+                showlegend=False,
+                legendgroup='optimal',
+            )
+        )
+
+    # ===== direction が float の場合、目標値を描く =====
+    if len(df) > 1:
+        if isinstance(objective_directions[0], float):
+            x = [df['trial'].iloc[0], df['trial'].iloc[-1]]
+            y = [objective_directions[0]] * 2
+            fig.add_trace(
+                go.Scatter(
+                    x=x,
+                    y=y,
+                    mode="lines",
+                    line=dict(width=0.5, color='#FF2400', dash='dash'),
+                    name=Msg.LEGEND_LABEL_OBJECTIVE_TARGET,
+                )
+            )
+
+
+    # ===== layout =====
     fig.update_layout(
         dict(
             title_text=Msg.GRAPH_TITLE_SINGLE_OBJECTIVE,

{pyfemtet-0.6.2.dist-info → pyfemtet-0.6.3.dist-info}/METADATA

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

{pyfemtet-0.6.2.dist-info → pyfemtet-0.6.3.dist-info}/RECORD

@@ -1,34 +1,38 @@
-pyfemtet/__init__.py,sha256=d7NGuoje3vHyudKIFR_PmfKozIOKDFvAhGx0QXiyuMw,21
-pyfemtet/_message/1. make_pot.bat,sha256=oS38xYsaUnQAuKwUR8hZJFgt3AKBU993fWFDSg2ROz4,570
-pyfemtet/_message/2. make_mo.bat,sha256=nqUi3Cze7JGKkYItlch8ZG2gSbRNZiS2ltuCS7DbmG8,154
+pyfemtet/__init__.py,sha256=_SsQ0ZcyZbUqlFFT370nQxs8UER9D0oW_EmCr4Q-hx4,21
+pyfemtet/_femtet_config_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyfemtet/_femtet_config_util/autosave.py,sha256=e-_GJdiJ5un7iuTet3bK5vwwq4Aqh7B_YVTANDJfZl8,1383
+pyfemtet/_femtet_config_util/exit.py,sha256=sx8Wcepgi-lL5qJpJl6WvlzbeVheU9_Dtf1f38mmoTo,1822
+pyfemtet/_message/1. make_pot.bat,sha256=wrTA0YaL7nUfNB0cS8zljOmwq2qgyG6RMwHQbrwjvY4,476
+pyfemtet/_message/2. make_mo.bat,sha256=6shJ3Yn4BXjDc0hhv_kiGUtVTq4oSRz8-iS4vW29rNE,155
 pyfemtet/_message/__init__.py,sha256=gE1-XX_PzHj9BbhqPaK5VcIHuv6_Tec5qlPMC3IRiBg,100
-pyfemtet/_message/babel.cfg,sha256=rlvsm_EjDU2ki-OLVPG3toWspVuVA0JFAFvFp2U-By4,72
-pyfemtet/_message/locales/ja/LC_MESSAGES/messages.po,sha256=-w0xpgwHjQoZtqQwjLVL464ICYqb9kj03f-qAdIY9fk,24125
-pyfemtet/_message/locales/messages.pot,sha256=jwgOPidxH6wT76sXQD6XIzDLGzYnv9SRt6tHTCd1xx0,14143
-pyfemtet/_message/messages.py,sha256=tz1D_yncQz2mrPDRXWyiAW2aPj8_uD_py_VufbCcCVg,13188
-pyfemtet/_warning.py,sha256=QgZvm1eJI09FUh8E5qJE4vCLrHnUIoQ0C9KmZDA05A4,616
+pyfemtet/_message/babel.cfg,sha256=AQIFCQ7NlAA84PhV0gowHhbIXH41zA55mzhgyROniJk,73
+pyfemtet/_message/locales/ja/LC_MESSAGES/messages.po,sha256=F2bJGHVMtk086pekjVwY2dluCSl7qeYPgJe1A9CSrxA,24526
+pyfemtet/_message/locales/messages.pot,sha256=8Yjf462pJdEtxBLySKT34zMG5CH5uLB_8VaJQll_QsY,14493
+pyfemtet/_message/messages.py,sha256=F8ENLZKoHq5irn-Ag7rqA3aSDsTmRWDyNHvOLY76ROI,13368
+pyfemtet/_warning.py,sha256=FaWDmGJVgIF4oDTDSRZNvEEDt3-N5HD9WrHshLSA0zc,2052
 pyfemtet/core.py,sha256=3lqfBGJ5IuKz2Nqj5pRo7YQqKwx_0ZDL72u95Ur_1p0,1386
 pyfemtet/dispatch_extensions/__init__.py,sha256=MI9b6oIS2IXnTNHy8jvZ4QURdTHQd9PN-gifYxqVvk4,272
 pyfemtet/dispatch_extensions/_impl.py,sha256=HU7rKRAzEe5yYukWrKtdi1aIbUas_kLyaa_KZZGCELE,16244
 pyfemtet/logger/__init__.py,sha256=DZNTD9BboiFU9LOiyPKi_Y6gWAga5f1lWkVoq7LV_y0,71
 pyfemtet/logger/_impl.py,sha256=ZN5Rj3kb9UEGFt5KSLlzwfrLF_SAoOxgPBkadwh2Y8w,2825
 pyfemtet/opt/__init__.py,sha256=wRR8LbEhb5I6MUgmnCgjB6-tqHlOVxDIo7yPkq0QbBs,758
-pyfemtet/opt/_femopt.py,sha256=v9qnH9e99nSFhxOwgkf45_i4f84SyV5ExfNr9fFgl6k,36666
+pyfemtet/opt/_femopt.py,sha256=h3DQpwdNyPDU9jxc52DEsHaDWO1mVnA4hOT5_omXglo,37377
 pyfemtet/opt/_femopt_core.py,sha256=Sn13SI1r5OvSu6C9XjkqTrFz2IgO_vMszIAgA-gx-TU,34348
 pyfemtet/opt/_test_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/_test_utils/control_femtet.py,sha256=Oy2MmNS-LhUXF9rKLa8AXAfJhppIQI8Nha8LmEZflmk,1169
 pyfemtet/opt/_test_utils/hyper_sphere.py,sha256=nQhw8EIY0DwvcTqrbKhkxiITLZifr4-nG77E-_6ggmA,700
-pyfemtet/opt/_test_utils/record_history.py,sha256=YzZ8nlyXjw3t0K1kfB8aPka8r058sfx78qspM_vYIIU,2513
+pyfemtet/opt/_test_utils/record_history.py,sha256=JCNJLZMCNTpJ6VT7iwEt2DIbwmsuQmgC0ClQSfcatj4,3915
 pyfemtet/opt/interface/__init__.py,sha256=5hel-mP6tuxzIEJFMZJZWUEWEbFSsskzCWlQ3HORTYI,466
-pyfemtet/opt/interface/_base.py,sha256=oG2V6UAID2SBOsl68T6TJ0LjC0jkbP41nXQy8k_ybSc,2363
-pyfemtet/opt/interface/_femtet.py,sha256=S24WXISnU8DqqxSB1HX14wQBniPQC9FFLankBtCTIiM,37372
+pyfemtet/opt/interface/_base.py,sha256=aPJ55dTp4-Q4KMkUZVRlquuBBWWOIOdC6yQsYZR4Jy0,2626
+pyfemtet/opt/interface/_excel_interface.py,sha256=ms-o31hZ6dM_gUqlXWoeodRvwZwNMnRuVuM-x6JJh9E,16483
+pyfemtet/opt/interface/_femtet.py,sha256=dmKyRG8sWuX2JHjcXpvJ2q632oZh4I94iVo4u7Z7w_M,34742
 pyfemtet/opt/interface/_femtet_parametric.py,sha256=KDG8SB43AgwuhpCStjvx10G0RzyHhga6k4dfvp0gvYU,2175
 pyfemtet/opt/interface/_femtet_with_nx/__init__.py,sha256=-6W2g2FDEcKzGHmI5KAKQe-4U5jDpMj0CXuma-GZca0,83
 pyfemtet/opt/interface/_femtet_with_nx/_interface.py,sha256=BXWdzIFcId1EovpbRD5DmkW0BwqhpDvOuGBv9kdCGy8,5994
 pyfemtet/opt/interface/_femtet_with_nx/update_model.py,sha256=P7VH0i_o-X9OUe6AGaLF1fACPeHNrMjcrOBCA3MMrI4,3092
-pyfemtet/opt/interface/_femtet_with_sldworks.py,sha256=NeNw1sqAL_kOrmrrcljrPwi_hBSA-LRU9MOqI_pjQXs,6836
+pyfemtet/opt/interface/_femtet_with_sldworks.py,sha256=4QvwcHP_L4QMHcwKf_vnuWIV-68uIqmtDh0NNaavJjg,6853
 pyfemtet/opt/optimizer/__init__.py,sha256=Ia6viowECkG0IFXtFef0tJ4jDKsoDzJLqMJ9xLFH2LQ,543
-pyfemtet/opt/optimizer/_base.py,sha256=-vfJ42GzofjVOB9-Cpf7J5fnuQ6fjZsAgozkMf1Ba6s,12147
+pyfemtet/opt/optimizer/_base.py,sha256=0jX68VEfLI08Qr01BvfPCHKKlr3Bj6gWQ0T81qpX0y4,12507
 pyfemtet/opt/optimizer/_optuna/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/optimizer/_optuna/_botorch_patch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/optimizer/_optuna/_botorch_patch/enable_nonlinear_constraint.py,sha256=2hUP2c8mokkRaSQ8nXxgCCmz8e0JKvEz8R2qIGnTGm0,8863
@@ -95,7 +99,7 @@ pyfemtet/opt/visualization/_base.py,sha256=k0PDvqNKn7sFYIgajWykOTgFztlu5_1bc-xfQ
 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/main_figure_creator.py,sha256=8BhugjLPipDdiWioHjEYiys5h5ezYJTBx2r702b-U1A,6950
+pyfemtet/opt/visualization/_complex_components/main_figure_creator.py,sha256=YRV3SK_N6f8FbWTxCcbibkPKyIbgA7CPyCcGBdaKBpU,9455
 pyfemtet/opt/visualization/_complex_components/main_graph.py,sha256=Med4fVTHPhmQXyyMjGcjdCacwOMp4JblAaLKdz_6gVQ,21533
 pyfemtet/opt/visualization/_complex_components/pm_graph.py,sha256=hX0OoJIUqqO4W1bqP1zaQUU2EjRzCg-pMhixkhJEAoA,24926
 pyfemtet/opt/visualization/_complex_components/pm_graph_creator.py,sha256=f-ikYAPChazqyRQ0Y-tKrYrMBHzFHJJ4uV6QXBEBRKI,7304
@@ -112,8 +116,8 @@ pyfemtet/opt/visualization/result_viewer/.gitignore,sha256=ryvb4aqbbsHireHWlPQfx
 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=laEAKHAtdshCAHxgXo-zMNg3RP6lCxfszO3XwLnF1dU,32156
-pyfemtet-0.6.2.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.6.2.dist-info/METADATA,sha256=e2iOiF_a7eF57VrVUBinZJQszajDEKS6RTzf0FNDJi0,3287
-pyfemtet-0.6.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pyfemtet-0.6.2.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.6.2.dist-info/RECORD,,
+pyfemtet-0.6.3.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
+pyfemtet-0.6.3.dist-info/METADATA,sha256=l89gTkV_ub72Kqh496W02gf0nmGVwcYC-8w2-Us9zNk,3287
+pyfemtet-0.6.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pyfemtet-0.6.3.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.6.3.dist-info/RECORD,,