pyfemtet 1.2.0__tar.gz → 1.2.2__tar.gz

{pyfemtet-1.2.0 → pyfemtet-1.2.2}/PKG-INFO

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

pyfemtet-1.2.2/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-1.2.0 → pyfemtet-1.2.2}/pyfemtet/opt/interface/_femtet_interface/_femtet_parametric.py

@@ -110,44 +110,69 @@ class ParametricResultCSVProcessor:
         df['row_num'] = range(2, len(df) + 2)  # row=0 は header, excel は 1 始まり
 
         # 「結果出力設定番号」カラムが存在するか
-        if '結果出力設定番号' in df.columns:  # TODO: 英語版対応
+        key = '結果出力設定番号'
+        key_en = ' Output setting Number'
 
-            # 与えられた output_number に関連する行だけ抜き出し
-            # エラーがあるかどうかチェックする
-            idx = df['結果出力設定番号'] == parametric_output_index + 1
-            pdf = df[idx]
+        def get_pdf(key_, key_en_):
+            if key_ in df.columns:
 
-        # 結果出力設定番号 カラムが存在しない
-        else:
-            # output_number に関係なくエラーがあればエラーにする
-            pdf = df
+                # 与えられた output_number に関連する行だけ抜き出し
+                # エラーがあるかどうかチェックする
+                idx = df[key_] == parametric_output_index + 1
+                pdf_ = df[idx]
+
+            elif key_en_ in df.columns:
+                idx = df[key_en_] == parametric_output_index + 1
+                pdf_ = df[idx]
+
+            # 結果出力設定番号 カラムが存在しない
+            else:
+                # output_number に関係なくエラーがあればエラーにする
+                pdf_ = df
+
+            return pdf_
+
+        pdf = get_pdf(key, key_en)
 
         # エラーの有無を確認
-        if 'エラー' in pdf.columns:  # TODO: 英語版対応
-            is_no_error = np.all(pdf['エラー'].isna().values)
-
-            if not is_no_error:
-                error_message_row_numbers = pdf['row_num'][~pdf['エラー'].isna()].values.astype(str)
-                error_messages = pdf['エラー'][~pdf['エラー'].isna()].values.astype(str)
-
-                def add_st_or_nd_or_th(n_: int):
-                    if n_ == 1:
-                        return f'{n_}st'
-                    elif n_ == 2:
-                        return f'{n_}nd'
-                    elif n_ == 3:
-                        return f'{n_}rd'
-                    else:
-                        return f'{n_}th'
-
-                error_msg = f'Error message(s) from {os.path.basename(table_csv_path)}: ' + ', '.join(
-                    [f'({add_st_or_nd_or_th(row)} row) {message}'
-                     for row, message in zip(error_message_row_numbers, error_messages)])
+        key = 'エラー'
+
+        def handle_error(key_):
+            if key_ in pdf.columns:
+                is_no_error_ = np.all(pdf[key_].isna().values)
+
+                if not is_no_error_:
+                    error_message_row_numbers = pdf['row_num'][~pdf[key_].isna()].values.astype(str)
+                    error_messages = pdf[key_][~pdf[key_].isna()].values.astype(str)
+
+                    def add_st_or_nd_or_th(n_: int):
+                        if n_ == 1:
+                            return f'{n_}st'
+                        elif n_ == 2:
+                            return f'{n_}nd'
+                        elif n_ == 3:
+                            return f'{n_}rd'
+                        else:
+                            return f'{n_}th'
+
+                    error_msg_ = f'Error message(s) from {os.path.basename(table_csv_path)}: ' + ', '.join(
+                        [f'({add_st_or_nd_or_th(row)} row) {message}'
+                         for row, message in zip(error_message_row_numbers, error_messages)])
+                else:
+                    error_msg_ = None
+
+                return is_no_error_, error_msg_
+
             else:
-                error_msg = None
+                return None, 'NO_KEY'
+
+        is_no_error, error_msg = handle_error(key)
 
-        else:
-            raise RuntimeError('Internal Error! Parametric Analysis '
+        if error_msg == 'NO_KEY':
+            key = ' Error'
+            is_no_error, error_msg = handle_error(key)
+            if error_msg == 'NO_KEY':
+                assert False, ('Internal Error! Parametric Analysis '
                                'output csv has no error column.')
 
         return is_no_error, error_msg

{pyfemtet-1.2.0 → pyfemtet-1.2.2}/pyfemtet/opt/problem/variable_manager/_string_as_expression.py

@@ -1,16 +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.atmark_support_for_param_name import at, AT
+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
 
@@ -33,7 +49,6 @@ class _ExpressionFromString:
             self,
             expression_string: str | Number = None,
             sympy_expr: Expr = None,
-            _disable_matmul_operator: bool = True,  # @ を文字式で使えるように文字列中の @ を AT に変換する
     ):
         """
         Raises:
@@ -61,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
@@ -73,9 +92,7 @@ class _ExpressionFromString:
 
         else:
             assert expression_string is not None
-            if _disable_matmul_operator:
-                expression_string = expression_string.replace(at, AT)
-            self._expr_str: str = str(expression_string)
+            self._expr_str: str = _convert(str(expression_string))
 
             # max(name1, name2) など関数を入れる際に問題になるので
             # 下記の仕様は廃止、使い方として数値桁区切り , を入れてはいけない
@@ -83,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} は数式ではありません。')
@@ -110,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-1.2.0 → pyfemtet-1.2.2}/pyfemtet/opt/problem/variable_manager/_variable_manager.py

@@ -10,7 +10,7 @@ import numpy as np
 from ._string_as_expression import _ExpressionFromString
 
 from pyfemtet._i18n import _
-from pyfemtet._util.atmark_support_for_param_name import at, AT
+from pyfemtet._util.symbol_support_for_param_name import convert_symbols
 
 __all__ = [
     'SupportedVariableTypes',
@@ -361,8 +361,7 @@ class VariableManager:
         variable.properties.update(
             {'original_name': original_name}
         )
-        if at in variable.name:
-            variable.name = variable.name.replace(at, AT)
+        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.2.0 → pyfemtet-1.2.2}/pyproject.toml

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

pyfemtet-1.2.0/pyfemtet/_util/atmark_support_for_param_name.py

@@ -1,2 +0,0 @@
-at = '@'
-AT = '_at_'