pyfemtet 0.8.7__py3-none-any.whl → 0.8.8__py3-none-any.whl

pyfemtet/__init__.py

@@ -1 +1 @@
-__version__ = "0.8.7"
+__version__ = "0.8.8"

pyfemtet/opt/interface/_surrogate/_base.py

@@ -16,37 +16,35 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
     def __init__(
             self,
             history_path: str = None,
-            history: History = None,
-            override_objective: bool = True,
+            train_history: History = None,
     ):
 
-        self.history: History
+        self.train_history: History
         self.model: Any
         self.prm: dict[str, float] = dict()
         self.obj: dict[str, float] = dict()
         self.df_prm: pd.DataFrame
         self.df_obj: pd.DataFrame
-        self.override_objective: bool = override_objective
 
-        # history_path が与えられた場合、history をコンストラクトする
+        # history_path が与えられた場合、train_history をコンストラクトする
         if history_path is not None:
-            history = History(history_path=history_path)
+            train_history = History(history_path=history_path)
 
-        # history が与えられるかコンストラクトされている場合
-        if history is not None:
+        # train_history が与えられるかコンストラクトされている場合
+        if train_history is not None:
             # 学習データを準備する
-            df_prm = history.get_df()[history.prm_names]
-            df_obj = history.get_df()[history.obj_names]
+            df_prm = train_history.get_df()[train_history.prm_names]
+            df_obj = train_history.get_df()[train_history.obj_names]
 
             # obj の名前を作る
-            for obj_name in history.obj_names:
+            for obj_name in train_history.obj_names:
                 self.obj[obj_name] = np.nan
 
             # prm の名前を作る
-            for prm_name in history.prm_names:
+            for prm_name in train_history.prm_names:
                 self.prm[prm_name] = np.nan
 
-            self.history = history
+            self.train_history = train_history
 
         # history から作らない場合、引数チェック
         else:
@@ -58,8 +56,7 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
 
         FEMInterface.__init__(
             self,
-            history=history,  # コンストラクト済み history を渡せば並列計算時も何もしなくてよい
-            override_objective=self.override_objective
+            train_history=train_history,  # コンストラクト済み train_history を渡せば並列計算時も何もしなくてよい
         )
 
     def filter_feasible(self, x: np.ndarray, y: np.ndarray, return_feasibility=False):
@@ -73,10 +70,14 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
             return x[feasible_idx], y[feasible_idx]
 
     def _setup_after_parallel(self, *args, **kwargs):
-        if self.override_objective:
-            opt: AbstractOptimizer = kwargs['opt']
-            obj: Objective
-            for obj_name, obj in opt.objectives.items():
+        opt: AbstractOptimizer = kwargs['opt']
+        obj: Objective
+
+        # add_objective された目的のうち、
+        # training data に含まれる名前で
+        # あるものは fun を上書き
+        for obj_name, obj in opt.objectives.items():
+            if obj_name in self.train_history.obj_names:
                 obj.fun = lambda obj_name_=obj_name: self.obj[obj_name_]
 
     def update_parameter(self, parameters: pd.DataFrame, with_warning=False) -> Optional[List[str]]:

pyfemtet/opt/interface/_surrogate/_chaospy.py

@@ -27,7 +27,7 @@ class PolynomialChaosInterface(SurrogateModelInterfaceBase):
 
         # train model
         self.model = PolynomialExpansionModel()
-        self.model.set_bounds_from_history(self.history)
+        self.model.set_bounds_from_history(self.train_history)
         self.train()
 
     def update(self, parameters: pd.DataFrame) -> None:
@@ -37,13 +37,13 @@ class PolynomialChaosInterface(SurrogateModelInterfaceBase):
         )
 
         # history.prm_name 順に並べ替え
-        x = np.array([self.prm[k] for k in self.history.prm_names])
+        x = np.array([self.prm[k] for k in self.train_history.prm_names])
 
         # prediction
         dist_mean, _ = self.model.predict(x)
 
         # 目的関数の更新
-        self.obj = {obj_name: value for obj_name, value in zip(self.history.obj_names, dist_mean)}
+        self.obj = {obj_name: value for obj_name, value in zip(self.train_history.obj_names, dist_mean)}
 
 
 if __name__ == '__main__':

pyfemtet/opt/interface/_surrogate/_singletaskgp.py

@@ -40,12 +40,12 @@ class PoFBoTorchInterface(SurrogateModelInterfaceBase):
 
         # model training
         self.model = SingleTaskGPModel()
-        self.model.set_bounds_from_history(self.history)
+        self.model.set_bounds_from_history(self.train_history)
         self.train()
 
         # model_f training
         self.model_f = SingleTaskGPModel(is_noise_free=False)
-        self.model_f.set_bounds_from_history(self.history)
+        self.model_f.set_bounds_from_history(self.train_history)
         self.train_f()
 
     def update(self, parameters: pd.DataFrame) -> None:
@@ -54,8 +54,8 @@ class PoFBoTorchInterface(SurrogateModelInterfaceBase):
             self, parameters
         )
 
-        # history.prm_name 順に並べ替え
-        x = np.array([self.prm[k] for k in self.history.prm_names])
+        # train_history.prm_name 順に並べ替え
+        x = np.array([self.prm[k] for k in self.train_history.prm_names])
 
         # feasibility の計算
         mean_f, std_f = self.model_f.predict(np.array([x]))
@@ -63,9 +63,9 @@ class PoFBoTorchInterface(SurrogateModelInterfaceBase):
         if pof < self.threshold:
             raise SolveError(Msg.INFO_POF_IS_LESS_THAN_THRESHOLD)
 
-        # 実際の計算(mean は history.obj_names 順)
+        # 実際の計算(現時点で mean は train_history.obj_names 順)
         _mean, _std = self.model.predict(np.array([x]))
         mean = _mean[0]
 
         # 目的関数の更新
-        self.obj = {obj_name: value for obj_name, value in zip(self.history.obj_names, mean)}
+        self.obj = {obj_name: value for obj_name, value in zip(self.train_history.obj_names, mean)}

pyfemtet/opt/optimizer/_optuna/_optuna.py

@@ -206,7 +206,7 @@ class OptunaOptimizer(AbstractOptimizer):
         """Create storage, study and set initial parameter."""
 
         # create storage
-        self.study_name = os.path.basename(self.history.path)
+        self.study_name = 'pyfemtet-study'
         storage_path = self.history.path.replace('.csv', '.db')  # history と同じところに保存
         if self.is_cluster:  # remote cluster なら scheduler の working dir に保存
             storage_path = os.path.basename(self.history.path).replace('.csv', '.db')
@@ -374,6 +374,17 @@ class OptunaOptimizer(AbstractOptimizer):
             sampler._pyfemtet_optimizer = self
 
         # load study
+        self.storage: optuna.storages.BaseStorage
+        studies = self.storage.get_all_studies()
+        if self.study_name in [s.study_name for s in studies]:
+            pass
+
+        elif len(studies) >= 1:
+            self.study_name = studies[-1].study_name
+
+        else:
+            raise ValueError('An empty db is passed.')
+
         study = optuna.load_study(
             study_name=self.study_name,
             storage=self.storage,

{pyfemtet-0.8.7.dist-info → pyfemtet-0.8.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyfemtet
-Version: 0.8.7
+Version: 0.8.8
 Summary: Design parameter optimization using Femtet.
 License: BSD-3-Clause
 Author: kazuma.naito

{pyfemtet-0.8.7.dist-info → pyfemtet-0.8.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyfemtet/__init__.py,sha256=04WO81p8xrQAHiTKqHaDkKWih6M2Y3Hy-UCNVwih4Zc,21
+pyfemtet/__init__.py,sha256=c6aqZCQlw_39oSCH27ZXK8D1ktjy9L8kQ5LAj1IEYHs,21
 pyfemtet/_femtet_config_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/_femtet_config_util/autosave.py,sha256=dNirA9XGuFehas8_Jkj2BW9GOzMbPyhnt1WHcH_ObSU,2070
 pyfemtet/_femtet_config_util/exit.py,sha256=0BWID-tjOkmZwmgPFkcJMkWW39voccz5ARIBWvZbHaw,1877
@@ -49,15 +49,15 @@ pyfemtet/opt/interface/_femtet_with_nx/_interface.py,sha256=LkaODUSpBLq05uz5Jf-J
 pyfemtet/opt/interface/_femtet_with_nx/update_model.py,sha256=P7VH0i_o-X9OUe6AGaLF1fACPeHNrMjcrOBCA3MMrI4,3092
 pyfemtet/opt/interface/_femtet_with_sldworks.py,sha256=rjEgebuP1w1eAFVWw4eRJUq3lsyBcmXlkMjZKIpD0kw,11019
 pyfemtet/opt/interface/_surrogate/__init__.py,sha256=2UT5NuBylyWQJNjg1zsBRCV-MzNCUswTUt6ZuSrYFUM,120
-pyfemtet/opt/interface/_surrogate/_base.py,sha256=bQMoztVq1b-3BW5Z1V-dSROplMHutrblDI289j0cC-E,3001
-pyfemtet/opt/interface/_surrogate/_chaospy.py,sha256=gL72bCgs1AY_EZdJtcifSC-apwsZzp4zsWYxcpVKvtw,1969
-pyfemtet/opt/interface/_surrogate/_singletaskgp.py,sha256=ojZHsxGxSc8ZJqJQ_uMHvpK98TPUsHzXP0q4tmM0YPQ,2471
+pyfemtet/opt/interface/_surrogate/_base.py,sha256=_mVjoxrGEWL-PydjzEYXIgsOJ9zPmntoRHY3dXR2HGo,3098
+pyfemtet/opt/interface/_surrogate/_chaospy.py,sha256=Bqej89Mo0zgdJq1OK7YKRqHOcuyN0wL4ZQUQXdJtYJ8,1987
+pyfemtet/opt/interface/_surrogate/_singletaskgp.py,sha256=bHzY5QIjA9zhLxweexz259XQMZLgkHWfrIDW7f3q-2k,2520
 pyfemtet/opt/optimizer/__init__.py,sha256=Ia6viowECkG0IFXtFef0tJ4jDKsoDzJLqMJ9xLFH2LQ,543
 pyfemtet/opt/optimizer/_base.py,sha256=j8aQc3fGehZTJT9ETf9cr3VWYs2FYk1F8fO3f7QyKAU,13099
 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=b2-PP2HM46kJS4cJkBWnxnW9AS9JfeVkEjmkoKK_ziE,8949
-pyfemtet/opt/optimizer/_optuna/_optuna.py,sha256=5Bjn8LrWpIFWH3lRq6Ke5XYzKQNwoGWNHz59HNMEALA,17093
+pyfemtet/opt/optimizer/_optuna/_optuna.py,sha256=7CpgfetCSNAdO8ppe7uKr0gyXNu0Nn6BILYTv25LEeo,17410
 pyfemtet/opt/optimizer/_optuna/_pof_botorch.py,sha256=FLx9p6IH8xcZl_SZYvs8grMqLEidj5YaBD8urDD88Pk,73768
 pyfemtet/opt/optimizer/_scipy.py,sha256=_2whhMNq6hC1lr5PlYhpZ8Zlh6-DkAjz8SVB5qHIpYg,4766
 pyfemtet/opt/optimizer/_scipy_scalar.py,sha256=rGvrLjrgfYzxK9GA0-r2Hhoaqt6A0TQsT_1M3moyklc,3615
@@ -137,8 +137,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=MZAjzbuq0toZrR-iJhElM3A12_jHVCTt65gz1kdNPbw,32193
-pyfemtet-0.8.7.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.8.7.dist-info/METADATA,sha256=uy1fm6IKQ5OXU8kZ7bowgMIyCbyaQ9NTgaxz0r1DoV0,3509
-pyfemtet-0.8.7.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-pyfemtet-0.8.7.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.8.7.dist-info/RECORD,,
+pyfemtet-0.8.8.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
+pyfemtet-0.8.8.dist-info/METADATA,sha256=AVeQJlDibc-xh4Lsz20Y3KiNqrmN7TWR7cgIg0Kp3a4,3509
+pyfemtet-0.8.8.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+pyfemtet-0.8.8.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.8.8.dist-info/RECORD,,