pyfemtet 0.5.2__tar.gz → 0.5.3__tar.gz

{pyfemtet-0.5.2 → pyfemtet-0.5.3}/PKG-INFO

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

pyfemtet-0.5.3/pyfemtet/__init__.py

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

{pyfemtet-0.5.2 → pyfemtet-0.5.3}/pyfemtet/opt/_femopt_core.py

@@ -8,13 +8,20 @@ import inspect
 import ast
 import csv
 import ctypes
+from packaging import version
 
 # 3rd-party
 import numpy as np
 import pandas as pd
 from scipy.stats.qmc import LatinHypercube
 import optuna
-from optuna._hypervolume import WFG
+if version.parse(optuna.version.__version__) < version.parse('4.0.0'):
+    from optuna._hypervolume import WFG
+    wfg = WFG()
+    compute_hypervolume = wfg.compute
+else:
+    from optuna._hypervolume import wfg
+    compute_hypervolume = wfg.compute_hypervolume
 from dask.distributed import Lock, get_client
 
 # win32com
@@ -753,10 +760,9 @@ class History:
         reference_point = r * (maximum - minimum) + minimum
 
         #### hv 履歴の計算
-        wfg = WFG()
         hvs = []
         for i in range(n):
-            hv = wfg.compute(pareto_set[:i], reference_point)
+            hv = compute_hypervolume(pareto_set[:i], reference_point)
             if np.isnan(hv):
                 hv = 0
             hvs.append(hv)

{pyfemtet-0.5.2 → pyfemtet-0.5.3}/pyfemtet/opt/optimizer/_optuna_botorchsampler_parameter_constraint_helper.py

@@ -183,7 +183,6 @@ class NonlinearInequalityConstraints:
                 item = (lambda x: GeneralFunctionWithForwardDifference.apply(cns_botorch, x), True)
                 self._nonlinear_inequality_constraints.append(item)
 
-
     def _filter_feasible_conditions(self, ic_batch):
         # List to store feasible initial conditions
         feasible_ic_list = []

{pyfemtet-0.5.2 → pyfemtet-0.5.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyfemtet"
-version = "0.5.2"  # ignored by versioning plugin
+version = "0.5.3"  # ignored by versioning plugin
 description = "Design parameter optimization using Femtet."
 authors = ["kazuma.naito <kazuma.naito@murata.com>"]
 readme = "README.md"

pyfemtet-0.5.2/pyfemtet/__init__.py

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