pyfemtet 0.8.15__tar.gz → 0.8.17__tar.gz

{pyfemtet-0.8.15 → pyfemtet-0.8.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyfemtet
-Version: 0.8.15
+Version: 0.8.17
 Summary: Design parameter optimization using Femtet.
 License: MIT
 Author: kazuma.naito

pyfemtet-0.8.17/pyfemtet/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.8.17"

{pyfemtet-0.8.15 → pyfemtet-0.8.17}/pyfemtet/opt/_femopt_core.py

@@ -634,7 +634,7 @@ class History:
 
         self.set_df(df)
 
-    def filter_valid(self, df_, keep_trial_num=False):
+    def filter_valid(self, df_, keep_trial_num=True):
         buff = df_[self.obj_names].notna()
         idx = buff.prod(axis=1).astype(bool)
         filtered_df = df_[idx]
@@ -834,15 +834,37 @@ class History:
 
         # 非劣解の計算
         non_domi: list[bool] = []
+        non_domi_row: list[pd.Series] = []
         for i, row in solution_set.iterrows():
             non_domi.append((row > solution_set).product(axis=1).sum(axis=0) == 0)
+            non_domi_row.append(row)
+        print(solution_set)
+
+        # パレートフロントから裾解（他と同等というだけで残っている非劣解）を除く
+        true_non_domi = []
+        for i, row in enumerate(non_domi_row):
+            print('=====')
+            print(row)  # その非劣解について
+            print('-----')
+            is_true_non_domi = []
+            for j, other_row in enumerate(non_domi_row):
+                if i == j:
+                    continue
+                print(row < other_row)  # 他の非劣解よりも優れている
+                print('-----')
+                print((row < other_row).sum())  # そのような目的がひとつでもある
+                is_true_non_domi.append((row < other_row).sum())  # ような解が
+
+            true_non_domi.append(all(is_true_non_domi))  # 全ての解に対し、ひとつの目的でも優れている
+
+        # non_domi に true_non_domi を反映する
 
         # feasible も infeasible も一旦劣解にする
         df['non_domi'] = False
 
         # feasible のものに non_domi の評価結果を代入する
         if len(non_domi) > 0:
-            df.loc[idx, 'non_domi'] = non_domi
+            df.loc[idx, 'non_domi'] = true_non_domi
 
     def _calc_hypervolume(self, objectives, df):
 

{pyfemtet-0.8.15 → pyfemtet-0.8.17}/pyfemtet/opt/optimizer/_base.py

@@ -218,8 +218,8 @@ class AbstractOptimizer(ABC):
             y,
             c,
             self.message,
-            postprocess_func=self.fem._postprocess_func,
-            postprocess_args=self.fem._create_postprocess_args(),
+            postprocess_func=self.fem._postprocess_func if not _record_infeasible else None,
+            postprocess_args=self.fem._create_postprocess_args() if not _record_infeasible else None,
         )
 
         logger.info(f'output: {y}')

{pyfemtet-0.8.15 → pyfemtet-0.8.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyfemtet"
-version = "0.8.15"  # ignored by versioning plugin
+version = "0.8.17"  # ignored by versioning plugin
 description = "Design parameter optimization using Femtet."
 authors = ["kazuma.naito <148934231+pyfemtet@users.noreply.github.com>"]
 readme = "README.md"

pyfemtet-0.8.15/pyfemtet/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.8.15"