pyfemtet 0.8.4__py3-none-any.whl → 0.8.5__py3-none-any.whl

pyfemtet/__init__.py

@@ -1 +1 @@
-__version__ = "0.8.4"
+__version__ = "0.8.5"

pyfemtet/opt/_femopt.py

@@ -403,7 +403,7 @@ class FEMOpt:
 
         if names is not None:
             if isinstance(names, str):
-                names = [f'name_{i}' for i in range(n_return)]
+                names = [f'{names}_{i}' for i in range(n_return)]
             else:
                 # names = names
                 pass

pyfemtet/opt/_test_utils/record_history.py

@@ -59,32 +59,39 @@ def _get_obj_from_csv(csv_path, encoding=ENCODING):
         reader = csv.reader(f, delimiter=",")
         meta = reader.__next__()
     obj_indices = np.where(np.array(meta) == "obj")[0]
-    out = df.iloc[:, obj_indices]
+    out: pd.DataFrame = df.iloc[:, obj_indices]
+    out = out.dropna(axis=0)
     return out, columns
 
 
-def is_equal_result(ref_path, dif_path, log_path):
+def is_equal_result(ref_path, dif_path, log_path=None, threashold=0.05):
     """Check the equality of two result csv files."""
     ref_df, ref_columns = _get_obj_from_csv(ref_path)
     dif_df, dif_columns = _get_obj_from_csv(dif_path)
 
-    with open(log_path, "a", newline="\n", encoding=ENCODING) as f:
-        f.write("\n\n===== 結果の分析 =====\n\n")
-        f.write(f"        \tref\tdif\n")
-        f.write(f"---------------------\n")
-        f.write(f"len(col)\t{len(ref_columns)}\t{len(dif_columns)}\n")
-        f.write(f"len(df) \t{len(ref_df)}\t{len(dif_df)}\n")
-        try:
-            difference = (
+    if log_path is not None:
+        with open(log_path, "a", newline="\n", encoding=ENCODING) as f:
+            f.write("\n\n===== 結果の分析 =====\n\n")
+            f.write(f"        \tref\tdif\n")
+            f.write(f"---------------------\n")
+            f.write(f"len(col)\t{len(ref_columns)}\t{len(dif_columns)}\n")
+            f.write(f"len(df) \t{len(ref_df)}\t{len(dif_df)}\n")
+            try:
+                difference = (
+                    np.abs(ref_df.values - dif_df.values) / np.abs(dif_df.values)
+                ).mean()
+                f.write(f"diff    \t{int(difference*100)}%\n")
+            except Exception:
+                f.write(f"diff    \tcannot calc\n")
+
+    else:
+        difference = (
                 np.abs(ref_df.values - dif_df.values) / np.abs(dif_df.values)
-            ).mean()
-            f.write(f"diff    \t{int(difference*100)}%\n")
-        except Exception:
-            f.write(f"diff    \tcannot calc\n")
+        ).mean()
 
     assert len(ref_columns) == len(dif_columns), "結果 csv の column 数が異なります。"
     assert len(ref_df) == len(dif_df), "結果 csv の row 数が異なります。"
-    assert difference <= 0.05, "前回の結果との平均差異が 5% を超えています。"
+    assert difference <= threashold*100, f"前回の結果との平均差異が {int(difference)}% で {int(threashold*100)}% を超えています。"
 
 
 def _get_simplified_df_values(csv_path, exclude_columns=None):

pyfemtet/opt/interface/__init__.py

@@ -21,7 +21,9 @@ else:
     FemtetWithNXInterface = type('FemtetWithNXInterface', (FemtetInterface,), {})
     ExcelInterface = type('FemtetInterface', (NotAvailableForWindows,), {})
 
-from pyfemtet.opt.interface._surrogate import PoFBoTorchInterface
+from pyfemtet.opt.interface._surrogate._base import SurrogateModelInterfaceBase
+from pyfemtet.opt.interface._surrogate._singletaskgp import PoFBoTorchInterface
+
 
 __all__ =[
     'FEMInterface',
@@ -30,5 +32,6 @@ __all__ =[
     'FemtetWithSolidworksInterface',
     'FemtetWithNXInterface',
     'ExcelInterface',
+    'SurrogateModelInterfaceBase',
     'PoFBoTorchInterface',
 ]

pyfemtet/opt/interface/_surrogate/_base.py

@@ -17,6 +17,7 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
             self,
             history_path: str = None,
             history: History = None,
+            override_objective: bool = True,
     ):
 
         self.history: History
@@ -25,6 +26,7 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
         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 をコンストラクトする
         if history_path is not None:
@@ -57,27 +59,25 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
         FEMInterface.__init__(
             self,
             history=history,  # コンストラクト済み history を渡せば並列計算時も何もしなくてよい
+            override_objective=self.override_objective
         )
 
     def filter_feasible(self, x: np.ndarray, y: np.ndarray, return_feasibility=False):
         feasible_idx = np.where(~np.isnan(y.sum(axis=1)))
         if return_feasibility:
             # calculated or not
-            y = np.zeros_like(y)
-            y[feasible_idx] = 1.
-            # satisfy weak feasibility or not
-            infeasible_idx = np.where(~self.history.get_df()['feasible'].values)
-            y[infeasible_idx] = .0
-            return x, y.reshape((-1, 1))
+            feas = np.zeros((len(y), 1), dtype=float)
+            feas[feasible_idx] = 1.
+            return x, feas
         else:
             return x[feasible_idx], y[feasible_idx]
 
     def _setup_after_parallel(self, *args, **kwargs):
-
-        opt: AbstractOptimizer = kwargs['opt']
-        obj: Objective
-        for obj_name, obj in opt.objectives.items():
-            obj.fun = lambda: self.obj[obj_name]
+        if self.override_objective:
+            opt: AbstractOptimizer = kwargs['opt']
+            obj: Objective
+            for obj_name, obj in opt.objectives.items():
+                obj.fun = lambda obj_name_=obj_name: self.obj[obj_name_]
 
     def update_parameter(self, parameters: pd.DataFrame, with_warning=False) -> Optional[List[str]]:
         for i, row in parameters.iterrows():

pyfemtet/opt/interface/_surrogate/_singletaskgp.py

@@ -27,8 +27,8 @@ class PoFBoTorchInterface(SurrogateModelInterfaceBase):
     def train_f(self):
         # df そのまま用いて training する
         x, y = self.filter_feasible(self.df_prm.values, self.df_obj.values, return_feasibility=True)
-        if y.min() == 1:
-            self.model_f.predict = lambda *args, **kwargs: (1., 0.001)
+        if y.min() == 1:  # feasible values only
+            self.model_f.predict = lambda *args, **kwargs: (1., 0.001)  # mean, std
         self.model_f.fit(x, y)
 
     def _setup_after_parallel(self, *args, **kwargs):
@@ -64,7 +64,8 @@ class PoFBoTorchInterface(SurrogateModelInterfaceBase):
             raise SolveError(Msg.INFO_POF_IS_LESS_THAN_THRESHOLD)
 
         # 実際の計算(mean は history.obj_names 順)
-        mean, _ = self.model.predict(np.array([x]))
+        _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)}

pyfemtet/opt/prediction/single_task_gp.py

@@ -85,6 +85,8 @@ class SingleTaskGPModel(PredictionModelBase):
         fit_gpytorch_mll(mll)
 
     def predict(self, x: np.ndarray) -> tuple[np.ndarray, np.ndarray]:
+        assert len(x.shape) >= 2
+
         X = tensor(x)
 
         post = self.gp.posterior(X)

{pyfemtet-0.8.4.dist-info → pyfemtet-0.8.5.dist-info}/METADATA

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

{pyfemtet-0.8.4.dist-info → pyfemtet-0.8.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyfemtet/__init__.py,sha256=oR63M0ef9dMrWZnMjTb9xk69cW2iS6rluqpyJ5_0C84,21
+pyfemtet/__init__.py,sha256=ryTvYnQfAb0LetADNMrzLGomNovaozHgioSBOHXn2ms,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
@@ -24,12 +24,12 @@ pyfemtet/dispatch_extensions/_impl.py,sha256=yH_yeAnQ-Xi9GfjX-FQt9u3yHnrLYIteRb6
 pyfemtet/logger/__init__.py,sha256=UOJ9n_U2xwdTrp0Xgg-N6geySxNzKqTBQlXsaH0kW_w,420
 pyfemtet/logger/_impl.py,sha256=rsAd0HpmveOaLS39ucp3U2OcDhQMWjC5fnVGhbJtWVw,6375
 pyfemtet/opt/__init__.py,sha256=wRR8LbEhb5I6MUgmnCgjB6-tqHlOVxDIo7yPkq0QbBs,758
-pyfemtet/opt/_femopt.py,sha256=vqLUGMMHn0lp0bRE_FEV0sOoUcVAbohy9_8OLYw3ZrU,39217
+pyfemtet/opt/_femopt.py,sha256=O6Fpaaz2x42iaHI60uMXBFJNWrCGgWYnQsGbnQALzPM,39220
 pyfemtet/opt/_femopt_core.py,sha256=mA2wQ5h_mmbTQ9ilhDHLUyN-jsWFDpJE2r5guUWlS10,38083
 pyfemtet/opt/_test_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/_test_utils/control_femtet.py,sha256=8oAl9y5V2n8Nnsgx_ebcZVzwFt1eI3swkdiKg6pg3-M,1085
 pyfemtet/opt/_test_utils/hyper_sphere.py,sha256=nQhw8EIY0DwvcTqrbKhkxiITLZifr4-nG77E-_6ggmA,700
-pyfemtet/opt/_test_utils/record_history.py,sha256=JCNJLZMCNTpJ6VT7iwEt2DIbwmsuQmgC0ClQSfcatj4,3915
+pyfemtet/opt/_test_utils/record_history.py,sha256=mACxWglF7GvLwhvKUC0IhUFHFRrhs2UfTyJqy7vhpbE,4244
 pyfemtet/opt/advanced_samples/excel_ui/(ref) original_project.femprj,sha256=5OqZfynTpVCrgEIOBOMYuDGaMvepi5lojVNFr1jAsEI,157489
 pyfemtet/opt/advanced_samples/excel_ui/femtet-macro.xlsm,sha256=ckF0SQ0f3IWSW6QoH1IPJdwUUlR7O_AiGC5fi8SI3jA,133137
 pyfemtet/opt/advanced_samples/excel_ui/pyfemtet-core.py,sha256=aF2TWXdbt7dnkeBqqVO6GvIExozjFp0mxx3BX8rpYNc,9879
@@ -39,7 +39,7 @@ pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_create_training_data_jp.p
 pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_optimize_with_surrogate.py,sha256=s0b31wuN3iXjb78dt0ro0ZjxHa8uLIH94jRfEuj1EVY,3090
 pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_optimize_with_surrogate_jp.py,sha256=OAOpHKyMMo1StSqNMqx4saYDn4hiGOKDypyK6uhTILQ,3215
 pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_parametric.femprj,sha256=iIHH1X-wWBqEYj4cFJXco73LCJXSrYBsSKOD0HxYu60,87599
-pyfemtet/opt/interface/__init__.py,sha256=dkQ8PoIzYJVRtckNN2VgL7FEwci9RbYM3owOvqnPm80,1219
+pyfemtet/opt/interface/__init__.py,sha256=na6-elI9-karOqoSxT9LfLQpjBPm1lrUWjow0NYYRP4,1349
 pyfemtet/opt/interface/_base.py,sha256=y0uQ5jdsWbgt5odyqPin7NXcK_IbUwPDcrrkV_JhpRw,2722
 pyfemtet/opt/interface/_excel_interface.py,sha256=s103vePTPXXYiPwGdAEUFgtpvGXtu1nSljDtP4HsmcY,40355
 pyfemtet/opt/interface/_femtet.py,sha256=teALmp66aJ_rrmtEOjCGDG1jGLTZr2AmvMFmuuXRQkw,34634
@@ -49,9 +49,9 @@ 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=-k02jRywxaSKMDzGitPE_qBj5nUxC7OL6guF4y6F1Zw,2923
+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=YBRm-8MRwK26qg6T5LKaAhwPfF3jLcKQV-fycP6dnlA,2406
+pyfemtet/opt/interface/_surrogate/_singletaskgp.py,sha256=ojZHsxGxSc8ZJqJQ_uMHvpK98TPUsHzXP0q4tmM0YPQ,2471
 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
@@ -64,7 +64,7 @@ pyfemtet/opt/optimizer/_scipy_scalar.py,sha256=rGvrLjrgfYzxK9GA0-r2Hhoaqt6A0TQsT
 pyfemtet/opt/optimizer/parameter.py,sha256=YLE9lmYRaZA8isnTPJnbYXpUn6zsJFW4xg03QaSWey8,3950
 pyfemtet/opt/prediction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/prediction/_base.py,sha256=dEyEur3IntNokYK8NhPndHb2pWY_A4C1SjEejOTCUGw,2048
-pyfemtet/opt/prediction/single_task_gp.py,sha256=6NMSjTtzXJWaW7NEqfqOjz_37mbHpXh9Oo5_KjivRU0,3922
+pyfemtet/opt/prediction/single_task_gp.py,sha256=lhJMrkh3-TPpSpPM2OYmsiZW6TVzxd0XAG2E9VAdFng,3956
 pyfemtet/opt/samples/femprj_sample/ParametricIF.femprj,sha256=9BtDHmc3cdom0Zq33DTdZ0mDAsIUY6i8SRkkg-n7GO0,442090
 pyfemtet/opt/samples/femprj_sample/ParametricIF.py,sha256=oXzchBZEbH69xacDht5HDnbZzKwapXsn6bp9qihY17Y,707
 pyfemtet/opt/samples/femprj_sample/ParametricIF_test_result.reccsv,sha256=TiOAqEDMub6SCGYClBv1JvQxphDOY3iIdr_pMmGgJ9M,2859
@@ -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=zcsRmVpVK7xbmOpnKkSypNPsRyHcV3ingfNmuqln6nw,32171
-pyfemtet-0.8.4.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.8.4.dist-info/METADATA,sha256=gm8_jNbFddbgs4cCz1XchxJDMSfcTlBn-GHxCu0ikrE,3509
-pyfemtet-0.8.4.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-pyfemtet-0.8.4.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.8.4.dist-info/RECORD,,
+pyfemtet-0.8.5.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
+pyfemtet-0.8.5.dist-info/METADATA,sha256=NGd9CK6oM_7IsLx92fBkvQ34tuaWL7RZp8N4WEHvrv8,3509
+pyfemtet-0.8.5.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+pyfemtet-0.8.5.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.8.5.dist-info/RECORD,,