pyfemtet 0.5.2__py3-none-any.whl → 0.5.3__py3-none-any.whl

pyfemtet/__init__.py

@@ -1 +1 @@
-__version__ = "0.5.2"
+__version__ = "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/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.dist-info → pyfemtet-0.5.3.dist-info}/METADATA

@@ -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.2.dist-info → pyfemtet-0.5.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyfemtet/__init__.py,sha256=wlmBF5A1gVspskZOpqNe0Xi1AY5ZRYF38SMV3fRd_LA,21
+pyfemtet/__init__.py,sha256=97UKrhrWEWbfgbWci_xZHK3UkIDLtNXohfmkwtTK25k,21
 pyfemtet/core.py,sha256=3lqfBGJ5IuKz2Nqj5pRo7YQqKwx_0ZDL72u95Ur_1p0,1386
 pyfemtet/dispatch_extensions.py,sha256=XVZajbjh7mb6NG4Hq8qff2TJWab75r4Hd59cIvCRsVg,16213
 pyfemtet/logger.py,sha256=JYD0FvzijMS2NvZN7VT7vZA5hqtHEkvS93AHlIMDePw,2507
@@ -12,7 +12,7 @@ pyfemtet/message/locales/messages.pot,sha256=_gVMy6qaSU7Qu6zIY8KQizb1XpTZ0ijLKbn
 pyfemtet/message/messages.py,sha256=i0cOOV8NnBeT1gG-tqgnu_3dIym1hZG8Hzg38sh_Qeo,13187
 pyfemtet/opt/__init__.py,sha256=MPrUWeLZLrJ-ApVckn8dsn3QmRH13aPzit5JgaoshG8,696
 pyfemtet/opt/_femopt.py,sha256=_WxsnCk22UnnFPeGxVOrVDyWnuOOVUwRLvUL9xSxwuQ,26998
-pyfemtet/opt/_femopt_core.py,sha256=jla01evKNA3sOR-BDuMM-JN5xgh1jwtRd_0JMes4_Qc,29608
+pyfemtet/opt/_femopt_core.py,sha256=mgu7qMxHW49tciNWYJq1DIJOX8lpAw8Yq8b6xafydH8,29851
 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
@@ -28,7 +28,7 @@ pyfemtet/opt/interface/_femtet_with_sldworks.py,sha256=Ldr8Esa5xZ-D_E5uIXBTF2DHs
 pyfemtet/opt/optimizer/__init__.py,sha256=wdz7PXkcSJ9Z2OHoegfGvYrnj_OAyU39BvDyiy3QnVw,407
 pyfemtet/opt/optimizer/_base.py,sha256=lKCDGoAtOLwqNaP7qfqYJ69AHxq9YZVivTP14VHYxZU,12136
 pyfemtet/opt/optimizer/_optuna.py,sha256=MojfB0oQCjSzS-hJNiD_Wn-vPDJbsMUydMq2ht6Ww9g,11570
-pyfemtet/opt/optimizer/_optuna_botorchsampler_parameter_constraint_helper.py,sha256=dJsQIbPeAI9N46iavTB6PDpoZ_Ol7WFVEOPN6Pdx7KM,12223
+pyfemtet/opt/optimizer/_optuna_botorchsampler_parameter_constraint_helper.py,sha256=zqRsrpoLTXrbBo7F-D95LKnHQPwVvvBnCG3yh4VLv6g,12222
 pyfemtet/opt/optimizer/_scipy.py,sha256=M3q25VuRazDzXUWC25z7hGbNq2Qg9158NjTSNBvi2pk,4347
 pyfemtet/opt/optimizer/_scipy_scalar.py,sha256=YmErX4s_ywVIn861-D06d-TvDWi0rp843Jit3x80qtU,3202
 pyfemtet/opt/parameter.py,sha256=YLE9lmYRaZA8isnTPJnbYXpUn6zsJFW4xg03QaSWey8,3950
@@ -108,8 +108,8 @@ pyfemtet/opt/visualization/wrapped_components/dbc.py,sha256=wzR1ZMOb4uwPNTMFn5up
 pyfemtet/opt/visualization/wrapped_components/dcc.py,sha256=hcW7SR6VIMn4S4-JMyohvOzdc0Aw8A4chIeHqQEUbFU,17499
 pyfemtet/opt/visualization/wrapped_components/html.py,sha256=sE2XHTDY1GvA1NW7y6SKWf-WglVXFKKvXhU9h3z53_g,95652
 pyfemtet/opt/visualization/wrapped_components/str_enum.py,sha256=NZqbh2jNEAckvJyZv__MWeRs2F2Q-dkJCWo30rU2rrM,1383
-pyfemtet-0.5.2.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.5.2.dist-info/METADATA,sha256=jdH1UdFRexWUeZ9saoDfjoFmw55OkOlGp6fLDxHJyTg,3287
-pyfemtet-0.5.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyfemtet-0.5.2.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.5.2.dist-info/RECORD,,
+pyfemtet-0.5.3.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
+pyfemtet-0.5.3.dist-info/METADATA,sha256=_ATbM4hKPv5ozUxw09iyjZkvy6XqoWLoEOTe3qH5aBI,3287
+pyfemtet-0.5.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyfemtet-0.5.3.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.5.3.dist-info/RECORD,,