pyfemtet 1.0.6__tar.gz → 1.0.8__tar.gz

{pyfemtet-1.0.6 → pyfemtet-1.0.8}/PKG-INFO

@@ -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 → pyfemtet-1.0.8}/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-1.0.6 → pyfemtet-1.0.8}/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 → pyfemtet-1.0.8}/pyproject.toml

@@ -2,7 +2,7 @@
 name = "pyfemtet"
 dynamic = []
 description = "Design parameter optimization using Femtet."
-authors = [{ name = "kazuma.naito", email = "148934231+pyfemtet@users.noreply.github.com" }]
+authors = [{ name = "pyfemtet", email = "148934231+pyfemtet@users.noreply.github.com" }]
 requires-python = ">= 3.10, < 3.14"
 readme = "README.md"
 license = "MIT"
@@ -33,7 +33,7 @@ dependencies = [
 
 #[project.optional-dependencies]
 #brep = ["brepmatching>=0.1.8,<0.2"]
-version = "1.0.6"
+version = "1.0.8"
 
 [project.urls]
 Repository = "https://github.com/pyfemtet/pyfemtet"