pyfemtet 0.9.6__py3-none-any.whl → 1.0.0__py3-none-any.whl

pyfemtet/opt/interface/_femtet_interface/__init__.py

@@ -0,0 +1,3 @@
+from .femtet_interface import FemtetInterface
+
+__all__ = ['FemtetInterface']

pyfemtet/opt/interface/{_femtet_parametric.py → _femtet_interface/_femtet_parametric.py}

@@ -1,27 +1,34 @@
+from __future__ import annotations
+
 import os
 import ctypes
 # from ctypes import wintypes
 import logging
 import warnings
 from time import sleep, time
-from packaging.version import Version
 
 import numpy as np
 import pandas as pd
 from femtetutils import util
 from femtetutils import logger as util_logger
 
-from pyfemtet.dispatch_extensions import _get_pid
-from pyfemtet.core import SolveError
-from pyfemtet._message.messages import encoding, Message
+from pyfemtet._util.process_util import _get_pid
+from pyfemtet.opt.exceptions import SolveError
+from pyfemtet._i18n import ENCODING, Msg
 from pyfemtet.logger import get_module_logger
 
-logger = get_module_logger('opt.fem.ParametricIF', __name__)
+__all__ = [
+    'solve_via_parametric_dll',
+    'add_parametric_results_as_objectives'
+]
+
+
+logger = get_module_logger('opt.fem.ParametricIF', False)
 
 util_logger.setLevel(logging.ERROR)
 
 # singleton pattern
-_P_CSV: 'ParametricResultCSVProcessor' = None
+_P_CSV: ParametricResultCSVProcessor | None = None
 
 
 def get_csv_processor(Femtet):
@@ -97,7 +104,7 @@ class ParametricResultCSVProcessor:
             return True, None
 
         # table があれば読み込む
-        df = pd.read_csv(table_csv_path, encoding=encoding)
+        df = pd.read_csv(table_csv_path, encoding=ENCODING)
 
         # 結果出力用に行番号を付記する
         df['row_num'] = range(2, len(df) + 2)  # row=0 は header, excel は 1 始まり
@@ -134,7 +141,8 @@ class ParametricResultCSVProcessor:
                         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)])
+                    [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
 
@@ -176,9 +184,9 @@ def _get_prm_result_names(Femtet):
     return out
 
 
-def add_parametric_results_as_objectives(femopt, indexes, directions) -> bool:
+def add_parametric_results_as_objectives(opt, Femtet, indexes, directions) -> bool:
     # load dll and set target femtet
-    dll = _get_dll_with_set_femtet(femopt.fem.Femtet)
+    dll = _get_dll_with_set_femtet(Femtet)
 
     # get objective names
     dll.GetPrmnResult.restype = ctypes.c_int
@@ -188,7 +196,7 @@ def add_parametric_results_as_objectives(femopt, indexes, directions) -> bool:
         result = dll.GetPrmResultName(i)
         name = result.decode('mbcs')
         # objective value function
-        femopt.add_objective(_parametric_objective, name, direction=direction, args=(i,))
+        opt.add_objective(name=name, fun=_parametric_objective, direction=direction, args=(i,))
     return True  # ここまで来たら成功
 
 
@@ -198,7 +206,7 @@ def _parametric_objective(Femtet, parametric_result_index):
     csv_processor = get_csv_processor(Femtet)
     succeeded, error_msg = csv_processor.is_succeeded(parametric_result_index)
     if not succeeded:
-        logger.error(Message.ERR_PARAMETRIC_CSV_CONTAINS_ERROR)
+        logger.error(Msg.ERR_PARAMETRIC_CSV_CONTAINS_ERROR)
         logger.error(error_msg)
         raise SolveError