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

pyfemtet/_i18n/messages.py

@@ -59,7 +59,6 @@ class Message:
     ERR_RUN_JOURNAL_NOT_FOUND = _(r'"%UGII_BASE_DIR%\NXBIN\run_journal.exe" is not found. Make sure you have NX installed and the environment variable UGII_BASE_DIR is set.')
     ERR_MODEL_RECONSTRUCTION_FAILED = _('Model reconstruction failed.')
     ERR_MODEL_UPDATE_FAILED = _('Model update failed.')
-    ERR_NO_MAKEPY = _('It was detected that the configuration of Femtet python macro constants has not been completed. The configuration was done automatically (python -m win32com.client.makepy FemtetMacro). Please restart the program. If the error persists, please run "py -m win32com.client.makepy FemtetMacro" or "python -m win32com.client.makepy FemtetMacro" on the command prompt.')
     ERR_FEMTET_CONNECTION_FAILED = _('Failed to connect to Femtet.')
 
     @staticmethod

pyfemtet/_util/solidworks_variable.py

@@ -0,0 +1,169 @@
+from typing import TypeAlias
+
+SWVariables: TypeAlias = dict[str, str]
+"""<prm_name>: <expression>. Note that the <prm_name> does not contain `"`."""
+
+
+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()
+
+
+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
+
+
+# Used by pyfemtet-opt-gui
+class SolidworksVariableManager:
+
+    def __init__(self, logger=None):
+        # Used by pyfemtet-opt-gui
+        self.updated_objects = set()
+        """Updated variable names, sldprt file paths and linked .txt equation file paths."""
+        if logger is None:
+            from logging import getLogger
+            logger = getLogger('solidworks_variable_manager')
+        self.logger = logger
+
+    # Used by pyfemtet-opt-gui
+    def update_global_variables_recourse(self, swModel, x: SWVariables):
+        # まず自身のパラメータを更新
+        self.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
+                self.logger.debug(f'Checking `{swPartModel.GetPathName}`')
+                if swPartModel.GetPathName.lower() not in self.updated_objects:
+                    self.logger.debug(f'Processing `{swPartModel.GetPathName}`')
+                    with EditPartContext(swModel, component):
+                        self._update_global_variables_core(swPartModel, x)
+                    self.updated_objects.add(swPartModel.GetPathName.lower())
+
+    def _update_global_variables_core(self, swModel, x: SWVariables):
+        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: SWVariables):
+        txt_path = swEqnMgr.FilePath
+        if txt_path in self.updated_objects:
+            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])
+        self.logger.debug(f'`{txt_path}` is updated.')
+        self.updated_objects.add(txt_path)
+
+    def _update_global_variables_simple(self, swEqnMgr, x: SWVariables):
+        nEquation = swEqnMgr.GetCount
+
+        # equation を列挙
+        self.logger.debug(f'{nEquation} equations detected.')
+        for i in range(nEquation):
+            # name, equation の取得
+            eq = swEqnMgr.Equation(i)
+            prm_name = self._get_left(eq)
+            # COM 経由なので必要な時以外は触らない
+            self.logger.debug(f'Checking `{prm_name}`')
+            if (prm_name in x) and (prm_name not in self.updated_objects):
+                self.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_objects.add(prm_name)
+
+    def _update_equation(self, equation: str, x: SWVariables):
+        prm_name = self._get_left(equation)
+        if prm_name not in x:
+            return equation
+        new_eq = f'"{prm_name}" = {x[prm_name]}'
+        self.logger.debug(f'New eq.: `{new_eq}`')
+        return new_eq
+
+    @staticmethod
+    def _get_left(equation: str):
+        tmp = equation.split('=')
+        if len(tmp) == 0:
+            raise RuntimeError(f'Invalid solidworks equation: {equation} (no `=` contained)')
+        return tmp[0].strip('" ')
+
+    # Used by pyfemtet-opt-gui
+    @staticmethod
+    def get_equations_recourse(swModel, global_variables_only=False) -> list[str]:
+        out = list()
+        swEqnMgr = swModel.GetEquationMgr
+        for i in range(swEqnMgr.GetCount):
+            if global_variables_only and not swEqnMgr.GlobalVariable(i):
+                continue
+            eq = swEqnMgr.Equation(i)
+            out.append(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):
+                    if global_variables_only and not swEqnMgr.GlobalVariable(i):
+                        continue
+                    eq = swEqnMgr.Equation(i)
+                    out.append(eq)
+        return out

pyfemtet/_util/symbol_support_for_param_name.py

@@ -0,0 +1,15 @@
+at = '@'
+AT = '_at_'
+hyphen = '-'
+HYPHEN = '_hyphen_'
+dot = '.'
+DOT = '_dot_'
+
+
+def convert_symbols(name):
+    return (
+        name
+        .replace(dot, DOT)
+        .replace(at, AT)
+        .replace(hyphen, HYPHEN)
+    )

pyfemtet/opt/femopt.py

@@ -375,19 +375,20 @@ class FEMOpt:
             def save_history():
                 while True:
                     sleep(2)
-                    try:
-                        self.opt.history.save()
-                        logger.debug('History saved!')
-                    except PermissionError:
-                        logger.error(
-                            _('Cannot save history. '
-                              'The most common reason is '
-                              'that the csv is opened by '
-                              'another program (such as Excel). '
-                              'Please free {path} or lost the '
-                              'optimization history.',
-                              path=self.opt.history.path)
-                        )
+                    if len(self.opt.history.get_df()) > 0:
+                        try:
+                            self.opt.history.save()
+                            logger.debug('History saved!')
+                        except PermissionError:
+                            logger.error(
+                                _('Cannot save history. '
+                                  'The most common reason is '
+                                  'that the csv is opened by '
+                                  'another program (such as Excel). '
+                                  'Please free {path} or lost the '
+                                  'optimization history.',
+                                  path=self.opt.history.path)
+                            )
                     if entire_status.value >= WorkerStatus.finished:
                         break
                 logger.debug('History save thread finished!')

pyfemtet/opt/interface/_excel_interface/excel_interface.py

@@ -505,8 +505,10 @@ class ExcelInterface(COMInterface):
         if not os.path.exists(xla_file_path):
             raise FileNotFoundError(
                 _(
-                    en_message='Femtet XLA file not found: {xla_file_path}',
-                    jp_message='Femtet XLA ファイルが見つかりません: {xla_file_path}',
+                    en_message='Femtet XLA file ({xla_file_path}) not found. '
+                               'Please run `Enable Macros` command.',
+                    jp_message='Femtet XLA ファイル ({xla_file_path}) が見つかりません。'
+                               '「マクロ機能の有効化」を実行してください。',
                     xla_file_path=xla_file_path
                 )
             )

pyfemtet/opt/interface/_femtet_interface/femtet_interface.py

@@ -7,13 +7,13 @@ import sys
 import subprocess
 from time import sleep
 from contextlib import nullcontext
+import importlib
 
 # noinspection PyUnresolvedReferences
 from pywintypes import com_error, error
 # noinspection PyUnresolvedReferences
 from pythoncom import CoInitialize, CoUninitialize
-# noinspection PyUnresolvedReferences
-from win32com.client import constants
+from win32com.client import constants, Dispatch
 import win32con
 import win32gui
 
@@ -353,6 +353,8 @@ class FemtetInterface(COMInterface):
             it will not try existing another Femtet process.
 
         """
+        # noinspection PyGlobalUndefined
+        global constants
 
         if connect_method == "new":
             self._connect_new_femtet()
@@ -373,32 +375,39 @@ class FemtetInterface(COMInterface):
         if not hasattr(constants, "STATIC_C"):
             cmd = f"{sys.executable} -m win32com.client.makepy FemtetMacro"
             subprocess.run(cmd, shell=True)
+            sleep(1)
+
+            import win32com.client
+            importlib.reload(win32com.client)
+            from win32com.client import Dispatch, constants
+            Dispatch('FemtetMacro.Femtet')
+
+            if not hasattr(constants, "STATIC_C"):
+                message = _(
+                    en_message='It was detected that the configuration of '
+                               'Femtet python macro constants has not been '
+                               'completed. The configuration was done '
+                               'automatically '
+                               '(python -m win32com.client.makepy FemtetMacro). '
+                               'Please restart the program. '
+                               'If the error persists, please run '
+                               '"py -m win32com.client.makepy FemtetMacro" '
+                               'or "python -m win32com.client.makepy FemtetMacro" '
+                               'on the command prompt.',
+                    jp_message='Femtet Pythonマクロ定数の設定が完了していない'
+                               'ことが検出されました。設定は自動で行われました'
+                               '(py -m win32com.client.makepy FemtetMacro)。 '
+                               'プログラムを再起動してください。'
+                               'エラーが解消されない場合は、'
+                               '"py -m win32com.client.makepy FemtetMacro" か '
+                               '"python -m win32com.client.makepy FemtetMacro" '
+                               'コマンドをコマンドプロンプトで実行してください。'
+                )
 
-            message = _(
-                en_message='It was detected that the configuration of '
-                           'Femtet python macro constants has not been '
-                           'completed. The configuration was done '
-                           'automatically '
-                           '(python -m win32com.client.makepy FemtetMacro). '
-                           'Please restart the program. '
-                           'If the error persists, please run '
-                           '"py -m win32com.client.makepy FemtetMacro" '
-                           'or "python -m win32com.client.makepy FemtetMacro" '
-                           'on the command prompt.',
-                jp_message='Femtet Pythonマクロ定数の設定が完了していない'
-                           'ことが検出されました。設定は自動で行われました'
-                           '(py -m win32com.client.makepy FemtetMacro)。 '
-                           'プログラムを再起動してください。'
-                           'エラーが解消されない場合は、'
-                           '"py -m win32com.client.makepy FemtetMacro" か '
-                           '"python -m win32com.client.makepy FemtetMacro" '
-                           'コマンドをコマンドプロンプトで実行してください。'
-            )
-
-            logger.error("================")
-            logger.error(message)
-            logger.error("================")
-            raise RuntimeError(message)
+                logger.error("================")
+                logger.error(message)
+                logger.error("================")
+                raise RuntimeError(message)
 
         if self.Femtet is None:
             raise RuntimeError(_(

pyfemtet/opt/interface/_solidworks_interface/solidworks_interface.py

@@ -4,7 +4,7 @@ from time import sleep
 from typing import TYPE_CHECKING, Any
 import os
 
-from win32com.client import Dispatch, DispatchEx
+from win32com.client import Dispatch
 from pythoncom import com_error, CoInitialize
 
 from pyfemtet._util.dask_util import *
@@ -14,6 +14,8 @@ from pyfemtet._i18n import _
 from pyfemtet.opt.problem.problem import *
 from pyfemtet.logger import get_module_logger
 
+from pyfemtet._util.solidworks_variable import SolidworksVariableManager, is_assembly, SWVariables
+
 if TYPE_CHECKING:
     from pyfemtet.opt.optimizer import AbstractOptimizer
 
@@ -36,43 +38,6 @@ 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):
     """
@@ -132,13 +97,13 @@ class SolidworksInterface(COMInterface):
         self.swApp.Visible = self.solidworks_visible
 
     def _setup_before_parallel(self, scheduler_address=None):
-        if not _is_assembly(self.sldprt_path):
+        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:
+        if is_assembly(self.sldprt_path) and get_worker() is not None:
             # 現在の仕様だと sldprt_path だけが
             # worker_space に保存される。
             # 並列処理に対応するためには
@@ -149,7 +114,7 @@ class SolidworksInterface(COMInterface):
                 jp_message='SolidworksInterfaceでアセンブリパーツを対象とする場合、並列処理はサポートされていません。'
             ))
 
-        if not _is_assembly(self.sldprt_path):
+        if not is_assembly(self.sldprt_path):
             # get suffix
             suffix = self._get_file_suffix(opt)
 
@@ -165,7 +130,7 @@ class SolidworksInterface(COMInterface):
             self.connect_sw()
 
             # open it
-            if _is_assembly(self.sldprt_path):
+            if is_assembly(self.sldprt_path):
                 self.swApp.OpenDoc(self.sldprt_path, swDocASSEMBLY)
             else:
                 self.swApp.OpenDoc(self.sldprt_path, swDocPART)
@@ -185,8 +150,14 @@ class SolidworksInterface(COMInterface):
         with Lock(self._access_sw_lock_name):
             sleep(0.2)
             swModel = self.swModel
-            mgr = _UpdateVariableManager()
-            mgr._update_global_variables(swModel, self.current_prm_values)
+            mgr = SolidworksVariableManager(asm_logger)
+            sw_variables: SWVariables = {
+                name: str(param.value) + param.properties.get('unit', '')
+                for name, param in
+                self.current_prm_values.items()
+                if isinstance(param.value, float | int)
+            }
+            mgr.update_global_variables_recourse(swModel, sw_variables)
 
     def update_model(self):
         """Update .sldprt"""
@@ -229,121 +200,6 @@ 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)

pyfemtet/opt/optimizer/_base_optimizer.py

@@ -133,6 +133,8 @@ class AbstractOptimizer:
             *,
             pass_to_fem: bool = True,
     ):
+        var: Variable
+        # noinspection PyUnreachableCode
         if isinstance(value, Real):
             var = NumericVariable()
         elif isinstance(value, str):
@@ -148,7 +150,7 @@ class AbstractOptimizer:
         var.pass_to_fem = pass_to_fem
         var.properties = properties if properties is not None else {}
         _duplicated_name_check(name, self.variable_manager.variables.keys())
-        self.variable_manager.variables.update({name: var})
+        self.variable_manager.set_variable(var)
 
     def add_parameter(
             self,
@@ -176,7 +178,7 @@ class AbstractOptimizer:
         prm.properties = properties
         prm.pass_to_fem = pass_to_fem
         _duplicated_name_check(name, self.variable_manager.variables.keys())
-        self.variable_manager.variables.update({name: prm})
+        self.variable_manager.set_variable(prm)
 
     def add_expression_string(
             self,
@@ -185,14 +187,18 @@ class AbstractOptimizer:
             properties: dict[str, ...] | None = None,
             *,
             pass_to_fem: bool = True,
+            _disable_matmul_operator: bool = True
     ) -> None:
         var = ExpressionFromString()
         var.name = name
-        var._expr = ExpressionFromString.InternalClass(expression_string=expression_string)
+        var._expr = ExpressionFromString.InternalClass(
+            expression_string=expression_string,
+            _disable_matmul_operator=_disable_matmul_operator,
+        )
         var.properties = properties or dict()
         var.pass_to_fem = pass_to_fem
         _duplicated_name_check(name, self.variable_manager.variables.keys())
-        self.variable_manager.variables.update({name: var})
+        self.variable_manager.set_variable(var)
 
     def add_expression_sympy(
             self,
@@ -208,7 +214,7 @@ class AbstractOptimizer:
         var.properties = properties or dict()
         var.pass_to_fem = pass_to_fem
         _duplicated_name_check(name, self.variable_manager.variables.keys())
-        self.variable_manager.variables.update({name: var})
+        self.variable_manager.set_variable(var)
 
     def add_expression(
             self,
@@ -228,7 +234,7 @@ class AbstractOptimizer:
         var.properties = properties or dict()
         var.pass_to_fem = pass_to_fem
         _duplicated_name_check(name, self.variable_manager.variables.keys())
-        self.variable_manager.variables.update({name: var})
+        self.variable_manager.set_variable(var)
 
     def add_categorical_parameter(
             self,
@@ -252,7 +258,7 @@ class AbstractOptimizer:
         prm.properties = properties
         prm.pass_to_fem = pass_to_fem
         _duplicated_name_check(name, self.variable_manager.variables.keys())
-        self.variable_manager.variables.update({name: prm})
+        self.variable_manager.set_variable(prm)
 
     def add_objective(
             self,
@@ -280,6 +286,7 @@ class AbstractOptimizer:
             kwargs: dict | None = None,
     ):
         # argument processing
+        # noinspection PyUnreachableCode
         if isinstance(names, str):
             names = [f'{names}_{i}' for i in range(n_return)]
         elif isinstance(names, Sequence):
@@ -466,7 +473,7 @@ class AbstractOptimizer:
                     raise NotImplementedError
         return violation_names
 
-    def _check_and_raise_interruption(self) -> ...:
+    def _check_and_raise_interruption(self):
         # raise Interrupt
         interrupted = self.entire_status.value >= WorkerStatus.interrupting
         if interrupted:
@@ -704,7 +711,7 @@ class AbstractOptimizer:
                 self,
                 x: TrialInput,
                 opt_: AbstractOptimizer | None = None,
-                trial_id: str =None,
+                trial_id: str = None,
         ) -> _FReturnValue | None:
             """Nothing will be raised even if infeasible."""
 

pyfemtet/opt/problem/variable_manager/_string_as_expression.py

@@ -1,14 +1,32 @@
+import re
 from numbers import Number
 
 from sympy import sympify
 from sympy.core.sympify import SympifyError
 from sympy import Min, Max, Add, Symbol, Expr, Basic  # TODO: Add sqrt, pow
 
+from pyfemtet._util.symbol_support_for_param_name import convert_symbols
+
 __all__ = [
     '_ExpressionFromString', 'InvalidExpression', 'SympifyError'
 ]
 
 
+def _convert(expr_str):
+    """ \" で囲まれた部分があれば記号を置き換える """
+
+    def repl(m: re.Match) -> str:
+        inner = m.group(1)
+        return f'"{convert_symbols(inner)}"'
+
+    # 非貪欲で " 内だけを拾う
+    expr_str = re.sub(r'"(.+?)"', repl, expr_str)
+    # " を消す
+    expr_str = expr_str.replace('"', '')
+
+    return expr_str
+
+
 class InvalidExpression(Exception):
     pass
 
@@ -27,7 +45,11 @@ class _ExpressionFromString:
     _expr_str: str
     _sympy_expr: Expr
 
-    def __init__(self, expression_string: str | Number = None, sympy_expr: Expr = None):
+    def __init__(
+            self,
+            expression_string: str | Number = None,
+            sympy_expr: Expr = None,
+    ):
         """
         Raises:
             SympifyError: Sympy が認識できない場合
@@ -54,6 +76,10 @@ class _ExpressionFromString:
             e.expr  # '1.0'
             e.value  # 1.0
 
+            # To use "-", "@" and "." for name
+            e = Expression('"Sample-1.0@Part1" * 2')
+            e.expr  # 'Sample_hyphen_1_dot_0_at_Part1 * 2'
+
         """
 
         # check
@@ -66,7 +92,7 @@ class _ExpressionFromString:
 
         else:
             assert expression_string is not None
-            self._expr_str: str = str(expression_string)
+            self._expr_str: str = _convert(str(expression_string))
 
             # max(name1, name2) など関数を入れる際に問題になるので
             # 下記の仕様は廃止、使い方として数値桁区切り , を入れてはいけない
@@ -74,7 +100,7 @@ class _ExpressionFromString:
             # # 日本人が数値に , を使うとき Python では _ を意味する
             # # expression に _ が入っていても構わない
             # tmp_expr = str(self._expr_str).replace(',', '_')
-            self._sympy_expr = sympify(self._expr_str, locals=get_valid_functions())
+            self._sympy_expr = sympify(self._expr_str, locals=get_valid_functions())  # noqa
 
         if not isinstance(self._sympy_expr, Basic):
             raise InvalidExpression(f'{self._expr_str} は数式ではありません。')
@@ -101,12 +127,12 @@ class _ExpressionFromString:
                     in dependency_values.values()]), \
             'ExpressionFromString では数値変数のみをサポートしています。'
 
-        re_sympy_expr = sympify(
+        re_sympy_expr = sympify(  # noqa
             self.expression_string,
             locals=get_valid_functions(dependency_values),
         )
 
-        evaluated_sympy_obj = re_sympy_expr.subs(dependency_values)
+        evaluated_sympy_obj = re_sympy_expr.subs(dependency_values)  # noqa
         try:
             evaluated_value = float(evaluated_sympy_obj)
         except (ValueError, TypeError) as e:

pyfemtet/opt/problem/variable_manager/_variable_manager.py

@@ -3,12 +3,14 @@ from typing import Callable, TypeAlias, Literal
 import inspect
 from numbers import Real  # マイナーなので型ヒントには使わず isinstance で使う
 from graphlib import TopologicalSorter
+import unicodedata
 
 import numpy as np
 
 from ._string_as_expression import _ExpressionFromString
 
 from pyfemtet._i18n import _
+from pyfemtet._util.symbol_support_for_param_name import convert_symbols
 
 __all__ = [
     'SupportedVariableTypes',
@@ -320,13 +322,16 @@ class VariableManager:
             if filter is not None:
                 if 'pass_to_fem' in filter:
                     if var.pass_to_fem:
+                        name = var.properties.get('original_name', name)
                         raw.update({name: var})
 
                 if 'parameter' in filter:
                     if isinstance(var, Parameter):
+                        name = var.properties.get('original_name', name)
                         raw.update({name: var})
 
             else:
+                name = var.properties.get('original_name', name)
                 raw.update({name: var})
 
         if format is None:
@@ -350,3 +355,13 @@ class VariableManager:
                     format=format,
                 )
             )
+
+    def set_variable(self, variable: Variable):
+        original_name = variable.name
+        variable.properties.update(
+            {'original_name': original_name}
+        )
+        variable.name = convert_symbols(variable.name)
+        if not unicodedata.is_normalized('NFKC', variable.name):
+            variable.name = unicodedata.normalize('NFKC', variable.name)
+        self.variables.update({variable.name: variable})

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

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

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

@@ -7,7 +7,7 @@ pyfemtet/_i18n/i18n.py,sha256=zBbatQO7bkyO1MU6Y8TtrhGpDoUMP2PetRyWsINVcHc,808
 pyfemtet/_i18n/locales/ja/LC_MESSAGES/messages.mo,sha256=wjYhvR2TUpjHCBowrW2bQYUxKmnEi3d8GBPgseadRGw,34424
 pyfemtet/_i18n/locales/ja/LC_MESSAGES/messages.po,sha256=ktqUESvDUja2LQJDo-oEv58FH6klUmpu3lAoITtR_NQ,48313
 pyfemtet/_i18n/locales/messages.pot,sha256=krqoEumXnY45pG5dm-dQPmynb-eNx1BbIfbHB0URCvE,30025
-pyfemtet/_i18n/messages.py,sha256=mzTARnpZPZ-Pmcq8RdOyy5a4XGCCSxwxuoHjN_HJ0TM,17382
+pyfemtet/_i18n/messages.py,sha256=AvGLbs_ELTIBm4nCeDyaXWsEiTPuGkYVAjlp_TCfxmo,16994
 pyfemtet/_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/_util/closing.py,sha256=JPcgHDbW249YF20bMOX6UX-LquWoCWA14KhX-qFouR4,502
 pyfemtet/_util/dask_util.py,sha256=ekzOFqSOIHyB8KK5--ndM2xBdueIfS1pi-inOLj6JT4,2198
@@ -21,7 +21,9 @@ pyfemtet/_util/femtet_version.py,sha256=9bWRMC_Exb-3rh5bg9eKfwBcgkxz_vg_eX99RPuk
 pyfemtet/_util/helper.py,sha256=chlfSDQ764kn0mVgBXj8WXKBrje25AX6Riia8W5zkJo,2543
 pyfemtet/_util/process_util.py,sha256=_hiRTZVZll8tnlBfXvz6GcBue4aE__jA0KnsVXe6m2A,3038
 pyfemtet/_util/sample.xlsx,sha256=OU8mBY48YESJFQrdt4OkntlE1z-6WiyUyOV-PMr09DQ,9423
+pyfemtet/_util/solidworks_variable.py,sha256=aZqDH1Jx5rpK2paFyKL8RODV0jmEfq1pKVCsSmr40GA,6969
 pyfemtet/_util/str_enum.py,sha256=b-mQRUsSZvk4zupYTxxSaOm3rtxfNyOajywZ82x9rmk,1441
+pyfemtet/_util/symbol_support_for_param_name.py,sha256=6pR5gt24R6yhxh6GhyQZXTN9fxqxGa3ObTV31wCc0EM,224
 pyfemtet/core.py,sha256=t5tvWGrBNzCL9cP-91hbTR8q5lzULPsVeIEybeslhxQ,936
 pyfemtet/dispatch_extensions/__init__.py,sha256=BzxYq3x8YdkdClq4VvH4G5HTGxu5nyAhN7xlFsnTv8c,159
 pyfemtet/dispatch_extensions/_impl.py,sha256=Sgp350ioKcNVslXv9xRdtRjaQGRQM-BwbJYXjeildtw,11107
@@ -29,7 +31,7 @@ pyfemtet/logger/__init__.py,sha256=lofBrZHr0P1hsxPUiPG1SQqKxCuSBk8zGnR7vUfCHYw,5
 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
+pyfemtet/opt/femopt.py,sha256=d-w9enC_XG-4ScIE26PvnoQNqVBXWyveade0wrEcDTM,23827
 pyfemtet/opt/history/__init__.py,sha256=pUp3SO4R7RGzmpNDLBg_pQH0X2yzBd-oqsHXWmB33os,201
 pyfemtet/opt/history/_history.py,sha256=K1k-iOSFoowqKPVZgvWEhdysO9ZsMuqEQ-P_kvO-T3U,54587
 pyfemtet/opt/history/_hypervolume.py,sha256=_IvGH71ZNreWvDQCG815Q2hS1OEvPFPQhUnNXf1UxRQ,4449
@@ -39,10 +41,10 @@ pyfemtet/opt/interface/_base_interface.py,sha256=iWJmJ8kxRH-Cztfhy3QKfRhSKRMytBt
 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
-pyfemtet/opt/interface/_excel_interface/excel_interface.py,sha256=x_pKZzjCc_c2HuypHY5wIaRVtjKa48SYbmqtmduLldM,39680
+pyfemtet/opt/interface/_excel_interface/excel_interface.py,sha256=Sghavj7bcslQ5ue9xJzV6DdBfhv6XKn-XxKD-T39KEo,39854
 pyfemtet/opt/interface/_femtet_interface/__init__.py,sha256=snQruC8Rl_5rFeVmiqw9lmzdJ5mL42HpIlHIn5ytd8s,77
 pyfemtet/opt/interface/_femtet_interface/_femtet_parametric.py,sha256=dEe6udq2CBpXAcKCye90sXC0UVKok14LORitobc8DK8,10282
-pyfemtet/opt/interface/_femtet_interface/femtet_interface.py,sha256=8Z4yNpyqXXaqj_aBg7x4l2x63lAOfLQ6VKSP4sx-X5g,45309
+pyfemtet/opt/interface/_femtet_interface/femtet_interface.py,sha256=ptvklQdKwSq9sW712Y4-sO4nTZPVfjrDdBToGOyQoIE,45717
 pyfemtet/opt/interface/_femtet_with_nx_interface/__init__.py,sha256=ppeoWVSmVsTmDNKpuFRVTnhjcoefQVEog3-FRiKpEe4,104
 pyfemtet/opt/interface/_femtet_with_nx_interface/femtet_with_nx_interface.py,sha256=IPIoNMtcJmtiv7eM3yDMWDOynTf0mXd-438LoDVqZCU,8628
 pyfemtet/opt/interface/_femtet_with_nx_interface/model1.prt,sha256=cYVw2izr4_9PCPHOpi46XmDVOuNZ5ksuwKqzBtCZfNA,104833
@@ -51,7 +53,7 @@ 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=2SaUI5Lh1gVGqTNcSgqn0Ay1e0tZQHIXFOyYquwVvPw,14127
+pyfemtet/opt/interface/_solidworks_interface/solidworks_interface.py,sha256=qJIC6Qg7slskDwKDRTFYKzbftqseUaYveRTtOdZA_EQ,8370
 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
@@ -65,7 +67,7 @@ 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=9vwrB7ER-Qfh0tGdP5Fg7mP459WXFGSc-yMlyYdZ4sY,37598
+pyfemtet/opt/optimizer/_base_optimizer.py,sha256=z3NQyKSQkRHHlf1UWYWVnAQaBIMpX92qWdBlh-NfE4A,37760
 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
@@ -85,8 +87,8 @@ pyfemtet/opt/prediction/_model.py,sha256=uw3CW_sNkoFa3Cn_ek3_Tr2lYl4ClptKGIpmRF2
 pyfemtet/opt/problem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=jtIHFWgVP2jhA3c5uSD388VZHuShR25ZZ8SYz5-6Rro,12785
+pyfemtet/opt/problem/variable_manager/_string_as_expression.py,sha256=LlwVkg7__doA_cprcsZyWC_5Yy_-10c-Bs7fQhur7BM,4324
+pyfemtet/opt/problem/variable_manager/_variable_manager.py,sha256=08pTFp3LnOraXWUj99fhmr32v-V1KDKioO6OsQ2xNEo,13516
 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
@@ -172,9 +174,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.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.2.1.dist-info/METADATA,sha256=xZOqdfjtSbf1ZCNoG2Z3nwC4SJpNkPBaa_zaUzDk0Uk,3410
+pyfemtet-1.2.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pyfemtet-1.2.1.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
+pyfemtet-1.2.1.dist-info/licenses/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
+pyfemtet-1.2.1.dist-info/licenses/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
+pyfemtet-1.2.1.dist-info/RECORD,,