pyfemtet 0.8.18__py3-none-any.whl → 0.9.0__py3-none-any.whl

pyfemtet/__init__.py

@@ -1 +1 @@
-__version__ = "0.8.18"
+__version__ = "0.9.0"

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.18.dist-info → pyfemtet-0.9.0.dist-info}/METADATA

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

{pyfemtet-0.8.18.dist-info → pyfemtet-0.9.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyfemtet/__init__.py,sha256=JhVwJTiRKMlMbkGesmi3xha7ApeH6eYngBm1czvd8Tc,22
+pyfemtet/__init__.py,sha256=7NrzGOSBvO9S73thMlxEh5aNYKS5SYKLgTxC1YIIPRk,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
@@ -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.18.dist-info/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
-pyfemtet-0.8.18.dist-info/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
-pyfemtet-0.8.18.dist-info/METADATA,sha256=aWDQ7WzqwRW4hFzxuVsyRr1_G9sVMTsXjkMxYLdeNG4,3560
-pyfemtet-0.8.18.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-pyfemtet-0.8.18.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.8.18.dist-info/RECORD,,
+pyfemtet-0.9.0.dist-info/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
+pyfemtet-0.9.0.dist-info/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
+pyfemtet-0.9.0.dist-info/METADATA,sha256=Wmxnr5QxZxQ5mTORj72DH1qJLuXlvUWTifbqYRWoZ4M,3559
+pyfemtet-0.9.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pyfemtet-0.9.0.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.9.0.dist-info/RECORD,,

{pyfemtet-0.8.18.dist-info → pyfemtet-0.9.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any