pyfemtet 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

pyfemtet/__init__.py

@@ -1 +1 @@
-__version__ = "0.6.0"
+__version__ = "0.6.2"

pyfemtet/opt/_femopt.py

@@ -1,7 +1,7 @@
 # built-in
 import inspect
 import warnings
-from typing import Optional, Any, Callable, List
+from typing import Optional, Any, Callable, List, Sequence, SupportsFloat
 import os
 import datetime
 from time import time, sleep
@@ -363,6 +363,46 @@ class FEMOpt:
 
         self.opt.objectives[name] = Objective(fun, name, direction, args, kwargs)
 
+    def add_objectives(
+            self,
+            fun: Callable[[Any], Sequence[SupportsFloat]],
+            n_return: int,
+            names: str or Sequence[str] or None = None,
+            directions: str or Sequence[str] or None = None,
+            args: tuple or None = None,
+            kwargs: dict or None = None,
+    ):
+        from pyfemtet.opt._femopt_core import ObjectivesFunc
+        components = ObjectivesFunc(fun, n_return)
+
+        if names is not None:
+            if isinstance(names, str):
+                names = [f'name_{i}' for i in range(n_return)]
+            else:
+                # names = names
+                pass
+        else:
+            names = [None for _ in range(n_return)]
+
+        if directions is not None:
+            if isinstance(directions, str):
+                directions = [directions for _ in range(n_return)]
+            else:
+                # directions = directions
+                pass
+        else:
+            directions = ['minimize' for _ in range(n_return)]
+
+        for name, component, direction in zip(names, components, directions):
+            self.add_objective(
+                fun=component,
+                name=name,
+                direction=direction,
+                args=args,
+                kwargs=kwargs,
+            )
+
+
     def add_constraint(
             self,
             fun,

pyfemtet/opt/_femopt_core.py

@@ -430,6 +430,79 @@ class Constraint(Function):
         super().__init__(fun, name, args, kwargs)
 
 
+class ObjectivesFunc:
+    """複数の値を返す関数を objective として扱うためのクラス
+
+    複数の値を返す関数を受け取る。
+
+    最初に評価されたときに計算を実行し
+    そうでない場合は保持した値を返す
+    callable のリストを提供する。
+
+    """
+
+    def __init__(self, fun, n_return):
+        self._evaluated = [False for _ in range(n_return)]
+        self._values = [None for _ in range(n_return)]
+        self._i = 0
+        self.fun = fun
+        self.n_return = n_return
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+
+        # iter の長さ
+        if self._i == self.n_return:
+            self._i = 0
+            raise StopIteration
+
+        # iter として提供する callable オブジェクト
+        # self の情報にもアクセスする必要があり
+        # それぞれが iter された時点での i 番目という
+        # 情報も必要なのでこのスコープで定義する必要がある
+        class NthFunc:
+            def __init__(self_, i):
+                # 何番目の要素であるかを保持
+                # self._i を直接参照すると
+                # 実行時点での ObjectiveFunc の
+                # 値を参照してしまう
+                self_.i = i
+
+            def __call__(self_, *args, **kwargs):
+                # 何番目の要素であるか
+                i = self_.i
+
+                # 一度も評価されていなければ評価する
+                if not any(self._evaluated):
+                    self._values = tuple(self.fun(*args, **kwargs))
+                    assert len(self._values) == self.n_return, '予期しない戻り値の数'
+
+                # 評価したらフラグを立てる
+                self._evaluated[i] = True
+
+                # すべてのフラグが立ったらクリアする
+                if all(self._evaluated):
+                    self._evaluated = [False for _ in range(self.n_return)]
+
+                # 値を返す
+                return self._values[i]
+
+            @property
+            def __globals__(self_):
+                # ScapeGoat 実装への対処
+                return self.fun.__globals__
+
+        # callable を作成
+        f = NthFunc(self._i)
+
+        # index を更新
+        self._i += 1
+
+        return f
+
+
 class _HistoryDfCore:
     """Class for managing a DataFrame object in a distributed manner."""
 

pyfemtet/opt/optimizer/_base.py

@@ -129,7 +129,7 @@ class AbstractOptimizer(ABC):
         self.fem_class = None
         self.fem_kwargs = dict()
         self.variables: ExpressionEvaluator = ExpressionEvaluator()
-        self.objectives: dict[str, Constraint] = dict()
+        self.objectives: dict[str, Objective] = dict()
         self.constraints: dict[str, Constraint] = dict()
         self.entire_status = None  # actor
         self.history = None  # actor

pyfemtet/opt/optimizer/_optuna/_pof_botorch.py

@@ -1,3 +1,41 @@
+"""This algorithm is based on BoTorchSampler of optuna_integration[1] and the paper[2].
+
+
+** LICENSE NOTICE OF [1] **
+
+MIT License
+
+Copyright (c) 2018 Preferred Networks, Inc.
+Copyright (c) 2024 Kazuma NAITO.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+** reference of [2] **
+LEE, H., et al. Optimization subject to hidden constraints via statistical
+emulation. Pacific Journal of Optimization, 2011, 7.3: 467-478
+
+
+
+"""
+
+
 from __future__ import annotations
 
 # ===== constant =====
@@ -1694,12 +1732,13 @@ class PoFBoTorchSampler(BaseSampler):
         else:
             running_params = None
 
-        if self._seed is not None:
-            random.seed(self._seed)
-            numpy.random.seed(self._seed)
-            torch.manual_seed(self._seed)
-            torch.backends.cudnn.benchmark = False
-            torch.backends.cudnn.deterministic = True
+        # 一時的に取り消し：TPESampler と整合性が取れない
+        # if self._seed is not None:
+        #     random.seed(self._seed)
+        #     numpy.random.seed(self._seed)
+        #     torch.manual_seed(self._seed)
+        #     torch.backends.cudnn.benchmark = False
+        #     torch.backends.cudnn.deterministic = True
 
         with manual_seed(self._seed):
 

{pyfemtet-0.6.0.dist-info → pyfemtet-0.6.2.dist-info}/METADATA

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

{pyfemtet-0.6.0.dist-info → pyfemtet-0.6.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyfemtet/__init__.py,sha256=DS49q_bFynltwBtgneHYeVXTHLg5bjAOFWvTkv-jYmY,21
+pyfemtet/__init__.py,sha256=d7NGuoje3vHyudKIFR_PmfKozIOKDFvAhGx0QXiyuMw,21
 pyfemtet/_message/1. make_pot.bat,sha256=oS38xYsaUnQAuKwUR8hZJFgt3AKBU993fWFDSg2ROz4,570
 pyfemtet/_message/2. make_mo.bat,sha256=nqUi3Cze7JGKkYItlch8ZG2gSbRNZiS2ltuCS7DbmG8,154
 pyfemtet/_message/__init__.py,sha256=gE1-XX_PzHj9BbhqPaK5VcIHuv6_Tec5qlPMC3IRiBg,100
@@ -13,8 +13,8 @@ pyfemtet/dispatch_extensions/_impl.py,sha256=HU7rKRAzEe5yYukWrKtdi1aIbUas_kLyaa_
 pyfemtet/logger/__init__.py,sha256=DZNTD9BboiFU9LOiyPKi_Y6gWAga5f1lWkVoq7LV_y0,71
 pyfemtet/logger/_impl.py,sha256=ZN5Rj3kb9UEGFt5KSLlzwfrLF_SAoOxgPBkadwh2Y8w,2825
 pyfemtet/opt/__init__.py,sha256=wRR8LbEhb5I6MUgmnCgjB6-tqHlOVxDIo7yPkq0QbBs,758
-pyfemtet/opt/_femopt.py,sha256=Yvcw4gFeWlDSor21RcwkaMZ7UedLKQuXKatqtyK8lWc,35341
-pyfemtet/opt/_femopt_core.py,sha256=NBIiELn6uno7dqoz_6oVAx-wnzkWYWmHaMJMj4rJUIM,31988
+pyfemtet/opt/_femopt.py,sha256=v9qnH9e99nSFhxOwgkf45_i4f84SyV5ExfNr9fFgl6k,36666
+pyfemtet/opt/_femopt_core.py,sha256=Sn13SI1r5OvSu6C9XjkqTrFz2IgO_vMszIAgA-gx-TU,34348
 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,12 +28,12 @@ pyfemtet/opt/interface/_femtet_with_nx/_interface.py,sha256=BXWdzIFcId1EovpbRD5D
 pyfemtet/opt/interface/_femtet_with_nx/update_model.py,sha256=P7VH0i_o-X9OUe6AGaLF1fACPeHNrMjcrOBCA3MMrI4,3092
 pyfemtet/opt/interface/_femtet_with_sldworks.py,sha256=NeNw1sqAL_kOrmrrcljrPwi_hBSA-LRU9MOqI_pjQXs,6836
 pyfemtet/opt/optimizer/__init__.py,sha256=Ia6viowECkG0IFXtFef0tJ4jDKsoDzJLqMJ9xLFH2LQ,543
-pyfemtet/opt/optimizer/_base.py,sha256=-gz7LPFv8v1dplMH796DMlh3O_VD32oHiTl6dlWXAlo,12148
+pyfemtet/opt/optimizer/_base.py,sha256=-vfJ42GzofjVOB9-Cpf7J5fnuQ6fjZsAgozkMf1Ba6s,12147
 pyfemtet/opt/optimizer/_optuna/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/optimizer/_optuna/_botorch_patch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/optimizer/_optuna/_botorch_patch/enable_nonlinear_constraint.py,sha256=2hUP2c8mokkRaSQ8nXxgCCmz8e0JKvEz8R2qIGnTGm0,8863
 pyfemtet/opt/optimizer/_optuna/_optuna.py,sha256=kdEi7N-ELWNgciD212h_afWFSO6kiRd960K9JJirVfc,16105
-pyfemtet/opt/optimizer/_optuna/_pof_botorch.py,sha256=so8BZqCTz2blfUB8JJnsfhInd__ZSiaf4P33VcdEzfw,71224
+pyfemtet/opt/optimizer/_optuna/_pof_botorch.py,sha256=yVyg1V3trqirSDtbRepgftvS02AEkAhrgjou21JS124,72717
 pyfemtet/opt/optimizer/_scipy.py,sha256=_2whhMNq6hC1lr5PlYhpZ8Zlh6-DkAjz8SVB5qHIpYg,4766
 pyfemtet/opt/optimizer/_scipy_scalar.py,sha256=rGvrLjrgfYzxK9GA0-r2Hhoaqt6A0TQsT_1M3moyklc,3615
 pyfemtet/opt/optimizer/parameter.py,sha256=YLE9lmYRaZA8isnTPJnbYXpUn6zsJFW4xg03QaSWey8,3950
@@ -112,8 +112,8 @@ pyfemtet/opt/visualization/result_viewer/.gitignore,sha256=ryvb4aqbbsHireHWlPQfx
 pyfemtet/opt/visualization/result_viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/result_viewer/application.py,sha256=WcHBx_J5eNLKSaprpk9BGifwhO04oN8FiNGYTWorrXA,1691
 pyfemtet/opt/visualization/result_viewer/pages.py,sha256=laEAKHAtdshCAHxgXo-zMNg3RP6lCxfszO3XwLnF1dU,32156
-pyfemtet-0.6.0.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.6.0.dist-info/METADATA,sha256=YKyoa4Ps_kcIy7x8PKI-zriuyGp3Z1NSCsdsOM9WgEA,3287
-pyfemtet-0.6.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pyfemtet-0.6.0.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.6.0.dist-info/RECORD,,
+pyfemtet-0.6.2.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
+pyfemtet-0.6.2.dist-info/METADATA,sha256=e2iOiF_a7eF57VrVUBinZJQszajDEKS6RTzf0FNDJi0,3287
+pyfemtet-0.6.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pyfemtet-0.6.2.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.6.2.dist-info/RECORD,,