pyfemtet 1.1.3__tar.gz → 1.1.4__tar.gz

{pyfemtet-1.1.3 → pyfemtet-1.1.4}/PKG-INFO

@@ -1,12 +1,13 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pyfemtet
-Version: 1.1.3
+Version: 1.1.4
 Summary: Design parameter optimization using Femtet.
-License: MIT
+License-Expression: MIT
+License-File: LICENSE
+License-File: LICENSE_THIRD_PARTY.txt
 Author: pyfemtet
 Author-email: 148934231+pyfemtet@users.noreply.github.com
 Requires-Python: >= 3.10, < 3.14
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -29,8 +30,7 @@ Requires-Dist: optuna-integration (>=3.6.0,<5.0.0)
 Requires-Dist: pandas (>=2.2.3,<3)
 Requires-Dist: plotly (>=5.22.0,<6)
 Requires-Dist: psutil (>=5.9.6,<6)
-Requires-Dist: pywin32 (<307) ; sys_platform == "win32" and python_version < "3.13"
-Requires-Dist: pywin32 (>=309) ; sys_platform == "win32" and python_version >= "3.13"
+Requires-Dist: pywin32 (>=310) ; sys_platform == "win32"
 Requires-Dist: pyyaml (>=6.0.2,<7)
 Requires-Dist: scipy (>=1.11.4,<2)
 Requires-Dist: torch

{pyfemtet-1.1.3 → pyfemtet-1.1.4}/pyfemtet/opt/interface/_surrogate_model_interface/botorch_interface.py

@@ -26,6 +26,8 @@ __all__ = [
 
 class BoTorchInterface(AbstractSurrogateModelInterfaceBase):
 
+    current_obj_std_values: dict[str, float]
+
     def __init__(
             self,
             history_path: str = None,
@@ -45,6 +47,7 @@ class BoTorchInterface(AbstractSurrogateModelInterfaceBase):
 
         self.model = SingleTaskGPModel()
         self.pyfemtet_model = PyFemtetModel()
+        self.current_obj_std_values = {}
 
         # get main only
         df = self.train_history.get_df(MAIN_FILTER)
@@ -64,11 +67,13 @@ class BoTorchInterface(AbstractSurrogateModelInterfaceBase):
         # update current objective values
         x = np.array([[variable.value for variable in self.current_prm_values.values()]])
 
-        y, _ = self.pyfemtet_model.predict(x)
+        y, s = self.pyfemtet_model.predict(x)
         y = y[0]
+        s = s[0]
 
-        for obj_name, obj_value in zip(self.train_history.obj_names, y):
+        for obj_name, obj_value, obj_std in zip(self.train_history.obj_names, y, s):
             self.current_obj_values.update({obj_name: obj_value})
+            self.current_obj_std_values.update({obj_name: obj_std})
 
 
 class PoFBoTorchInterface(BoTorchInterface, AbstractSurrogateModelInterfaceBase):
@@ -103,6 +108,7 @@ class PoFBoTorchInterface(BoTorchInterface, AbstractSurrogateModelInterfaceBase)
         self.train_history_c.load_csv(history_path, with_finalize=True)
         self.pof_threshold = 0.5
         self.feasibility_cdf_threshold = feasibility_cdf_threshold
+        self.current_obj_std_values = {}
 
         # use feasibility as a single objective
         self.train_history_c.obj_names = ['feasibility']

{pyfemtet-1.1.3 → pyfemtet-1.1.4}/pyproject.toml

@@ -11,8 +11,7 @@ dependencies = [
     "tqdm>=4.66.1,<5",
     "colorlog>=6.8.0,<7",
     "psutil>=5.9.6,<6",
-    "pywin32<307 ; sys_platform == 'win32' and python_version < '3.13'",
-    "pywin32>=309 ; sys_platform == 'win32' and python_version >= '3.13'",
+    "pywin32>=310; sys_platform == 'win32'",
     "femtetutils>=1.0.0,<2 ; sys_platform=='win32'",
     "dask~=2024.12.1",
     "distributed~=2024.12.1",
@@ -34,7 +33,7 @@ dependencies = [
 
 #[project.optional-dependencies]
 #brep = ["brepmatching>=0.1.8,<0.2"]
-version = "1.1.3"
+version = "1.1.4"
 
 [project.urls]
 Repository = "https://github.com/pyfemtet/pyfemtet"