pyfemtet 0.8.17__py3-none-any.whl → 0.8.19__py3-none-any.whl

pyfemtet/__init__.py

@@ -1 +1 @@
-__version__ = "0.8.17"
+__version__ = "0.8.19"

pyfemtet/opt/_femopt_core.py

@@ -832,39 +832,41 @@ class History:
         for obj_column, (_, objective) in zip(self.obj_names, objectives.items()):
             solution_set.loc[:, obj_column] = solution_set[obj_column].map(objective.convert)
 
-        # 非劣解の計算
-        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):
+        # 非劣解（改）の計算
+        # 「全ての項目において
+        # 重複する解を除いて
+        # より優れているか又は同等である
+        # 他の解が存在しない解」であるかどうかを判定
+        non_domi = []
+        row: np.ndarray
+        another: np.ndarray
+        for i, row in enumerate(solution_set.values):
+            for j, another in enumerate(solution_set.values):
                 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 を反映する
+                elif np.allclose(row, another):
+                    # 重複してたら他の解との比較に
+                    # 判定を委ねたいので
+                    continue
+                elif all(another <= row):
+                    # 全項目について
+                    # another のほうが
+                    # 優れているか又は同等である
+                    non_domi.append(False)
+                    break
+            else:
+                # 全項目について優れているか又は
+                # 同等であるような他の解が
+                # 存在しなかった
+                non_domi.append(True)
 
         # feasible も infeasible も一旦劣解にする
         df['non_domi'] = False
 
         # feasible のものに non_domi の評価結果を代入する
         if len(non_domi) > 0:
-            df.loc[idx, 'non_domi'] = true_non_domi
+            df.loc[idx, 'non_domi'] = non_domi
 
     def _calc_hypervolume(self, objectives, df):
 

pyfemtet/opt/interface/__init__.py

@@ -19,7 +19,7 @@ else:
     FemtetInterface = type('FemtetInterface', (NotAvailableForWindows,), {})
     FemtetWithSolidworksInterface = type('FemtetWithSolidworksInterface', (FemtetInterface,), {})
     FemtetWithNXInterface = type('FemtetWithNXInterface', (FemtetInterface,), {})
-    ExcelInterface = type('FemtetInterface', (NotAvailableForWindows,), {})
+    ExcelInterface = type('ExcelInterface', (NotAvailableForWindows,), {})
 
 from pyfemtet.opt.interface._surrogate._base import SurrogateModelInterfaceBase
 from pyfemtet.opt.interface._surrogate._singletaskgp import PoFBoTorchInterface

pyfemtet/opt/interface/_excel_interface.py

@@ -222,6 +222,8 @@ class ExcelInterface(FEMInterface):
 
     use_named_range: bool  # input を定義したシートにおいて input の値を名前付き範囲で指定するかどうか。
 
+    force_override_when_load: bool = False  # .py で add_... されている変数などを Excel の内容で上書きするかどうか。
+
     def __init__(
             self,
             input_xlsm_path: str or Path,
@@ -751,6 +753,13 @@ class ExcelInterface(FEMInterface):
             # name
             name = str(row[ParseAsParameter.name])
 
+            # if the variable is already added by
+            # add_parameter or add_expression,
+            # use it.
+            if not self.force_override_when_load:
+                if name in opt.variables.get_variables():
+                    continue
+
             # value
             value = float(row[ParseAsParameter.value])
 
@@ -821,6 +830,12 @@ class ExcelInterface(FEMInterface):
             # name
             name = str(row[ParseAsObjective.name])
 
+            # if the objective is already added by
+            # add_objective, use it.
+            if not self.force_override_when_load:
+                if name in opt.objectives.keys():
+                    continue
+
             # direction
             direction = row[ParseAsObjective.direction]
             assert not is_cell_value_empty(direction), 'direction is empty.'
@@ -865,6 +880,12 @@ class ExcelInterface(FEMInterface):
             # name
             name = str(row[ParseAsConstraint.name])
 
+            # if the constraint is already added by
+            # add_constraint, use it.
+            if not self.force_override_when_load:
+                if name in opt.constraints.keys():
+                    continue
+
             # lb (optional)
             lb = None
             if ParseAsConstraint.lb in df.columns:

{pyfemtet-0.8.17.dist-info → pyfemtet-0.8.19.dist-info}/METADATA

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

{pyfemtet-0.8.17.dist-info → pyfemtet-0.8.19.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyfemtet/__init__.py,sha256=PT_XvBlwQd4u02vEgI5X087DusCd996RJt03glxbUCg,22
+pyfemtet/__init__.py,sha256=aUe-EB_M3W0_VTAYzfZXTNkOENGYVr6j7OzD_Nrrafc,22
 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
@@ -25,7 +25,7 @@ pyfemtet/logger/__init__.py,sha256=UOJ9n_U2xwdTrp0Xgg-N6geySxNzKqTBQlXsaH0kW_w,4
 pyfemtet/logger/_impl.py,sha256=rsAd0HpmveOaLS39ucp3U2OcDhQMWjC5fnVGhbJtWVw,6375
 pyfemtet/opt/__init__.py,sha256=wRR8LbEhb5I6MUgmnCgjB6-tqHlOVxDIo7yPkq0QbBs,758
 pyfemtet/opt/_femopt.py,sha256=MSqSJzyD2sRYBNQAe0P5rpSvvVihOV2ugUa-hZyYnBA,40671
-pyfemtet/opt/_femopt_core.py,sha256=DtbzqhZ5zjHpRYQ2EtS2YTHrduDBLeIosPWYOA2vLXM,40402
+pyfemtet/opt/_femopt_core.py,sha256=zweGfu4DBr_aG0IPZHG09oQWcHLWU4EqcbQIHKAfs-4,40386
 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
@@ -42,9 +42,9 @@ 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=SstCN9WMYqF5lKNbb8xAzq0hBV-Hk8YuCrajvF3sOg0,1350
+pyfemtet/opt/interface/__init__.py,sha256=Bb4ifydHpclE_jwbmXm_DC6AYCN2rdWucN2raBITJPY,1349
 pyfemtet/opt/interface/_base.py,sha256=hDv4C8LQpKaeZJR8iEfTSVd4Na2fQblFBv0Yw78xcRY,2856
-pyfemtet/opt/interface/_excel_interface.py,sha256=QUGQhN8dUS8cvVTc7TUzirlhCWxQd5b4AQXIUzSen3o,40170
+pyfemtet/opt/interface/_excel_interface.py,sha256=l4t6uM64-E7E5EvTKhPh0kSdUW-boyXy72VqcjlgRNs,41009
 pyfemtet/opt/interface/_femtet.py,sha256=Y1t_GY_W0ivR6obv8eiMx1_-OoJFTjQAvhnoUkIMaaQ,38657
 pyfemtet/opt/interface/_femtet_excel.py,sha256=dWPQguKNOVdJ4jTfwLykCeM9iwA2S1KOLynw8UGzmvk,5968
 pyfemtet/opt/interface/_femtet_parametric.py,sha256=hxNiZfhR1IPtrMXg39TZutXTcOXdoxTKiRTTcYRGgVs,10181
@@ -150,9 +150,9 @@ 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.17.dist-info/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
-pyfemtet-0.8.17.dist-info/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
-pyfemtet-0.8.17.dist-info/METADATA,sha256=1cpHFveSodbOcGqRw2Ill8btupTGMC_XAZRkAatotso,3560
-pyfemtet-0.8.17.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-pyfemtet-0.8.17.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.8.17.dist-info/RECORD,,
+pyfemtet-0.8.19.dist-info/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
+pyfemtet-0.8.19.dist-info/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
+pyfemtet-0.8.19.dist-info/METADATA,sha256=d40UwPFshd3a0f7kxElPY-KROfpOq03U3A-ytSSttZI,3560
+pyfemtet-0.8.19.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+pyfemtet-0.8.19.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.8.19.dist-info/RECORD,,