pyfemtet 1.1.4__py3-none-any.whl → 1.1.6__py3-none-any.whl

pyfemtet/logger/_impl.py

@@ -81,6 +81,7 @@ def __create_formatter(colored=True):
 # ===== handler config =====
 
 STDOUT_HANDLER_NAME = 'stdout-handler'
+STDERR_HANDLER_NAME = 'stderr-handler'
 
 
 def __get_stdout_handler():
@@ -94,6 +95,17 @@ def __has_stdout_handler(logger):
     return any([handler.get_name() != STDOUT_HANDLER_NAME for handler in logger.handlers])
 
 
+def __get_stderr_handler():
+    stderr_handler = logging.StreamHandler(sys.stderr)
+    stderr_handler.set_name(STDERR_HANDLER_NAME)
+    stderr_handler.setFormatter(__create_formatter(colored=True))
+    return stderr_handler
+
+
+def __has_stderr_handler(logger):
+    return any([handler.get_name() != STDERR_HANDLER_NAME for handler in logger.handlers])
+
+
 def set_stdout_output(logger, level=logging.INFO):
 
     if not __has_stdout_handler(logger):
@@ -107,6 +119,19 @@ def remove_stdout_output(logger):
         logger.removeHandler(__get_stdout_handler())
 
 
+def set_stderr_output(logger, level=logging.INFO):
+
+    if not __has_stderr_handler(logger):
+        logger.addHandler(__get_stderr_handler())
+
+    logger.setLevel(level)
+
+
+def remove_stderr_output(logger):
+    if __has_stderr_handler(logger):
+        logger.removeHandler(__get_stderr_handler())
+
+
 def add_file_output(logger, filepath=None, level=logging.INFO) -> str:
     """Add FileHandler to the logger.
 
@@ -165,7 +190,7 @@ def setup_package_root_logger(package_name):
         with __lock:
             logger = logging.getLogger(package_name)
             logger.propagate = True
-            set_stdout_output(logger)
+            set_stderr_output(logger)
             logger.setLevel(logging.INFO)
             __initialized_root_packages.append(package_name)
     else:

pyfemtet/opt/interface/_base_interface.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Callable, Any
 
 import os
 import tempfile
@@ -105,7 +105,7 @@ class AbstractFEMInterface:
 
         return dst_path_
 
-    def _get_worker_space(self) -> str | None:
+    def _get_worker_space(self) -> str:
         worker = get_worker()
         if worker is None:
             assert hasattr(self, '_tmp_dir'), 'Internal Error! Run _distribute_files() first!'
@@ -176,12 +176,12 @@ class AbstractFEMInterface:
         pass
 
     # noinspection PyMethodMayBeStatic,PyUnusedLocal
-    def _check_using_fem(self, fun: callable) -> bool:
+    def _check_using_fem(self, fun: Callable) -> bool:
         return False
 
     # ===== postprocessing after recording =====
 
-    def _create_postprocess_args(self) -> dict[str, ...]:
+    def _create_postprocess_args(self) -> dict[str, Any]:
         return {}
 
     @staticmethod

pyfemtet/opt/interface/_solidworks_interface/solidworks_interface.py

@@ -1,14 +1,11 @@
 from __future__ import annotations
 
 from time import sleep
-from typing import TYPE_CHECKING
-
+from typing import TYPE_CHECKING, Any
 import os
-import re
 
-from win32com.client import DispatchEx, CDispatch
-# noinspection PyUnresolvedReferences
-from pythoncom import CoInitialize, CoUninitialize, com_error
+from win32com.client import Dispatch, DispatchEx
+from pythoncom import com_error, CoInitialize
 
 from pyfemtet._util.dask_util import *
 from pyfemtet.opt.exceptions import *
@@ -20,9 +17,8 @@ from pyfemtet.logger import get_module_logger
 if TYPE_CHECKING:
     from pyfemtet.opt.optimizer import AbstractOptimizer
 
-
 logger = get_module_logger('opt.interface', False)
-
+asm_logger = get_module_logger('opt.interface.sldasm', False)
 
 # 定数の宣言
 swThisConfiguration = 1  # https://help.solidworks.com/2023/english/api/swconst/SOLIDWORKS.Interop.swconst~SOLIDWORKS.Interop.swconst.swInConfigurationOpts_e.html
@@ -33,12 +29,50 @@ swSaveAsOptions_Copy = 2  #
 swSaveAsOptions_Silent = 1  # https://help.solidworks.com/2021/english/api/swconst/solidworks.interop.swconst~solidworks.interop.swconst.swsaveasoptions_e.html
 swSaveWithReferencesOptions_None = 0  # https://help-solidworks-com.translate.goog/2023/english/api/swconst/SolidWorks.Interop.swconst~SolidWorks.Interop.swconst.swSaveWithReferencesOptions_e.html?_x_tr_sl=auto&_x_tr_tl=ja&_x_tr_hl=ja&_x_tr_pto=wapp
 swDocPART = 1  # https://help.solidworks.com/2023/english/api/swconst/SOLIDWORKS.Interop.swconst~SOLIDWORKS.Interop.swconst.swDocumentTypes_e.html
+swDocASSEMBLY = 2
 
 
 class FileNotOpenedError(Exception):
     pass
 
 
+class EquationContext:
+    def __init__(self, swModel) -> None:
+        self.swModel = swModel
+        self.swEqnMgr = None
+
+    def __enter__(self):
+        # プロパティを退避
+        self.swEqnMgr = self.swModel.GetEquationMgr
+        self.buffer_aso = self.swEqnMgr.AutomaticSolveOrder
+        self.buffer_ar = self.swEqnMgr.AutomaticRebuild
+        self.swEqnMgr.AutomaticSolveOrder = False
+        self.swEqnMgr.AutomaticRebuild = False
+        return self.swEqnMgr
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        # プロパティをもとに戻す
+        assert self.swEqnMgr is not None
+        self.swEqnMgr.AutomaticSolveOrder = self.buffer_aso
+        self.swEqnMgr.AutomaticRebuild = self.buffer_ar
+
+
+class EditPartContext:
+    def __init__(self, swModel, component) -> None:
+        self.swModel = swModel
+        self.component = component
+
+    def __enter__(self):
+        swSelMgr = self.swModel.SelectionManager
+        swSelData = swSelMgr.CreateSelectData
+        swSelMgr.AddSelectionListObject(self.component, swSelData)
+        # self.swModel.EditPart()  # 対象がアセンブリの場合動作しない
+        self.swModel.AssemblyPartToggle()  # Obsolete だが代わりにこれを使う
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.swModel.EditAssembly()
+
+
 # noinspection PyPep8Naming
 class SolidworksInterface(COMInterface):
     """
@@ -63,7 +97,7 @@ class SolidworksInterface(COMInterface):
         AssertionError: If the specified part file does not exist.
     """
 
-    swApp: CDispatch
+    swApp: Any
     com_members = {'swApp': 'SLDWORKS.Application'}
     _access_sw_lock_name = 'access_sw'
 
@@ -77,7 +111,8 @@ class SolidworksInterface(COMInterface):
         self.quit_solidworks_on_terminate = close_solidworks_on_terminate
         self.solidworks_visible = visible
 
-        assert os.path.isfile(self.sldprt_path)
+        if not os.path.isfile(self.sldprt_path):
+            raise FileNotFoundError(self.sldprt_path)
         self._original_sldprt_path = self.sldprt_path
 
     def connect_sw(self):
@@ -86,9 +121,9 @@ class SolidworksInterface(COMInterface):
             jp_message='Solidworks に接続しています...'
         ))
         try:
-            self.swApp = DispatchEx('SLDWORKS.Application')
+            self.swApp = Dispatch('SLDWORKS.Application')
         except com_error:
-            raise Exception(_(
+            raise RuntimeError(_(
                 en_message='Failed to instantiate Solidworks. '
                            'Please check installation and enabling macro.',
                 jp_message='Solidworks のインスタンス化に失敗しました。'
@@ -97,18 +132,32 @@ class SolidworksInterface(COMInterface):
         self.swApp.Visible = self.solidworks_visible
 
     def _setup_before_parallel(self, scheduler_address=None):
-        self._distribute_files([self.sldprt_path], scheduler_address)
-
-    def _setup_after_parallel(self, opt: AbstractOptimizer = None):
+        if not _is_assembly(self.sldprt_path):
+            self._distribute_files([self.sldprt_path], scheduler_address)
+
+    def _setup_after_parallel(self, opt: AbstractOptimizer):
+
+        # validation
+        if _is_assembly(self.sldprt_path) and get_worker() is not None:
+            # 現在の仕様だと sldprt_path だけが
+            # worker_space に保存される。
+            # 並列処理に対応するためには
+            # すべてのファイルを distribute したうえで
+            # 構成部品の置換を実行する必要がある。
+            raise RuntimeError(_(
+                en_message='Parallel processing is not supported when handling assembly parts with SolidworksInterface.',
+                jp_message='SolidworksInterfaceでアセンブリパーツを対象とする場合、並列処理はサポートされていません。'
+            ))
 
-        # get suffix
-        suffix = self._get_file_suffix(opt)
+        if not _is_assembly(self.sldprt_path):
+            # get suffix
+            suffix = self._get_file_suffix(opt)
 
-        # rename and get worker path
-        self.sldprt_path = self._rename_and_get_path_on_worker_space(
-            self._original_sldprt_path,
-            suffix,
-        )
+            # rename and get worker path
+            self.sldprt_path = self._rename_and_get_path_on_worker_space(
+                self._original_sldprt_path,
+                suffix,
+            )
 
         # connect solidworks
         CoInitialize()
@@ -116,10 +165,13 @@ class SolidworksInterface(COMInterface):
             self.connect_sw()
 
             # open it
-            self.swApp.OpenDoc(self.sldprt_path, swDocPART)
+            if _is_assembly(self.sldprt_path):
+                self.swApp.OpenDoc(self.sldprt_path, swDocASSEMBLY)
+            else:
+                self.swApp.OpenDoc(self.sldprt_path, swDocPART)
 
     @property
-    def swModel(self) -> CDispatch:
+    def swModel(self):
         return _get_model_by_basename(self.swApp, os.path.basename(self.sldprt_path))
 
     def update(self) -> None:
@@ -131,54 +183,19 @@ class SolidworksInterface(COMInterface):
 
         # sw はプロセスが一つなので Lock
         with Lock(self._access_sw_lock_name):
-
             sleep(0.2)
-
-            # ===== model を取得 =====
             swModel = self.swModel
-
-            # ===== equation manager を取得 =====
-            swEqnMgr = swModel.GetEquationMgr
-            nEquation = swEqnMgr.GetCount
-
-            # プロパティを退避
-            buffer_aso = swEqnMgr.AutomaticSolveOrder
-            buffer_ar = swEqnMgr.AutomaticRebuild
-            swEqnMgr.AutomaticSolveOrder = False
-            swEqnMgr.AutomaticRebuild = False
-
-            # 値を更新
-            for i in range(nEquation):
-                # name, equation の取得
-                eq = swEqnMgr.Equation(i)
-                prm_name = _get_name_from_equation(eq)
-                # 対象なら処理
-                if prm_name in self.current_prm_values:
-                    prm = self.current_prm_values[prm_name]
-                    right = str(prm.value) + prm.properties.get('unit', '')
-                    new_equation = f'"{prm_name}" = {right}'
-                    swEqnMgr.Equation(i, new_equation)
-
-            # 式の計算
-            # noinspection PyStatementEffect
-            swEqnMgr.EvaluateAll  # always returns -1
-
-            # プロパティをもとに戻す
-            swEqnMgr.AutomaticSolveOrder = buffer_aso
-            swEqnMgr.AutomaticRebuild = buffer_ar
+            mgr = _UpdateVariableManager()
+            mgr._update_global_variables(swModel, self.current_prm_values)
 
     def update_model(self):
         """Update .sldprt"""
 
         # sw はプロセスが一つなので Lock
         with Lock(self._access_sw_lock_name):
-
             sleep(0.2)
 
-            # ===== model を取得 =====
             swModel = self.swModel
-
-            # モデル再構築
             result = swModel.EditRebuild3  # モデル再構築
             if not result:
                 raise ModelError(_(
@@ -212,18 +229,124 @@ class SolidworksInterface(COMInterface):
             sleep(3)
 
 
+def _is_assembly(swModel_or_name):
+    if isinstance(swModel_or_name, str):
+        return swModel_or_name.lower().endswith('.sldasm')
+    else:
+        return swModel_or_name.GetPathName.lower().endswith('.sldasm')
+
+
+def _iter_parts(swModel):
+    components = swModel.GetComponents(
+        False  # TopOnly
+    )
+    return components
+
+
+class _UpdateVariableManager:
+
+    def __init__(self):
+        self.updated_variables = set()
+
+    def _update_global_variables(self, swModel, x: TrialInput):
+        # まず自身のパラメータを更新
+        asm_logger.debug(f'Processing `{swModel.GetPathName}`')
+        self._update_global_variables_core(swModel, x)
+
+        # アセンブリならば、構成部品のパラメータを更新
+        if _is_assembly(swModel):
+            components = _iter_parts(swModel)
+            for component in components:
+                swPartModel = component.GetModelDoc2
+                asm_logger.debug(f'Checking `{swPartModel.GetPathName}`')
+                if swPartModel.GetPathName.lower() not in self.updated_variables:
+                    asm_logger.debug(f'Processing `{swPartModel.GetPathName}`')
+                    with EditPartContext(swModel, component):
+                        self._update_global_variables_core(swPartModel, x)
+                    self.updated_variables.add(swPartModel.GetPathName.lower())
+
+    def _update_global_variables_core(self, swModel, x: TrialInput):
+        with EquationContext(swModel) as swEqnMgr:
+            # txt にリンクされている場合は txt を更新
+            if swEqnMgr.LinkToFile:
+                self._update_global_variables_linked_txt(swEqnMgr, x)
+            self._update_global_variables_simple(swEqnMgr, x)
+            # noinspection PyStatementEffect
+            swEqnMgr.EvaluateAll
+
+    def _update_global_variables_linked_txt(self, swEqnMgr, x: TrialInput):
+        txt_path = swEqnMgr.FilePath
+        if txt_path in self.updated_variables:
+            return
+        with open(txt_path, 'r', encoding='utf_8_sig') as f:
+            equations = [line.strip() for line in f.readlines() if line.strip() != '']
+        for i, eq in enumerate(equations):
+            equations[i] = self._update_equation(eq, x)
+        with open(txt_path, 'w', encoding='utf_8_sig') as f:
+            f.writelines([eq + '\n' for eq in equations])
+        asm_logger.debug(f'`{txt_path}` is updated.')
+        self.updated_variables.add(txt_path)
+
+    def _update_global_variables_simple(self, swEqnMgr, x: TrialInput):
+        nEquation = swEqnMgr.GetCount
+
+        # equation を列挙
+        asm_logger.debug(f'{nEquation} equations detected.')
+        for i in range(nEquation):
+            # name, equation の取得
+            eq = swEqnMgr.Equation(i)
+            prm_name = self._get_left(eq)
+            # COM 経由なので必要な時以外は触らない
+            asm_logger.debug(f'Checking `{prm_name}`')
+            if (prm_name in x) and (prm_name not in self.updated_variables):
+                asm_logger.debug(f'Processing `{prm_name}`')
+                # 特定の Equation がテキストリンク有効か
+                # どうかを判定する術がないので、一旦更新する
+                new_eq = self._update_equation(eq, x)
+                swEqnMgr.Equation(i, new_eq)
+                # テキストリンクの場合、COM インスタンスに
+                # 更新された値が残ってしまうのでテキストを再読み込み
+                if swEqnMgr.LinkToFile:
+                    # noinspection PyStatementEffect
+                    swEqnMgr.UpdateValuesFromExternalEquationFile
+                self.updated_variables.add(prm_name)
+
+    def _update_equation(self, equation: str, x: TrialInput):
+        prm_name = self._get_left(equation)
+        if prm_name not in x:
+            return equation
+        prm = x[prm_name]
+        right = str(prm.value) + prm.properties.get('unit', '')
+        new_eq = f'"{prm_name}" = {right}'
+        asm_logger.debug(f'New eq.: `{new_eq}`')
+        return new_eq
+
+    @staticmethod
+    def _get_left(equation: str):
+        return equation.split('=')[0].strip('" ')
+
+    @staticmethod
+    def _load(swModel):
+        # テスト用関数
+        out = set()
+        swEqnMgr = swModel.GetEquationMgr
+        for i in range(swEqnMgr.GetCount):
+            eq = swEqnMgr.Equation(i)
+            out.add(eq)
+        if _is_assembly(swModel):
+            components = _iter_parts(swModel)
+            for component in components:
+                swPartModel = component.GetModelDoc2
+                swEqnMgr = swPartModel.GetEquationMgr
+                for i in range(swEqnMgr.GetCount):
+                    eq = swEqnMgr.Equation(i)
+                    out.add(eq)
+        return out
+
+
 # noinspection PyPep8Naming
 def _get_model_by_basename(swApp, basename):
     swModel = swApp.ActivateDoc(basename)
     if swModel is None:
         raise FileNotOpenedError(f'Model {basename} is not opened.')
     return swModel
-
-
-def _get_name_from_equation(equation: str):
-    pattern = r'^\s*"(.+?)"\s*$'
-    matched = re.match(pattern, equation.split('=')[0])
-    if matched:
-        return matched.group(1)
-    else:
-        return None

pyfemtet/opt/interface/_solidworks_interface/sw_const.py

@@ -0,0 +1,32 @@
+# https://help.solidworks.com/2026/English/api/swconst/SOLIDWORKS.Interop.swconst~SOLIDWORKS.Interop.swconst.swDocumentTypes_e.html
+swDocASSEMBLY = 2
+swDocDRAWING = 3
+swDocIMPORTED_ASSEMBLY = 7
+swDocIMPORTED_PART = 6
+swDocLAYOUT = 5
+swDocNONE = 0
+swDocPART = 1
+swDocSDM = 4
+
+# https://help.solidworks.com/2026/English/api/swconst/SOLIDWORKS.Interop.swconst~SOLIDWORKS.Interop.swconst.swOpenDocOptions_e.html
+swOpenDocOptions_AdvancedConfig = 8192 or 0x2000  # Open assembly using an advanced configuration
+swOpenDocOptions_AutoMissingConfig = 32 or 0x20  # Obsolete  # do not use
+# The software automatically uses the last-used configuration of a model when it discovers missing configurations or component references as it silently opens drawings and assemblies.
+
+swOpenDocOptions_DontLoadHiddenComponents = 256 or 0x100  # By default, hidden components are loaded when you open an assembly document. Set swOpenDocOptions_DontLoadHiddenComponents to not load hidden components when opening an assembly document
+swOpenDocOptions_LDR_EditAssembly = 2048 or 0x800  # Open in Large Design Review (resolved) mode with edit assembly enabled  # use in combination with swOpenDocOptions_ViewOnly
+swOpenDocOptions_LoadExternalReferencesInMemory = 512 or 0x200  # Open external references in memory only  # this setting is valid only if swUserPreferenceIntegerValue_e.swLoadExternalReferences is not set to swLoadExternalReferences_e.swLoadExternalReferences_None
+# swUserPreferenceToggle_e.swExtRefLoadRefDocsInMemory (System Options > External References > Load documents in memory only) is ignored when opening documents through the API because IDocumentSpecification::LoadExternalReferencesInMemory and ISldWorks::OpenDoc6 (swOpenDocOptions_e.swOpenDocOptions_LoadExternalReferencesInMemory) have sole control of reference loading
+
+swOpenDocOptions_LoadLightweight = 128 or 0x80  # Open assembly document as lightweight
+# NOTE: The default for whether an assembly document is opened lightweight is based on a registry setting accessed via Tools, Options, Assemblies or with the user preference setting swAutoLoadPartsLightweight
+# To override the default and specify a value with ISldWorks::OpenDoc6, set swOpenDocOptions_OverrideDefaultLoadLightweight. If set, then you can set swOpenDocOptions_LoadLightweight to open an assembly document as lightweight
+
+swOpenDocOptions_LoadModel = 16 or 0x10  # Load Detached model upon opening document (drawings only)
+swOpenDocOptions_OpenDetailingMode = 1024 or 0x400  # Open document in detailing mode
+swOpenDocOptions_OverrideDefaultLoadLightweight = 64 or 0x40  # Override default setting whether to open an assembly document as lightweight
+swOpenDocOptions_RapidDraft = 8 or 0x8  # Convert document to Detached format (drawings only)
+swOpenDocOptions_ReadOnly = 2 or 0x2  # Open document read only
+swOpenDocOptions_Silent = 1 or 0x1  # Open document silently
+swOpenDocOptions_SpeedPak = 4096 or 0x1000  # Open document using the SpeedPak option
+swOpenDocOptions_ViewOnly = 4 or 0x4  # Open document in Large Design Review mode (assemblies only)

pyfemtet/opt/optimizer/_base_optimizer.py

@@ -4,6 +4,7 @@ import datetime
 from typing import Callable, TypeAlias, Sequence, Literal
 from numbers import Real  # マイナーなので型ヒントでは使わず、isinstance で使う
 from time import sleep
+import os
 
 import sympy
 
@@ -871,6 +872,10 @@ class AbstractOptimizer:
 
             self.worker_status.value = WorkerStatus.running
 
+            if os.environ.get('DEBUG_FEMOPT_PARALLEL'):
+                if isinstance(worker_idx, int):
+                    sleep(worker_idx)
+
             self.run()
 
         logger.info(_(

pyfemtet/opt/optimizer/optuna_optimizer/_optuna_optimizer.py

@@ -43,6 +43,20 @@ warnings.filterwarnings('ignore', 'Argument ``constraints_func`` is an experimen
 _MESSAGE_ENQUEUED = 'Enqueued trial.'
 
 
+def check_float_and_raise(value, check_target):
+    if isinstance(value, int | float):
+        if np.isnan(value):
+            raise ValueError(_(
+                en_message=f'{check_target} is NaN.',
+                jp_message=f'{check_target} は NaN です。',
+            ))
+    else:
+        raise ValueError(_(
+            en_message=f'{check_target} should be a number, but {value} ({type(value)}) passed.',
+            jp_message=f'{check_target} は数値でなくてはなりませんが、{value} ({type(value)}) が与えられました。',
+        ))
+
+
 class MaxTrialsCallbackExcludingEnqueued(MaxTrialsCallback):
     def __call__(self, study: Study, trial: FrozenTrial) -> None:
         """
@@ -167,14 +181,31 @@ class OptunaOptimizer(AbstractOptimizer):
             self,
             name: str,
             initial_value: float,
-            lower_bound: float,
-            upper_bound: float,
+            lower_bound: float | None = None,
+            upper_bound: float | None = None,
             step: float | None = None,
             properties: dict[str, ...] | None = None,
             *,
             pass_to_fem: bool = True,
             fix: bool = False,
     ) -> None:
+
+        if lower_bound is None or upper_bound is None:
+            properties = properties or {}
+            if properties.get('dynamic_bounds_fun') is None:
+                raise ValueError(_(
+                    en_message='When using `OptunaOptimizer`, you must either specify `lower_bound` and `upper_bound`, ' \
+                               'or include `dynamic_bounds_fun` (Callable[[AbstractOptimizer], float]) in `properties`.',
+                    jp_message='OptunaOptimizer では、lower_bound と upper_bound を両方指定するか、' \
+                               'または properties に dynamic_bounds_fun (Callable[[AbstractOptimizer], float]) ' \
+                               'を含めなければなりません。'
+                ))
+            else:
+                logger.warning(_(
+                    en_message='`dynamic_bounds_fun` is under development. The functionally can be changed without any announcement.',
+                    jp_message='dynamic_bounds_fun は開発中の機能です。機能は予告なく変更されることがあります。',
+                ))
+
         AbstractOptimizer.add_parameter(self, name, initial_value, lower_bound, upper_bound, step, properties,
                                         pass_to_fem=pass_to_fem, fix=fix)
 
@@ -271,6 +302,13 @@ class OptunaOptimizer(AbstractOptimizer):
                     continue
 
                 if isinstance(prm, NumericParameter):
+                    dynamic_bounds_fun = prm.properties.get('dynamic_bounds_fun')
+                    if dynamic_bounds_fun:
+                        lb, ub = dynamic_bounds_fun(self)
+                        check_float_and_raise(lb, _(f'lower_bound of {prm.name}', f'{prm.name} の lower_bound'))
+                        check_float_and_raise(ub, _(f'upper_bound of {prm.name}', f'{prm.name} の upper_bound'))
+                        prm.lower_bound = lb
+                        prm.upper_bound = ub
                     prm.value = trial.suggest_float(
                         name,
                         prm.lower_bound,

pyfemtet/opt/problem/variable_manager/_variable_manager.py

@@ -311,6 +311,7 @@ class VariableManager:
         | dict[str, SupportedVariableTypes]
         | np.ndarray
     ):
+        # 参照を返す仕様を dynamic bounds で利用
 
         raw = {}
 

pyfemtet/opt/visualization/history_viewer/_complex_components/pm_graph.py

@@ -428,9 +428,10 @@ class PredictionModelGraph(AbstractPage):
                     self.CommandState.ready.value,
                     self.alert_region.create_alerts(
                         _(
-                            en_message='Cannot draw the graph because the selected parameter '
-                                       'is a fixed and its bounds are not given.',
-                            jp_message='選択された変数は固定値で上下限も与えられていないため、'
+                            en_message='Cannot draw the graph because '
+                                       'the bounds of selected parameter '
+                                       'are not given.',
+                            jp_message='選択された変数は上下限が与えられていないため、'
                                        'グラフを描画できません。',
                         ),
                         color='danger',

{pyfemtet-1.1.4.dist-info → pyfemtet-1.1.6.dist-info}/METADATA

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

{pyfemtet-1.1.4.dist-info → pyfemtet-1.1.6.dist-info}/RECORD

@@ -26,7 +26,7 @@ pyfemtet/core.py,sha256=t5tvWGrBNzCL9cP-91hbTR8q5lzULPsVeIEybeslhxQ,936
 pyfemtet/dispatch_extensions/__init__.py,sha256=BzxYq3x8YdkdClq4VvH4G5HTGxu5nyAhN7xlFsnTv8c,159
 pyfemtet/dispatch_extensions/_impl.py,sha256=Sgp350ioKcNVslXv9xRdtRjaQGRQM-BwbJYXjeildtw,11107
 pyfemtet/logger/__init__.py,sha256=lofBrZHr0P1hsxPUiPG1SQqKxCuSBk8zGnR7vUfCHYw,516
-pyfemtet/logger/_impl.py,sha256=uJ9el3kR-A4W2DvO_G5A6k9z2u1lkyl7GSvZ68uPy-U,6321
+pyfemtet/logger/_impl.py,sha256=tR71WZbjUvnZqULzxD4Y8Vhq8eBnJhMm360-JXxB5Dc,7012
 pyfemtet/opt/__init__.py,sha256=1LcwTddtoi8plemxkzmX0YEKiNpAZvKn9OoNQysyDLE,339
 pyfemtet/opt/exceptions.py,sha256=M_O7jm20Y4e_QxsKF6tnEl-OrAtErUOj6hNT7eEXCO4,1327
 pyfemtet/opt/femopt.py,sha256=Zht_H_eaTUwUcA7XFlzod0mGoJzTOZckqRK3VuwjaHM,23716
@@ -35,7 +35,7 @@ pyfemtet/opt/history/_history.py,sha256=K1k-iOSFoowqKPVZgvWEhdysO9ZsMuqEQ-P_kvO-
 pyfemtet/opt/history/_hypervolume.py,sha256=_IvGH71ZNreWvDQCG815Q2hS1OEvPFPQhUnNXf1UxRQ,4449
 pyfemtet/opt/history/_optimality.py,sha256=6vLySZmrrklr04Qir0hGethTykf8NYFod88NDGrBrG0,2407
 pyfemtet/opt/interface/__init__.py,sha256=b2lfkBL-UPbzJppIqSgtUqHSHitPLQa6DRuH91nDZK8,1905
-pyfemtet/opt/interface/_base_interface.py,sha256=QODB9d4xZu8-T7-BxOiz6s33HXtX9FG6kfA8qv4qWs8,6681
+pyfemtet/opt/interface/_base_interface.py,sha256=iWJmJ8kxRH-Cztfhy3QKfRhSKRMytBtjGqgVjVavoPw,6689
 pyfemtet/opt/interface/_dummy_classes.py,sha256=847zs3SwetMpRsGtivhvST_z2UKavKvTfUBZvkYfqB0,505
 pyfemtet/opt/interface/_excel_interface/__init__.py,sha256=bFOmY18-j4RJc_dHQMe62GsxFwQSj7RWdvi6jxWuqyg,74
 pyfemtet/opt/interface/_excel_interface/debug-excel-interface.xlsm,sha256=TM1CEOC5XtU7qYKNnHScO02kdtXT-gc5y29m2hatsm0,114259
@@ -51,7 +51,8 @@ pyfemtet/opt/interface/_femtet_with_nx_interface/update_model.py,sha256=2U5SJWnG
 pyfemtet/opt/interface/_femtet_with_solidworks/__init__.py,sha256=5McSpy2uTmJNBylCrKt4xMSq90hlSpqyXYsjwZT3yGA,128
 pyfemtet/opt/interface/_femtet_with_solidworks/femtet_with_solidworks_interface.py,sha256=xBAmHbzNrmHI6zzwUMX_mdjUkhRfyqzmYQN2_QNZcfE,5897
 pyfemtet/opt/interface/_solidworks_interface/__init__.py,sha256=2c52Hfme1xdJepewRGVkPT4yhrZMQgzlCuqvHzEZPVk,95
-pyfemtet/opt/interface/_solidworks_interface/solidworks_interface.py,sha256=KkXfXJ5IaTl2pJXBlH25rdmsKFWUbqNTk3sGjD3Qgys,8408
+pyfemtet/opt/interface/_solidworks_interface/solidworks_interface.py,sha256=2SaUI5Lh1gVGqTNcSgqn0Ay1e0tZQHIXFOyYquwVvPw,14127
+pyfemtet/opt/interface/_solidworks_interface/sw_const.py,sha256=M6KV0KmRiSOofW4ydV-3Zxqzofz4ij13CsM3Ggw6HS4,3085
 pyfemtet/opt/interface/_surrogate_model_interface/__init__.py,sha256=9sjzQjJsMLdpBSpURyl8x4VQHEO_PGYgAshCHoycAPI,252
 pyfemtet/opt/interface/_surrogate_model_interface/base_surrogate_interface.py,sha256=48mUOPgOVi_SRs_VnElgh6BMUJHQG9jzWpCocK_gjiY,6355
 pyfemtet/opt/interface/_surrogate_model_interface/botorch_interface.py,sha256=JsFDs5GzlsstpyXjTYpUi_ctWlcEKliX3qMr4HBPj_E,10570
@@ -64,11 +65,11 @@ pyfemtet/opt/meta_script/__main__.py,sha256=9-QM6eZOLpZ_CxERpRu3RAMqpudorSJdPCiK
 pyfemtet/opt/meta_script/sample/sample.bas,sha256=2iuSYMgPDyAdiSDVGxRu3avjcZYnULz0l8e25YBa7SQ,27966
 pyfemtet/opt/meta_script/sample/sample.femprj,sha256=6_0ywhgXxZjdzZzQFog8mgMUEjKNCFVNlEgAWoptovk,292885
 pyfemtet/opt/optimizer/__init__.py,sha256=A4QYeF0KHEFdwoxLfkDND7ikDQ186Ryy3oXEGdakFSg,463
-pyfemtet/opt/optimizer/_base_optimizer.py,sha256=o7XYqAJywX-gnXu2iyKXRKAhyIklZxbAuLitTn23_-Q,37445
+pyfemtet/opt/optimizer/_base_optimizer.py,sha256=9vwrB7ER-Qfh0tGdP5Fg7mP459WXFGSc-yMlyYdZ4sY,37598
 pyfemtet/opt/optimizer/_trial_queue.py,sha256=Yv6JlfVCYOiCukllfxk79xU4_utmxwRA3gcCWpdyG9k,2919
 pyfemtet/opt/optimizer/optuna_optimizer/__init__.py,sha256=u2Bwc79tkZTU5dMbhzzrPQi0RlFg22UgXc-m9K9G6wQ,242
 pyfemtet/opt/optimizer/optuna_optimizer/_optuna_attribute.py,sha256=7eZsruVCGgMlcnf3a9Vf55FOEE-D7V777MJQajI12Cw,1842
-pyfemtet/opt/optimizer/optuna_optimizer/_optuna_optimizer.py,sha256=2hWxS-PZ-oQyPw1cDfW5e6Tiu2bAUmE9Wo9WR01e2zc,32863
+pyfemtet/opt/optimizer/optuna_optimizer/_optuna_optimizer.py,sha256=mlp4jnjK78lV7hiw_SYrIc8k1CuE28z9hxHSfeefTIk,35078
 pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/__init__.py,sha256=BFbMNvdXqV9kl1h340pW2sq0-cwNFV5dfTo6UnNnX2M,179
 pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/debug-pof-botorch.reccsv,sha256=K6oI9jPi_5yayhBrI9Tm1RX3PoWWKo74TOdqnaPsIy8,1746
 pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/enable_nonlinear_constraint.py,sha256=jq8cfkZuEkdd8Gvlr3Do4dl48bKSm9Uu7AcEy1dAf6U,9901
@@ -85,7 +86,7 @@ pyfemtet/opt/problem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 pyfemtet/opt/problem/problem.py,sha256=X9mro2yVJ6Uw9ck0F0OjG-0M2ReKtuWltu-JUEFIkzQ,10025
 pyfemtet/opt/problem/variable_manager/__init__.py,sha256=uzuraWUZfLzB3uZHIQHFL7uMxWvv7Oaf940zEozXtNY,476
 pyfemtet/opt/problem/variable_manager/_string_as_expression.py,sha256=aTJ9W9Gs6BS0Z_OsxWByJs9dAt32opD2_9913MCggPg,3626
-pyfemtet/opt/problem/variable_manager/_variable_manager.py,sha256=o6wtaHlgZ-1gbMrLrZYX555M_gTkLDO4p-VHIXE42-k,12725
+pyfemtet/opt/problem/variable_manager/_variable_manager.py,sha256=jtIHFWgVP2jhA3c5uSD388VZHuShR25ZZ8SYz5-6Rro,12785
 pyfemtet/opt/visualization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/_create_wrapped_components.py,sha256=9AltJHr1DM6imZfpNp867rC-uAYqQ-emdgTLChKDrl8,2513
 pyfemtet/opt/visualization/history_viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -97,7 +98,7 @@ pyfemtet/opt/visualization/history_viewer/_complex_components/alert_region.py,sh
 pyfemtet/opt/visualization/history_viewer/_complex_components/control_femtet.py,sha256=FQUR9bYtMoj_3bvHXfzAhYMoYpbIWcDP8j7M2EwnYQM,6253
 pyfemtet/opt/visualization/history_viewer/_complex_components/detail_graphs.py,sha256=friaHAJOG5BEUAkoy7ukpO-vUhJ0DlJFwMB2ayNJ4so,19134
 pyfemtet/opt/visualization/history_viewer/_complex_components/main_graph.py,sha256=dMphOHbSV2R3oQvPlIQj7GwtV0phPiBwKniblxTAxMY,25978
-pyfemtet/opt/visualization/history_viewer/_complex_components/pm_graph.py,sha256=-fihXFDe_RdUTjaPepiVMWM4zVYAf6oD8QrPVdvA_wA,29840
+pyfemtet/opt/visualization/history_viewer/_complex_components/pm_graph.py,sha256=y3FSZGIdaWcJQdbACbfIkjuAumW6pXxQ89Wkafnp4pA,29854
 pyfemtet/opt/visualization/history_viewer/_detail_page.py,sha256=2LdCFSCcxZkAH6QMa9q6QX-KLYhVrRf-iTh7jNPrnnA,3406
 pyfemtet/opt/visualization/history_viewer/_helper.py,sha256=276488eouQEo-haK4XXCVM1Vy8_28Vyp5g0l7zt4Sfc,1009
 pyfemtet/opt/visualization/history_viewer/_process_monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -171,9 +172,9 @@ pyfemtet/opt/visualization/plotter/parallel_plot_creator.py,sha256=VRhT0CUG1mCHD
 pyfemtet/opt/visualization/plotter/pm_graph_creator.py,sha256=7EwmoJlnHwDrpw65NchiA63FIjgGTLq6vTcpTzrSnJo,11841
 pyfemtet/opt/wat_ex14_parametric_jp.femprj,sha256=dMwQMt6yok_PbZLyxPYdmg5wJQwgQDZ4RhS76zdGLGk,177944
 pyfemtet/opt/worker_status.py,sha256=simvPa1AkO1idmPXrF5WjYVEBx3tO7hLhbM3J1rFjdo,3824
-pyfemtet-1.1.4.dist-info/METADATA,sha256=Q9l6olWlrWO1Hhy_67IdqqhyKvJyjBiq25ywjv05TTs,3410
-pyfemtet-1.1.4.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-pyfemtet-1.1.4.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
-pyfemtet-1.1.4.dist-info/licenses/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
-pyfemtet-1.1.4.dist-info/licenses/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
-pyfemtet-1.1.4.dist-info/RECORD,,
+pyfemtet-1.1.6.dist-info/METADATA,sha256=d9ONd4nzpIoizIL5ZFjQ3v_9RJ5vm_eElDuZFwaw7A4,3410
+pyfemtet-1.1.6.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pyfemtet-1.1.6.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
+pyfemtet-1.1.6.dist-info/licenses/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
+pyfemtet-1.1.6.dist-info/licenses/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
+pyfemtet-1.1.6.dist-info/RECORD,,

{pyfemtet-1.1.4.dist-info → pyfemtet-1.1.6.dist-info}/WHEEL

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