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

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.1.dist-info → pyfemtet-1.2.2.dist-info}/METADATA

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

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

@@ -43,7 +43,7 @@ pyfemtet/opt/interface/_excel_interface/__init__.py,sha256=bFOmY18-j4RJc_dHQMe62
 pyfemtet/opt/interface/_excel_interface/debug-excel-interface.xlsm,sha256=TM1CEOC5XtU7qYKNnHScO02kdtXT-gc5y29m2hatsm0,114259
 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_parametric.py,sha256=Om2S1hd90nQSuOXf1ylUJiILcxVhLiCOL4dc34lJzdM,10946
 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
@@ -174,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.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,,
+pyfemtet-1.2.2.dist-info/METADATA,sha256=N9PmEhNuXhmfN8fAt-HBRWGuHgxuJRfSeepHIJgkZxY,3410
+pyfemtet-1.2.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pyfemtet-1.2.2.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
+pyfemtet-1.2.2.dist-info/licenses/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
+pyfemtet-1.2.2.dist-info/licenses/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
+pyfemtet-1.2.2.dist-info/RECORD,,