PyFemtet 1.5.0__tar.gz → 1.6.0__tar.gz

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

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

{pyfemtet-1.5.0 → pyfemtet-1.6.0}/pyfemtet/opt/femopt.py

@@ -482,7 +482,7 @@ class FEMOpt:
                                'performing one of the following actions:\n'
                                '- {windows_only}Launch the `pyfemtet-opt-result-viewer` '
                                'shortcut on your desktop if exists.\n'
-                               '- {windows_only}Launch {path}.\n'
+                               '- {windows_only}Launch {dir}.\n'
                                '- Execute "py -m pyfemtet.opt.visualization.history_viewer" '
                                'in the command line',
                     jp_message='プログラム終了後も、結果ビューワを使って最適化結果を'

{pyfemtet-1.5.0 → pyfemtet-1.6.0}/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.6.0}/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.6.0}/pyfemtet/opt/interface/__init__.py

@@ -12,7 +12,7 @@ from ._base_interface import AbstractFEMInterface, NoFEM
 # 実際の実装が参照されるようにした。
 # VSCode では TYPE_CHECKING が True となる節が優先される。
 if platform.system() != 'Windows' and not TYPE_CHECKING:
-    from _dummy_classes import (
+    from ._dummy_classes import (
         FemtetInterface,
         FemtetWithNXInterface,
         FemtetWithSolidworksInterface,

{pyfemtet-1.5.0 → pyfemtet-1.6.0}/pyfemtet/opt/interface/_base_interface.py

@@ -90,9 +90,15 @@ class AbstractFEMInterface:
         # worker_space から探し
         # suffix を付与して rename し
         # その renamed path を返す関数
+        # ただし distribute_files を実行せずこれを実行して
+        # worker_space が取得できなかった場合は
+        # 元の path をそのまま返す
 
         worker_space = self._get_worker_space()
 
+        if worker_space is None:
+            return orig_path
+
         src_path = os.path.join(worker_space, os.path.basename(orig_path))
         p1_, p2_ = os.path.splitext(src_path)
         dst_path_ = p1_ + '_' + suffix + p2_
@@ -105,13 +111,17 @@ class AbstractFEMInterface:
 
         return dst_path_
 
-    def _get_worker_space(self) -> str:
+    def _get_worker_space(self) -> str | None:
         worker = get_worker()
         if worker is None:
-            assert hasattr(self, '_tmp_dir'), 'Internal Error! Run _distribute_files() first!'
-            return self._tmp_dir.name
+            if hasattr(self, '_tmp_dir'):
+                return self._tmp_dir.name
+            else:
+                return None
         else:
-            return worker.local_directory
+            out = worker.local_directory
+            assert out is not None, 'Internal Error: worker.local_directory is None'
+            return out
 
     def _distribute_files(self, paths: list[str], scheduler_address=None) -> None:
 

{pyfemtet-1.5.0 → pyfemtet-1.6.0}/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.6.0}/pyfemtet/opt/interface/_femtet_with_nx_interface/femtet_with_nx_interface.py

@@ -201,7 +201,13 @@ class FemtetWithNXInterface(FemtetInterface, _NXInterface):
 
         # 競合しないよう保存先を temp にしておく
         worker_space = self._get_worker_space()
-        xt_path = os.path.join(worker_space, 'temp.x_t')
+        if worker_space is not None:
+            xt_path = os.path.join(worker_space, 'temp.x_t')
+
+        # worker_space が取得できなかった場合は
+        # カレントディレクトリに保存する
+        else:
+            xt_path = os.path.abspath('_temp.x_t')
 
         # export parasolid
         self._export_xt(xt_path)

{pyfemtet-1.5.0 → pyfemtet-1.6.0}/pyfemtet/opt/interface/_femtet_with_solidworks/femtet_with_solidworks_interface.py

@@ -122,7 +122,13 @@ class FemtetWithSolidworksInterface(FemtetInterface, SolidworksInterface, Abstra
 
         # 競合しないよう保存先を temp にしておく
         worker_space = self._get_worker_space()
-        xt_path = os.path.join(worker_space, 'temp.x_t')
+        if worker_space is not None:
+            xt_path = os.path.join(worker_space, 'temp.x_t')
+
+        # worker_space が取得できなかった場合は
+        # カレントディレクトリに保存する
+        else:
+            xt_path = os.path.abspath('_temp.x_t')
 
         # export parasolid
         self._export_xt(xt_path)

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

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