pyfemtet 0.7.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

pyfemtet/_message/locales/messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-11-27 21:24+0900\n"
+"POT-Creation-Date: 2024-12-27 09:45+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -173,351 +173,367 @@ msgstr ""
 msgid "Failed to update model in solidworks."
 msgstr ""
 
+#: pyfemtet/_message/messages.py:84
+msgid "Probability of feasibility is less than threshold."
+msgstr ""
+
+#: pyfemtet/_message/messages.py:85
+msgid "Terminating Excel process..."
+msgstr ""
+
 #: pyfemtet/_message/messages.py:86
-msgid "The following features are not supported by the specified optimization method. "
+msgid "Excel process is terminated."
 msgstr ""
 
 #: pyfemtet/_message/messages.py:87
+msgid "Restore Femtet setting of autosave."
+msgstr ""
+
+#: pyfemtet/_message/messages.py:90
+msgid "The following features are not supported by the specified optimization method. "
+msgstr ""
+
+#: pyfemtet/_message/messages.py:91
 msgid "The parameter set does not match the one added with add_init_parameter."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:88
+#: pyfemtet/_message/messages.py:92
 msgid "An exception has occurred during FEM update. Current parameters are: "
 msgstr ""
 
-#: pyfemtet/_message/messages.py:89
+#: pyfemtet/_message/messages.py:93
 msgid "The constraints were not satisfied for the following sets of variables:"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:90
+#: pyfemtet/_message/messages.py:94
 msgid "Current parameter set cannot update FEM and this optimization method cannot skip current parameter set. The optimization process will be terminated."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:91
+#: pyfemtet/_message/messages.py:95
 msgid "Optimization has been interrupted. Note that you cannot acquire the OptimizationResult in case of `trust-constr`, `TNC`, `SLSQP` or `COBYLA`."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:92
+#: pyfemtet/_message/messages.py:96
 msgid "You can use parameter constraint only with BoTorchSampler."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:93
+#: pyfemtet/_message/messages.py:97
 msgid "Scipy is deterministic, so whether you set a seed or not will not change the results."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:94
+#: pyfemtet/_message/messages.py:98
 msgid "Start to candidate new parameter set with constraints. This process may take a long time."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:95
+#: pyfemtet/_message/messages.py:99
 msgid "Updating FEM parameter during evaluating constraints take a long time. Please consider not to use FEM variables in constraint functions and set `update_fem` to False."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:99
+#: pyfemtet/_message/messages.py:103
 msgid "Connect to Femtet"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:100
+#: pyfemtet/_message/messages.py:104
 msgid "Analysis model name described in csv does not exist in project."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:101
+#: pyfemtet/_message/messages.py:105
 msgid "History csv is not read yet. Open your project manually."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:102
+#: pyfemtet/_message/messages.py:106
 msgid "Cannot read project data from csv. Open your project manually."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:103
+#: pyfemtet/_message/messages.py:107
 msgid ".femprj file described in csv is not found. Open your project manually."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:104
+#: pyfemtet/_message/messages.py:108
 msgid "Analysis model name is not specified. Open your model in the project manually."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:106
+#: pyfemtet/_message/messages.py:110
 msgid "Constraint"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:107
+#: pyfemtet/_message/messages.py:111
 msgid "feasible"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:108
+#: pyfemtet/_message/messages.py:112
 msgid "infeasible"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:109
+#: pyfemtet/_message/messages.py:113
 msgid "Optimality"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:110
+#: pyfemtet/_message/messages.py:114
 msgid "non dominated"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:111
+#: pyfemtet/_message/messages.py:115
 msgid "dominated"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:112
+#: pyfemtet/_message/messages.py:116
 msgid "Hypervolume Plot"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:113
+#: pyfemtet/_message/messages.py:117
 msgid "Objective Plot"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:114
+#: pyfemtet/_message/messages.py:118
 msgid "Multi Objective Pair Plot"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:115
-msgid "trial number"
+#: pyfemtet/_message/messages.py:119
+msgid "Succeeded trial number"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:116
+#: pyfemtet/_message/messages.py:120
 msgid "All solutions"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:117
-msgid "Transition of optimal solutions"
+#: pyfemtet/_message/messages.py:121
+msgid "Transition of<br>optimal solutions"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:118
+#: pyfemtet/_message/messages.py:122
 msgid "Target value"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:120
+#: pyfemtet/_message/messages.py:124
 msgid "Objectives"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:121
+#: pyfemtet/_message/messages.py:125
 msgid "Objectives (all)"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:123
+#: pyfemtet/_message/messages.py:127
 msgid "Prediction Model"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:124
+#: pyfemtet/_message/messages.py:128
 msgid " Recalculate Model"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:125
+#: pyfemtet/_message/messages.py:129
 msgid " Redraw graph"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:126
+#: pyfemtet/_message/messages.py:130
 msgid "Parameter"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:127
+#: pyfemtet/_message/messages.py:131
 msgid "Parameter2"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:128
+#: pyfemtet/_message/messages.py:132
 msgid "Objective"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:129
+#: pyfemtet/_message/messages.py:133
 msgid "No history selected."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:130
+#: pyfemtet/_message/messages.py:134
 msgid "No FEM result (yet)."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:131
+#: pyfemtet/_message/messages.py:135
 msgid "Prediction model is not calculated yet."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:132
+#: pyfemtet/_message/messages.py:136
 msgid "Cannot select same parameter"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:133
+#: pyfemtet/_message/messages.py:137
 msgid "3D graph (two or more parameters required)"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:135
+#: pyfemtet/_message/messages.py:139
 msgid "Prediction Model of Objective"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:136
+#: pyfemtet/_message/messages.py:140
 msgid "prediction model"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:137
+#: pyfemtet/_message/messages.py:141
 msgid "std. dev. of model"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:139
+#: pyfemtet/_message/messages.py:143
 msgid "Progress"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:140
+#: pyfemtet/_message/messages.py:144
 msgid "Prediction"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:141
+#: pyfemtet/_message/messages.py:145
 msgid "Workers"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:142
+#: pyfemtet/_message/messages.py:146
 msgid "Details"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:144
+#: pyfemtet/_message/messages.py:148
 msgid "Optimization status will be shown here."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:145
+#: pyfemtet/_message/messages.py:149
 msgid "Auto-update graph"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:146
+#: pyfemtet/_message/messages.py:150
 msgid "Interrupt Optimization"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:148
+#: pyfemtet/_message/messages.py:152
 msgid "Result"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:150
+#: pyfemtet/_message/messages.py:154
 msgid "Open Result in Femtet"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:151
+#: pyfemtet/_message/messages.py:155
 msgid "Reconstruct Model"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:152
+#: pyfemtet/_message/messages.py:156
 msgid "Drag and drop or select csv file"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:153
+#: pyfemtet/_message/messages.py:157
 msgid "Connection to Femtet is not established. Launch Femtet and Open a project."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:154
+#: pyfemtet/_message/messages.py:158
 msgid "No result plot is selected."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:155
+#: pyfemtet/_message/messages.py:159
 msgid "The femprj file path in the history csv is not found or valid."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:156
+#: pyfemtet/_message/messages.py:160
 msgid "The model name in the history csv is not found."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:157
+#: pyfemtet/_message/messages.py:161
 msgid ".pdt file is not found. Please check the .Results folder. Note that .pdt file save mode depends on the `save_pdt` argument of FemtetInterface in optimization script(default to `all`)."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:162
+#: pyfemtet/_message/messages.py:166
 msgid "Failed to open "
 msgstr ""
 
-#: pyfemtet/_message/messages.py:163
+#: pyfemtet/_message/messages.py:167
 msgid "Specified model is not in current project. Please check opened project. For example, not \"analysis model only\" but your .femprj file."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:166
+#: pyfemtet/_message/messages.py:170
 msgid ".femprj file path of the history csv is invalid. Please certify matching between csv and opening .femprj file."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:167
+#: pyfemtet/_message/messages.py:171
 msgid "Analysis model name of the history csv is invalid. Please certify matching between csv and opening analysis model."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:168
+#: pyfemtet/_message/messages.py:172
 msgid "Analysis model name of the history csv and opened in Femtet is inconsistent. Please certify matching between csv and opening analysis model."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:169
+#: pyfemtet/_message/messages.py:173
 msgid "tutorial mode"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:170
+#: pyfemtet/_message/messages.py:174
 msgid "Load Sample CSV"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:171
+#: pyfemtet/_message/messages.py:175
 msgid "Load CSV"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:172
+#: pyfemtet/_message/messages.py:176
 msgid "Open your optimization result. Then connecting to femtet will start automatically. Note that in tutorial mode, this button loads the ready-made sample csv and open sample femprj."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:174
+#: pyfemtet/_message/messages.py:178
 msgid "Main Graph"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:175
+#: pyfemtet/_message/messages.py:179
 msgid "Here the optimization history is shown. Each plot represents single FEM result. You can pick a result to open the corresponding result in Femtet. "
 msgstr ""
 
-#: pyfemtet/_message/messages.py:178
+#: pyfemtet/_message/messages.py:182
 msgid "Open Result"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:179
+#: pyfemtet/_message/messages.py:183
 msgid "After pick a point in the main graph, This button shows the corresponding FEM result in Femtet."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:181
+#: pyfemtet/_message/messages.py:185
 msgid "Re-connect to Femtet."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:182
+#: pyfemtet/_message/messages.py:186
 msgid "Sample csv is not found. Please consider to re-install pyfemtet by `py -m pip install pyfemtet -U --force-reinstall`"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:183
+#: pyfemtet/_message/messages.py:187
 msgid "Sample femprj file is not found. Please consider to re-install pyfemtet by `py -m pip install pyfemtet -U --force-reinstall`"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:184
+#: pyfemtet/_message/messages.py:188
 msgid "Sample femprj result folder is not found. Please consider to re-install pyfemtet by `py -m pip install pyfemtet -U --force-reinstall`"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:186
+#: pyfemtet/_message/messages.py:190
 msgid "Loading data..."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:187
+#: pyfemtet/_message/messages.py:191
 msgid "Plots of objectives versus trials"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:188
+#: pyfemtet/_message/messages.py:192
 msgid "The vertical axis is the objective, and the horizontal axis is the number of trials."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:189
+#: pyfemtet/_message/messages.py:193
 msgid "Parallel coordinate plots"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:190
+#: pyfemtet/_message/messages.py:194
 msgid "The vertical axis is an objective or parameters, and one polyline indicates one result."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:191
+#: pyfemtet/_message/messages.py:195
 msgid "The heatmap of objectives"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:192
+#: pyfemtet/_message/messages.py:196
 msgid "The axes are parameters, and the color shows objective value."
 msgstr ""
 
-#: pyfemtet/_message/messages.py:193
+#: pyfemtet/_message/messages.py:197
 msgid "The response of an objective versus one parameter"
 msgstr ""
 
-#: pyfemtet/_message/messages.py:194
+#: pyfemtet/_message/messages.py:198
 msgid "The vertical axis is objective, and the horizontal axis is parameter."
 msgstr ""
 

pyfemtet/_message/messages.py

@@ -81,6 +81,10 @@ class Message:
     ERR_FAILED_TO_SAVE_JPG = _('Failed to save screenshot (.jpg).')
     ERR_JPG_NOT_FOUND = _('Screenshot (.jpg) is not found.')
     ERR_UPDATE_SOLIDWORKS_MODEL_FAILED = _('Failed to update model in solidworks.')
+    INFO_POF_IS_LESS_THAN_THRESHOLD = _('Probability of feasibility is less than threshold.')
+    INFO_TERMINATING_EXCEL = _('Terminating Excel process...')
+    INFO_TERMINATED_EXCEL = _('Excel process is terminated.')
+    INFO_RESTORING_FEMTET_AUTOSAVE = _('Restore Femtet setting of autosave.')
 
     # ===== pyfemtet.opt.optimizer =====
     ERR_NOT_IMPLEMENTED = _('The following features are not supported by the specified optimization method. ')
@@ -112,9 +116,9 @@ class Message:
     GRAPH_TITLE_HYPERVOLUME = _('Hypervolume Plot')
     GRAPH_TITLE_SINGLE_OBJECTIVE = _('Objective Plot')
     GRAPH_TITLE_MULTI_OBJECTIVE = _('Multi Objective Pair Plot')
-    GRAPH_AXIS_LABEL_TRIAL = _('trial number')
+    GRAPH_AXIS_LABEL_TRIAL = _('Succeeded trial number')
     LEGEND_LABEL_ALL_SOLUTIONS = _('All solutions')
-    LEGEND_LABEL_OPTIMAL_SOLUTIONS = _('Transition of optimal solutions')
+    LEGEND_LABEL_OPTIMAL_SOLUTIONS = _('Transition of<br>optimal solutions')
     LEGEND_LABEL_OBJECTIVE_TARGET = _('Target value')
     # main_graph.py
     TAB_LABEL_OBJECTIVE_PLOT = _('Objectives')

pyfemtet/_util/dask_util.py

@@ -0,0 +1,10 @@
+from contextlib import nullcontext
+from dask.distributed import Lock
+
+
+def lock_or_no_lock(name: str, client=None):
+    lock = Lock(name, client)
+    if lock.client is None:
+        return nullcontext()
+    else:
+        return lock

pyfemtet/_util/excel_macro_util.py

@@ -5,16 +5,27 @@ import asyncio  # for timeout
 import win32gui
 import win32con
 import win32api
+import win32process
 
 from pyfemtet.logger import get_module_logger
 
 logger = get_module_logger('util.excel', __name__)
 
 
+def _get_pid(hwnd):
+    """Window handle から process ID を取得します."""
+    if hwnd > 0:
+        _, pid = win32process.GetWindowThreadProcessId(hwnd)
+    else:
+        pid = 0
+    return pid
+
+
 class _ExcelDialogProcessor:
 
     def __init__(self, excel_, timeout, restore_book=True):
         self.excel = excel_
+        self.excel_pid = _get_pid(excel_.hWnd)
         self.__excel_window_title = f' - Excel'  # {basename} - Excel
         self.__error_dialog_title = 'Microsoft Visual Basic'
         self.__vbe_window_title = f'Microsoft Visual Basic for Applications - '  # Microsoft Visual Basic for Applications - {basename}
@@ -42,6 +53,7 @@ class _ExcelDialogProcessor:
             win32gui.EnumWindows(self.enum_callback_to_close_dialog, found)
             await asyncio.sleep(0.5)
             if any(found):
+                await asyncio.sleep(1.)
                 break
 
         logger.debug('ブックを閉じます。')
@@ -56,7 +68,7 @@ class _ExcelDialogProcessor:
     def enum_callback_to_activate(self, hwnd, _):
         title = win32gui.GetWindowText(hwnd)
         # Excel 本体
-        if self.__excel_window_title in title:
+        if (self.excel_pid == _get_pid(hwnd)) and (self.__excel_window_title in title):
             # Visible == True の際、エラーが発生した際、
             # 一度 Excel ウィンドウをアクティブ化しないと dialog が出てこない
             # が、これだけではダメかも。
@@ -65,7 +77,7 @@ class _ExcelDialogProcessor:
     def enum_callback_to_close_dialog(self, hwnd, found):
         title = win32gui.GetWindowText(hwnd)
         # エラーダイアログ
-        if self.__error_dialog_title == title:
+        if (self.excel_pid == _get_pid(hwnd)) and (self.__error_dialog_title == title):
             # 何故かこのコマンド以外受け付けず、
             # このコマンドで問答無用でデバッグモードに入る
             logger.debug('エラーダイアログを見つけました。')
@@ -77,14 +89,14 @@ class _ExcelDialogProcessor:
     def enum_callback_to_close_confirm_dialog(self, hwnd, _):
         title = win32gui.GetWindowText(hwnd)
         # 確認ダイアログ
-        if "Microsoft Excel" in title:
+        if (self.excel_pid == _get_pid(hwnd)) and ("Microsoft Excel" in title):
             # DisplayAlerts が False の場合は不要
             win32gui.SendMessage(hwnd, win32con.WM_SYSCOMMAND, win32con.SC_CLOSE, 0)
 
     def enum_callback_to_close_book(self, hwnd, _):
         title = win32gui.GetWindowText(hwnd)
         # VBE
-        if self.__vbe_window_title in title:
+        if (self.excel_pid == _get_pid(hwnd)) and (self.__vbe_window_title in title):
             # 何故かこれで book 本体が閉じる
             win32gui.SendMessage(hwnd, win32con.WM_CLOSE, 0, 0)