PyFemtet 1.5.0__tar.gz → 1.5.1__tar.gz

{pyfemtet-1.5.0 → pyfemtet-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyfemtet
-Version: 1.5.0
+Version: 1.5.1
 Summary: Design parameter optimization using Femtet.
 License-Expression: MIT
 License-File: LICENSE

{pyfemtet-1.5.0 → pyfemtet-1.5.1}/pyfemtet/opt/history/__init__.py

@@ -8,4 +8,5 @@ __all__ = [
     'create_err_msg_from_exception',
     'CorrespondingColumnNameRuler',
     'MAIN_FILTER',
+    'get_trial_name',
 ]

{pyfemtet-1.5.0 → pyfemtet-1.5.1}/pyfemtet/opt/history/_history.py

@@ -41,6 +41,7 @@ __all__ = [
     'create_err_msg_from_exception',
     'CorrespondingColumnNameRuler',
     'MAIN_FILTER',
+    'get_trial_name'
 ]
 
 MAIN_FILTER: dict = {
@@ -50,7 +51,32 @@ MAIN_FILTER: dict = {
 
 
 logger = get_module_logger('opt.history', False)
-logger_dask = get_module_logger('opt.dask', False)
+logger_dask = get_module_logger("opt.dask", False)
+
+
+def get_trial_name(trial=None, fidelity=None, sub_sampling=None, row: pd.Series = None):
+    if row is not None:
+        assert not math.isnan(row["trial"])
+        trial = row["trial"]
+        fidelity = row["fidelity"] if not math.isnan(row["fidelity"]) else None
+        sub_sampling = (
+            row["sub_sampling"] if not math.isnan(row["sub_sampling"]) else None
+        )
+
+    name_parts = ["trial"]
+    if fidelity is not None:
+        fid = str(fidelity)
+        if fid != MAIN_FIDELITY_NAME:
+            name_parts.append(fid)
+
+    name_parts.append(str(trial))
+
+    if sub_sampling is not None:
+        name_parts.append(str(sub_sampling))
+
+    trial_name = '_'.join(name_parts)
+
+    return trial_name
 
 
 def _assert_locked_with_timeout(lock, assertion_message=None, timeout=10.):
@@ -1315,26 +1341,7 @@ class History:
 
     @staticmethod
     def get_trial_name(trial=None, fidelity=None, sub_sampling=None, row: pd.Series = None):
-        if row is not None:
-            assert not math.isnan(row['trial'])
-            trial = row['trial']
-            fidelity = row['fidelity'] if not math.isnan(row['fidelity']) else None
-            sub_sampling = row['sub_sampling'] if not math.isnan(row['sub_sampling']) else None
-
-        name_parts = ['trial']
-        if fidelity is not None:
-            fid = str(fidelity)
-            if fid != MAIN_FIDELITY_NAME:
-                name_parts.append(fid)
-
-        name_parts.append(str(trial))
-
-        if sub_sampling is not None:
-            name_parts.append(str(sub_sampling))
-
-        trial_name = '_'.join(name_parts)
-
-        return trial_name
+        return get_trial_name(trial, fidelity, sub_sampling, row)
 
     def recording(self, fem: AbstractFEMInterface):
         """:meta private:"""

{pyfemtet-1.5.0 → pyfemtet-1.5.1}/pyfemtet/opt/interface/_femtet_interface/femtet_interface.py

@@ -34,6 +34,7 @@ from pyfemtet.dispatch_extensions import *
 from pyfemtet.opt.interface._base_interface import COMInterface
 from pyfemtet.opt.exceptions import *
 from pyfemtet.opt.problem.problem import *
+from pyfemtet.opt.history import get_trial_name
 
 from ._femtet_parametric import *
 
@@ -1111,9 +1112,9 @@ class FemtetInterface(COMInterface):
         if save_results.lower() == 'optimal':
             for i, row in df.iterrows():
                 if not bool(row['optimality']):
-                    trial_to_remove = int(row['trial'])
+                    trial_name_to_remove = get_trial_name(row=row)
                     pdt_path_to_remove = FemtetInterface._create_path(
-                        original_femprj_path, model_name, trial_to_remove, ext='pdt')
+                        original_femprj_path, model_name, trial_name_to_remove, ext='pdt')
                     if os.path.isfile(pdt_path_to_remove):
                         os.remove(pdt_path_to_remove)
 

{pyfemtet-1.5.0 → pyfemtet-1.5.1}/pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
 
 #[project.optional-dependencies]
 #brep = ["brepmatching>=0.1.8,<0.2"]
-version = "1.5.0"
+version = "1.5.1"
 
 [project.urls]
 Repository = "https://github.com/pyfemtet/pyfemtet"