pyfemtet 1.0.6__py3-none-any.whl → 1.0.8__py3-none-any.whl

pyfemtet/opt/optimizer/_base_optimizer.py

@@ -647,6 +647,7 @@ class AbstractOptimizer:
                 other_outputs = TrialFunctionOutput()
                 try:
                     opt_._other_outputs(other_outputs)
+                    record.other_outputs = other_outputs
 
                 # if intentional error (by user)
                 except _HiddenConstraintViolation as e:

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

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Literal
+from typing import Literal, TypeAlias
 
 import pandas as pd
 import optuna
@@ -21,6 +21,9 @@ from pyfemtet.opt.visualization.plotter.parallel_plot_creator import parallel_pl
 from pyfemtet.opt.visualization.plotter.contour_creator import contour_creator
 
 
+ItemKind: TypeAlias = Literal['prm', 'all_output', 'obj', 'cns', 'other_output']
+
+
 class SelectablePlot(AbstractPage):
     location: dcc.Location
     graph: dcc.Graph
@@ -29,8 +32,8 @@ class SelectablePlot(AbstractPage):
     InputItemsClass = dcc.Checklist
     OutputItemsClass = dcc.Checklist
     alerts: html.Div
-    input_item_kind: set[Literal['all', 'prm', 'obj', 'cns']] = {'prm'}
-    output_item_kind: set[Literal['all', 'prm', 'obj', 'cns']] = {'obj', 'cns'}
+    input_item_kind: set[ItemKind] = {'prm'}
+    output_item_kind: set[ItemKind] = {'all_output'}
     description_markdown: str = ''
 
     def __init__(self, title='base-page', rel_url='/', application=None,
@@ -109,21 +112,23 @@ class SelectablePlot(AbstractPage):
         return history, df, main_df
 
     @staticmethod
-    def _return_checklist_options_and_value(history, types) -> tuple[list[dict], list[str]]:
+    def _return_checklist_options_and_value(history, types: set[Literal]) -> tuple[list[dict], list[str]]:
 
         keys = []
 
-        if 'all' in types:
-            keys.extend(history.prm_names)
-            keys.extend(history.obj_names)
-            keys.extend(history.cns_names)
-
         if 'prm' in types:
             keys.extend(history.prm_names)
-        if 'obj' in types:
-            keys.extend(history.obj_names)
-        if 'cns' in types:
-            keys.extend(history.cns_names)
+
+        if 'all_output' in types:
+            keys.extend(history.all_output_names)
+
+        else:
+            if 'obj' in types:
+                keys.extend(history.obj_names)
+            if 'cns' in types:
+                keys.extend(history.cns_names)
+            if 'other_output' in types:
+                keys.extend(history.other_output_names)
 
         return [dict(label=key, value=key) for key in keys], keys
 

{pyfemtet-1.0.6.dist-info → pyfemtet-1.0.8.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.3
 Name: pyfemtet
-Version: 1.0.6
+Version: 1.0.8
 Summary: Design parameter optimization using Femtet.
 License: MIT
-Author: kazuma.naito
+Author: pyfemtet
 Author-email: 148934231+pyfemtet@users.noreply.github.com
 Requires-Python: >= 3.10, < 3.14
 Classifier: License :: OSI Approved :: MIT License

{pyfemtet-1.0.6.dist-info → pyfemtet-1.0.8.dist-info}/RECORD

@@ -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=WmRl4RvwVVenq6seU7sG7p8U4pFKPcVgLRfBOvQgpY8,33438
+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
@@ -93,7 +93,7 @@ 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=iZ-LcXUUPXQRP4bxWunVOkWpeMUuEMfuYffqUkZEbpw,19025
+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
@@ -168,9 +168,9 @@ pyfemtet/opt/visualization/plotter/parallel_plot_creator.py,sha256=VRhT0CUG1mCHD
 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.6.dist-info/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
-pyfemtet-1.0.6.dist-info/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
-pyfemtet-1.0.6.dist-info/METADATA,sha256=gGszbUSqTdtS1gQ7sUTSK18zNc2ZANKzbPPYcoiWYkU,3471
-pyfemtet-1.0.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pyfemtet-1.0.6.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
-pyfemtet-1.0.6.dist-info/RECORD,,
+pyfemtet-1.0.8.dist-info/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
+pyfemtet-1.0.8.dist-info/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
+pyfemtet-1.0.8.dist-info/METADATA,sha256=8bcuKrTIJ7wZbEKVXFjYM3CTOv833vQBQt01vPsPYXU,3467
+pyfemtet-1.0.8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pyfemtet-1.0.8.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
+pyfemtet-1.0.8.dist-info/RECORD,,