PyFemtet 0.2.1__tar.gz → 0.2.3__tar.gz

{pyfemtet-0.2.1 → pyfemtet-0.2.3}/PKG-INFO

@@ -1,14 +1,16 @@
 Metadata-Version: 2.1
 Name: pyfemtet
-Version: 0.2.1
+Version: 0.2.3
 Summary: Design parameter optimization using Femtet.
 Home-page: https://github.com/pyfemtet/pyfemtet
 License: BSD-3-Clause
 Author: kazuma.naito
 Author-email: kazuma.naito@murata.com
-Requires-Python: >=3.11,<3.12
+Requires-Python: >=3.9,<3.12
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: botorch (>=0.9.5,<0.10.0)
 Requires-Dist: dash (>=2.14.2,<3.0.0)

{pyfemtet-0.2.1 → pyfemtet-0.2.3}/pyfemtet/FemtetPJTSample/gau_ex08_parametric.py

@@ -36,7 +36,7 @@ if __name__ == '__main__':
     femopt.add_parameter("r", 5, lower_bound=1, upper_bound=10, memo='コイル半径')
     femopt.add_parameter("n", 3, lower_bound=1, upper_bound=5, memo='コイル巻き数')
 
-    # インダクタンスが 0.44 uF に近づくようにゴールを設定
+    # インダクタンスが 0.1 uF に近づくようにゴールを設定
     femopt.add_objective(
         inductance, name='自己インダクタンス', direction=0.1e-06
         )

pyfemtet-0.2.3/pyfemtet/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.3"

{pyfemtet-0.2.1 → pyfemtet-0.2.3}/pyfemtet/opt/base.py

@@ -20,7 +20,7 @@ from .interface import FEMInterface, FemtetInterface
 from .monitor import Monitor
 
 
-def symlog(x: float | np.ndarray):
+def symlog(x: float or np.ndarray):
     """Log function whose domain is extended to the negative region.
 
     Symlog processing is performed internally as a measure to reduce
@@ -28,7 +28,7 @@ def symlog(x: float | np.ndarray):
     between objective functions in multi-objective optimization.
 
     Args:
-        x (float | np.ndarray)
+        x (float or np.ndarray)
 
     Returns:
         float
@@ -381,7 +381,7 @@ class History:
 
         # serialize
         try:
-            self.actor_data.to_csv(self.path, index=None)
+            self.actor_data.to_csv(self.path, index=None, encoding='shift-jis')
         except PermissionError:
             print(f'warning: {self.path} がロックされています。データはロック解除後に保存されます。')
 

{pyfemtet-0.2.1 → pyfemtet-0.2.3}/pyfemtet/opt/monitor.py

@@ -103,6 +103,11 @@ def setup_home():
             dbc.CardBody(html.P(id="card-content", className="card-text")),
         ]
     )
+    status = dbc.Alert(
+        children=[html.H4("optimization status here", className="alert-heading"),],
+        color="primary",
+        id='status-alert'
+    )
     toggle_update_button = dbc.Button('グラフの自動更新の一時停止', id='toggle-update-button')
     interrupt_button = dbc.Button('最適化を中断', id='interrupt-button', color='danger')
     status_text = dcc.Markdown(f'''
@@ -120,6 +125,7 @@ OptimizerBase.set_monitor_server() を実行してください。
         dbc.Row([dbc.Col(dummy), dbc.Col(interval)]),
         dbc.Row([dbc.Col(header)]),
         dbc.Row([dbc.Col(graphs)]),
+        dbc.Row([dbc.Col(status)]),
         dbc.Row([dbc.Col(toggle_update_button), dbc.Col(interrupt_button)]),
         dbc.Row([dbc.Col(status_text)]),
     ], fluid=True)
@@ -211,6 +217,7 @@ class Monitor(object):
         # 3. メイン処理が中断 or 終了していたら ==> 更新を無効にする and 中断を無効にする
         # 4. toggle_button が押されたら ==> 更新を有効にする or 更新を無効にする
         # 5. タブを押したら ==> グラフの種類を切り替える
+        # 6. state に応じて  を切り替える
         @self.app.callback(
             [
                 Output('interval-component', 'max_intervals'),  # 2 3 4
@@ -218,6 +225,8 @@ class Monitor(object):
                 Output('toggle-update-button', 'disabled'),  # 2 3 4
                 Output('toggle-update-button', 'children'),  # 2 3 4
                 Output('card-content', 'children'),  # 1 5
+                Output('status-alert', 'children'),  # 6
+                Output('status-alert', 'color'),  # 6
             ],
             [
                 Input('interval-component', 'n_intervals'),  # 1 3
@@ -241,6 +250,8 @@ class Monitor(object):
             button_disable = False
             toggle_text = 'グラフの自動更新を一時停止する'
             graph = None
+            status_children = None
+            status_color = 'primary'
 
             # toggle_button が奇数なら interval を disable にする
             if toggle_n_clicks % 2 == 1:
@@ -253,7 +264,8 @@ class Monitor(object):
             try:
                 state = self.femopt.ipv.get_state()
                 should_stop = (state == 'interrupted') or (state == 'terminated')
-            except AttributeError:
+            except AttributeError:  # after ray.shutdown
+                state = 'terminated'
                 should_stop = True
             finally:
                 if should_stop:
@@ -268,6 +280,7 @@ class Monitor(object):
                 button_disable = True
                 toggle_text = 'グラフの更新は行われません'
                 self.femopt.ipv.set_state('interrupted')
+                state = 'interrupted'
 
             # グラフを更新する
             if active_tab_id is not None:
@@ -276,7 +289,14 @@ class Monitor(object):
                 elif active_tab_id == "tab-2":
                     graph = dcc.Graph(figure=update_hypervolume_plot(self.femopt))
 
-            return max_intervals, button_disable, button_disable, toggle_text, graph
+            # status を更新する
+            status_children = [html.H4('optimization status: ' + state, className="alert-heading"), ]
+            if state == 'interrupted':
+                status_color = 'dark'
+            if state == 'terminated':
+                status_color = 'dark'
+
+            return max_intervals, button_disable, button_disable, toggle_text, graph, status_children, status_color
 
     def start_server(self, host='localhost', port=8080):
 

{pyfemtet-0.2.1 → pyfemtet-0.2.3}/pyfemtet/opt/optimizer.py

@@ -17,7 +17,7 @@ from .base import OptimizerBase
 warnings.filterwarnings('ignore', category=ExperimentalWarning)
 
 
-def generate_lhs(bounds: list[list[float]], seed: int | None = None) -> np.ndarray:
+def generate_lhs(bounds: list[list[float]], seed: int or None = None) -> np.ndarray:
     """Latin Hypercube Sampling from given design parameter bounds.
 
     If the number of parameters is d, 
@@ -27,7 +27,7 @@ def generate_lhs(bounds: list[list[float]], seed: int | None = None) -> np.ndarr
 
     Args:
         bounds (list[list[float]]): List of [lower_bound, upper_bound] of parameters.
-        seed (int | None, optional): Random seed. Defaults to None.
+        seed (int or None, optional): Random seed. Defaults to None.
 
     Returns:
         np.ndarray: (N, d) shape ndarray.

{pyfemtet-0.2.1 → pyfemtet-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyfemtet"
-version = "0.2.1"  # ignored by versioning plugin
+version = "0.2.3"  # ignored by versioning plugin
 description = "Design parameter optimization using Femtet."
 authors = ["kazuma.naito <kazuma.naito@murata.com>"]
 readme = "README.md"
@@ -8,7 +8,7 @@ license = "BSD-3-Clause"
 repository = "https://github.com/pyfemtet/pyfemtet"
 
 [tool.poetry.dependencies]
-python = "~3.11"  # ray cannot match 3.12
+python = " >= 3.9, < 3.12"  # ray cannot match 3.12
 numpy = "^1.26.2"
 pandas = "^2.1.3"
 openpyxl = "^3.1.2"

pyfemtet-0.2.1/pyfemtet/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.1"