pyfemtet 1.0.0b0__py3-none-any.whl → 1.0.1__py3-none-any.whl

pyfemtet/_util/df_util.py

@@ -1,3 +1,4 @@
+from math import isnan
 import pandas as pd
 
 
@@ -9,8 +10,24 @@ __all__ = [
 
 def get_index(df, equality_filters):
     # フィルタ条件に一致する行のインデックスを取得
+
+    # na との == での比較は常に False なので別処理するために別リストを作る
+    want_na_keys = []
+    for key, value in equality_filters.items():
+        if isinstance(value, float):
+            if isnan(value):
+                want_na_keys.append(key)
+    [equality_filters.pop(key) for key in want_na_keys]
+
+    # na 以外の比較
     # noinspection PyUnresolvedReferences
-    return (df[list(equality_filters.keys())] == pd.Series(equality_filters)).all(axis=1)
+    out: pd.Series = (df[list(equality_filters.keys())] == pd.Series(equality_filters)).all(axis=1)
+
+    # na との比較
+    for key in want_na_keys:
+        out = out & df[key].isna()
+
+    return out
 
 
 def get_partial_df(df: pd.DataFrame, equality_filters: dict):

pyfemtet/_util/helper.py

@@ -1,6 +1,9 @@
 from __future__ import annotations
 
 from typing import Callable
+
+import string
+import secrets
 import warnings
 from time import time, sleep
 from threading import Thread
@@ -10,6 +13,7 @@ from pyfemtet._i18n import _
 __all__ = [
     'float_',
     'time_counting',
+    'generate_random_id',
 ]
 
 
@@ -92,3 +96,8 @@ def time_counting(
         warning_message,
         warning_fun,
     )
+
+
+def generate_random_id(length: int = 16) -> str:
+    alphabet = string.ascii_letters + string.digits
+    return ''.join(secrets.choice(alphabet) for _ in range(length))

pyfemtet/opt/femopt.py

@@ -29,6 +29,19 @@ logger = get_module_logger('opt.femopt', False)
 
 
 class FEMOpt:
+    """
+    A class to manage finite element method (FEM) optimization using a specified optimizer and FEM interface.
+
+    Attributes:
+        opt (AbstractOptimizer): The optimizer instance to be used for optimization.
+        monitor_info (dict[str, str | int | None]): Dictionary to store monitoring information such as host and port.
+
+    Args:
+        fem (AbstractFEMInterface, optional): An instance of a FEM interface. Defaults to None, in which case a FemtetInterface is used.
+        opt (AbstractOptimizer, optional): An optimizer instance. Defaults to None, in which case OptunaOptimizer is used.
+
+    """
+
     opt: AbstractOptimizer
 
     def __init__(

pyfemtet/opt/history/_history.py

@@ -18,6 +18,7 @@ import pandas as pd
 import pyfemtet
 
 from pyfemtet._i18n import *
+from pyfemtet._util.helper import generate_random_id
 from pyfemtet._util.df_util import *
 from pyfemtet._util.dask_util import *
 from pyfemtet._util.str_enum import StrEnum
@@ -43,7 +44,10 @@ __all__ = [
     'MAIN_FILTER',
 ]
 
-MAIN_FILTER: dict = {'sub_fidelity_name': MAIN_FIDELITY_NAME}
+MAIN_FILTER: dict = {
+    'sub_fidelity_name': MAIN_FIDELITY_NAME,
+    'sub_sampling': float('nan')
+}
 
 
 logger = get_module_logger('opt.history', False)
@@ -126,9 +130,10 @@ class DataFrameWrapper:
 
     __df: pd.DataFrame
     _lock_name = 'edit-df'
-    _dataset_name = 'df'
+    _dataset_name: str
 
     def __init__(self, df: pd.DataFrame):
+        self._dataset_name = 'df-' + generate_random_id()
         self.set_df(df)
 
     def __len__(self):
@@ -1053,6 +1058,14 @@ class Records:
 
         with self.df_wrapper.lock_if_not_locked:
 
+            # check trial_id is filled
+            trial_processed = False
+            if processing_df['trial_id'].notna().all():
+                id_to_n: dict = {tid: i + 1 for i, tid
+                                 in enumerate(processing_df['trial_id'].unique())}
+                processing_df['trial'] = processing_df['trial_id'].map(id_to_n)
+                trial_processed = True
+
             # update main fidelity
             equality_filters = MAIN_FILTER
             mgr = EntireDependentValuesCalculator(
@@ -1062,13 +1075,13 @@ class Records:
             )
             mgr.update_optimality()
             mgr.update_hypervolume()
-            mgr.update_trial_number()
+            if not trial_processed:
+                mgr.update_trial_number()  # per_fidelity
             pdf = mgr.partial_df
             apply_partial_df(df=processing_df, partial_df=pdf, equality_filters=equality_filters)
 
             # update sub fidelity
-            entire_df = self.df_wrapper.get_df()
-            sub_fidelity_names: list = np.unique(entire_df['sub_fidelity_name']).tolist()
+            sub_fidelity_names: list = np.unique(processing_df['sub_fidelity_name']).tolist()
             if MAIN_FIDELITY_NAME in sub_fidelity_names:
                 sub_fidelity_names.remove(MAIN_FIDELITY_NAME)
             for sub_fidelity_name in sub_fidelity_names:
@@ -1078,7 +1091,8 @@ class Records:
                     equality_filters,
                     processing_df
                 )
-                mgr.update_trial_number()
+                if not trial_processed:
+                    mgr.update_trial_number()  # per_fidelity
             pdf = mgr.partial_df
             apply_partial_df(df=processing_df, partial_df=pdf, equality_filters=equality_filters)
 

pyfemtet/opt/interface/_excel_interface/excel_interface.py

@@ -258,8 +258,6 @@ class ExcelInterface(COMInterface):
             force_override_when_load: bool = False,
     ):
 
-        show_experimental_warning("ExcelInterface")
-
         def proc_path(path_):
             if path_ is None:
                 return self._original_input_xlsm_path

pyfemtet/opt/interface/_femtet_interface/femtet_interface.py

@@ -102,8 +102,6 @@ class FemtetInterface(COMInterface):
                 If you do not want to delete the swept table,
                 make a copy of the original file.
 
-        **kwargs: Additional arguments from inherited classes.
-
     Warning:
         Even if you specify ``strictly_pid_specify=True`` on the constructor,
         **the connection behavior is like** ``strictly_pid_specify=False`` **in parallel processing**
@@ -119,6 +117,7 @@ class FemtetInterface(COMInterface):
 
     com_members = {'Femtet': 'FemtetMacro.Femtet'}
     _show_parametric_index_warning = True  # for GUI
+    _femtet_connection_timeout = 10
 
     def __init__(
             self,
@@ -316,9 +315,9 @@ class FemtetInterface(COMInterface):
         logger.info("└ Try to connect existing Femtet process.")
         # 既存の Femtet を探して Dispatch する。
         if pid is None:
-            self.Femtet, self.femtet_pid = dispatch_femtet(timeout=5)
+            self.Femtet, self.femtet_pid = dispatch_femtet(timeout=self._femtet_connection_timeout)
         else:
-            self.Femtet, self.femtet_pid = dispatch_specific_femtet(pid, timeout=5)
+            self.Femtet, self.femtet_pid = dispatch_specific_femtet(pid, timeout=self._femtet_connection_timeout)
         self.connected_method = "existing"
 
     def connect_femtet(self, connect_method: str = "auto", pid: int or None = None):

pyfemtet/opt/interface/_femtet_with_solidworks/femtet_with_solidworks_interface.py

@@ -20,6 +20,26 @@ if TYPE_CHECKING:
 
 
 class FemtetWithSolidworksInterface(FemtetInterface, SolidworksInterface, AbstractFEMInterface):
+    """
+    Interface class integrating Femtet and SolidWorks operations.
+
+    This class combines the capabilities of both Femtet and SolidWorks interfaces, allowing
+    coordinated operation between simulation (Femtet) and CAD manipulation (SolidWorks).
+
+    Args:
+        sldprt_path (str): Path to the SolidWorks part file (.sldprt).
+        femprj_path (str, optional): Path to the Femtet project file (.femprj). Defaults to None.
+        model_name (str, optional): Name of the model in the project. Defaults to None.
+        connect_method (str, optional): Connection method for Femtet. Defaults to "auto".
+        save_pdt (str, optional): Specifies which data to save. Defaults to "all".
+        strictly_pid_specify (bool, optional): Whether to strictly specify parameter IDs. Defaults to True.
+        allow_without_project (bool, optional): If True, allows operation without a project file. Defaults to False.
+        open_result_with_gui (bool, optional): If True, open results with GUI. Defaults to True.
+        parametric_output_indexes_use_as_objective (dict[int, str | float], optional): Indexes for parametric output used as objectives. Defaults to None.
+        always_open_copy (bool, optional): If True, always open a copy of the project. Defaults to False.
+        close_solidworks_on_terminate (bool, optional): If True, SolidWorks will close when this object is destroyed. Defaults to False.
+        solidworks_visible (bool, optional): If True, SolidWorks will be started in visible mode. Defaults to True.
+    """
 
     def __init__(
             self,

pyfemtet/opt/interface/_solidworks_interface/solidworks_interface.py

@@ -41,6 +41,27 @@ class FileNotOpenedError(Exception):
 
 # noinspection PyPep8Naming
 class SolidworksInterface(COMInterface):
+    """
+    Interface class for interacting with SolidWorks through COM automation.
+
+    This class manages the connection and interaction with SolidWorks using its COM interface.
+    It handles initialization, visibility, and clean termination of the SolidWorks application.
+
+    Attributes:
+        swApp (CDispatch): The COM dispatch object for SolidWorks application.
+        com_members (dict): Mapping of COM member names to their interface strings.
+        sldprt_path (str): Absolute path to the SolidWorks part file (.sldprt).
+        quit_solidworks_on_terminate (bool): Whether to close SolidWorks upon object destruction.
+        solidworks_visible (bool): Whether the SolidWorks application window is visible.
+
+    Args:
+        sldprt_path (str): Path to the SolidWorks part file (.sldprt).
+        close_solidworks_on_terminate (bool, optional): If True, SolidWorks will close when this object is destroyed. Defaults to False.
+        visible (bool, optional): If True, SolidWorks will be started in visible mode. Defaults to True.
+
+    Raises:
+        AssertionError: If the specified part file does not exist.
+    """
 
     swApp: CDispatch
     com_members = {'swApp': 'SLDWORKS.Application'}

pyfemtet/opt/optimizer/_base_optimizer.py

@@ -434,6 +434,7 @@ class AbstractOptimizer:
 
         def __init__(self, opt: AbstractOptimizer):
             self.opt: AbstractOptimizer = opt
+            self.subsampling_idx: SubSampling | None = None
 
         def _preprocess(self):
             pass
@@ -460,6 +461,7 @@ class AbstractOptimizer:
                 variables_pass_to_fem: dict[str, SupportedVariableTypes],
                 history: History = None,
                 datetime_start=None,
+                trial_id=None,
         ) -> _FReturnValue:
 
             # create context
@@ -486,6 +488,8 @@ class AbstractOptimizer:
                     {obj_name: ObjectiveResult(obj, opt_.fem, float('nan'))
                      for obj_name, obj in opt_.objectives.items()}
                 )
+                record.sub_sampling = self.subsampling_idx
+                record.trial_id = trial_id
                 record.sub_fidelity_name = opt_.sub_fidelity_name
                 record.fidelity = opt_.fidelity
                 record.datetime_start = datetime_start
@@ -498,7 +502,8 @@ class AbstractOptimizer:
                     raise SkipSolve
 
                 # start solve
-                if opt_.sub_fidelity_models != MAIN_FIDELITY_NAME:
+                if opt_.sub_fidelity_name != MAIN_FIDELITY_NAME:
+                    logger.info('----------')
                     logger.info(_('fidelity: ({name})', name=opt_.sub_fidelity_name))
                 logger.info(_('input variables:'))
                 logger.info(parameters)
@@ -629,7 +634,9 @@ class AbstractOptimizer:
                 x: TrialInput,
                 x_pass_to_fem_: dict[str, SupportedVariableTypes],
                 opt_: AbstractOptimizer | None = None,
+                trial_id: str =None,
         ) -> _FReturnValue | None:
+            """Nothing will be raised even if infeasible."""
 
             vm = self.opt.variable_manager
 
@@ -643,32 +650,40 @@ class AbstractOptimizer:
             # if opt_ is not self, update variable manager
             opt_.variable_manager = vm
 
-            # preprocess
-            self._preprocess()
+            # noinspection PyMethodParameters
+            class Process:
+                def __enter__(self_):
+                    # preprocess
+                    self._preprocess()
 
-            # declare output
-            f_return = None
+                def __exit__(self_, exc_type, exc_val, exc_tb):
+                    # postprocess
+                    self._postprocess()
 
-            # start solve
-            datetime_start = datetime.datetime.now()
-            try:
-                f_return = self._solve_or_raise(
-                    opt_, x, x_pass_to_fem_, self.opt.history, datetime_start
-                )
+            with Process():
 
-            except HardConstraintViolation as e:
-                self._hard_constraint_handling(e)
+                # declare output
+                f_return = None
 
-            except _HiddenConstraintViolation as e:
-                self._hidden_constraint_handling(e)
+                # start solve
+                datetime_start = datetime.datetime.now()
+                try:
+                    f_return = self._solve_or_raise(
+                        opt_, x, x_pass_to_fem_, self.opt.history,
+                        datetime_start, trial_id
+                    )
 
-            except SkipSolve as e:
-                self._skip_handling(e)
+                except HardConstraintViolation as e:
+                    self._hard_constraint_handling(e)
 
-            else:
-                self._if_succeeded(f_return)
+                except _HiddenConstraintViolation as e:
+                    self._hidden_constraint_handling(e)
 
-            self._postprocess()
+                except SkipSolve as e:
+                    self._skip_handling(e)
+
+                else:
+                    self._if_succeeded(f_return)
 
             # check interruption
             self.opt._check_and_raise_interruption()
@@ -799,8 +814,19 @@ class AbstractOptimizer:
         # noinspection PyMethodParameters
         class LoggingOutput:
             def __enter__(self_):
-                self_.count = len(self.history.get_df()) + 1
-                logger.info(f'▼▼▼▼▼ solve {self_.count} start ▼▼▼▼▼')
+                df = self.history.get_df(
+                    equality_filters=MAIN_FILTER
+                )
+                self_.count = len(df) + 1
+
+                succeeded_count = len(df[df['state'] == TrialState.succeeded])
+                succeeded_text = _(
+                    en_message='{succeeded_count} succeeded trials',
+                    jp_message='成功した試行数: {succeeded_count}',
+                    succeeded_count=succeeded_count,
+                )
+
+                logger.info(f'▼▼▼▼▼ solve {self_.count} ({succeeded_text}) start ▼▼▼▼▼')
 
             def __exit__(self_, exc_type, exc_val, exc_tb):
                 logger.info(f'▲▲▲▲▲ solve {self_.count} end ▲▲▲▲▲\n')

pyfemtet/opt/optimizer/optuna_optimizer/_optuna_attribute.py

@@ -1,73 +1,63 @@
 from __future__ import annotations
 
+from typing import TypedDict, Sequence
+
+import optuna.trial
+
 from pyfemtet.opt.problem.problem import *
 from pyfemtet.opt.history import *
 from pyfemtet.opt.optimizer._base_optimizer import *
 
 
 class OptunaAttribute:
-    """Manage optuna user attribute
+    """Manage optuna user attribute.
 
-    user attributes are:
-        sub_fidelity_name:
+    By `set_user_attr_to_trial`,
+        key (str):
+            {sub_fidelity_name}(_{subsampling_idx})
+        value (dict):
             fidelity: ...
-            OBJECTIVE_ATTR_KEY: ...
-            PYFEMTET_STATE_ATTR_KEY: ...
-            CONSTRAINT_ATTR_KEY: ...
+            internal_y_values: ...
+            violation_values: ...
+            pf_state: ...
 
     """
-
-    OBJECTIVE_KEY = 'internal_objective'
-    CONSTRAINT_KEY = 'constraint'
-    PYFEMTET_TRIAL_STATE_KEY = 'pyfemtet_trial_state'
-
-    sub_fidelity_name: str  # key
-    fidelity: Fidelity | None
-    v_values: tuple | None  # violation
-    y_values: tuple | None  # internal objective
-    pf_state: TrialState | None  # PyFemtet state
-
-    def __init__(self, opt: AbstractOptimizer):
-        self.sub_fidelity_name = opt.sub_fidelity_name
-        self.fidelity = None
-        self.v_values = None
-        self.y_values = None
-        self.pf_state = None
-
-    # noinspection PyPropertyDefinition
-    @classmethod
-    def main_fidelity_key(cls):
-        return MAIN_FIDELITY_NAME
+    class AttributeStructure(TypedDict):
+        fidelity: Fidelity | None
+        internal_y_values: Sequence[float] | None
+        violation_values: Sequence[float] | None
+        pf_state: TrialState | None
+
+    def __init__(
+            self,
+            opt: AbstractOptimizer,
+            subsampling_idx: SubSampling | None = None,
+    ):
+        # key
+        self.sub_fidelity_name: str = opt.sub_fidelity_name
+        self.subsampling_idx: SubSampling | None = subsampling_idx
+        # value
+        self.fidelity: Fidelity = opt.fidelity
+        self.y_values: Sequence[float] | None = None
+        self.v_values: Sequence[float] | None = None
+        self.pf_state: TrialState | None = None
 
     @property
-    def key(self):
-        return self.sub_fidelity_name
+    def key(self) -> str:
+        key = self.sub_fidelity_name
+        if self.subsampling_idx is not None:
+            key += f'_{self.subsampling_idx}'
+        return key
 
     @property
-    def value(self):
-        d = {}
-        if self.fidelity:
-            d.update({'fidelity': self.fidelity})
-        if self.y_values:
-            d.update({self.OBJECTIVE_KEY: self.y_values})
-        if self.v_values:
-            d.update({self.CONSTRAINT_KEY: self.v_values})
-        if self.pf_state:
-            d.update({self.PYFEMTET_TRIAL_STATE_KEY: self.pf_state})
-        return d
-
-    @staticmethod
-    def get_fidelity(optuna_attribute: OptunaAttribute):
-        return optuna_attribute.value['fidelity']
-
-    @staticmethod
-    def get_violation(optuna_attribute: OptunaAttribute):
-        return optuna_attribute.value[OptunaAttribute.CONSTRAINT_KEY]
-
-    @staticmethod
-    def get_violation_from_trial_attr(trial_attr: dict):  # value is OptunaAttribute.value
-        return trial_attr[OptunaAttribute.CONSTRAINT_KEY]
-
-    @staticmethod
-    def get_pf_state_from_trial_attr(trial_attr: dict):  # value is OptunaAttribute.value
-        return trial_attr[OptunaAttribute.PYFEMTET_TRIAL_STATE_KEY]
+    def value(self) -> AttributeStructure:
+        out = self.AttributeStructure(
+            fidelity=self.fidelity,
+            internal_y_values=self.y_values,
+            violation_values=self.v_values,
+            pf_state=self.pf_state,
+        )
+        return out
+
+    def set_user_attr_to_trial(self, trial: optuna.trial.Trial):
+        trial.set_user_attr(self.key, self.value)

pyfemtet/opt/optimizer/optuna_optimizer/_optuna_optimizer.py

@@ -39,6 +39,37 @@ warnings.filterwarnings('ignore', 'Argument ``constraints_func`` is an experimen
 
 
 class OptunaOptimizer(AbstractOptimizer):
+    """
+    An optimizer class utilizing Optuna for hyperparameter optimization.
+
+    This class provides an interface to conduct optimization studies using Optuna.
+    It manages the study lifecycle, sampler configuration, and trial execution.
+
+    Attributes:
+        study_name (str): Name of the Optuna study.
+        storage (str | optuna.storages.BaseStorage): Storage URL or object for the Optuna study.
+        storage_path (str): Path to the Optuna study storage.
+        current_trial (optuna.trial.Trial | None): The current Optuna trial being evaluated.
+        sampler_class (type[optuna.samplers.BaseSampler]): The class of the Optuna sampler to use.
+        sampler_kwargs (dict): Keyword arguments to initialize the sampler.
+        n_trials (int | None): Number of trials to run in the study.
+        timeout (float | None): Maximum time allowed for the optimization.
+        callbacks (list): List of callback functions to invoke during optimization.
+
+    Args:
+        sampler_class (type[optuna.samplers.BaseSampler], optional): The sampler class for suggesting parameter values. Defaults to TPESampler if None.
+        sampler_kwargs (dict[str, ...], optional): Dictionary of keyword arguments for the sampler. Defaults to an empty dictionary.
+
+    Raises:
+        None
+
+    Examples:
+        >>> optimizer = OptunaOptimizer()
+        >>> optimizer.n_trials = 100
+        >>> optimizer.timeout = 600
+        >>> # Further configuration and usage...
+    """
+
     # system
     study_name = 'pyfemtet-study'
     storage: str | optuna.storages.BaseStorage
@@ -122,7 +153,7 @@ class OptunaOptimizer(AbstractOptimizer):
 
             y, dict_y_internal, c, record = f_return
 
-            # convert constraint to **sorted** violation
+            # convert constraint to **sorted 1-d array** violation
             assert len(c) == len(self.opt_.constraints)
             v = {}
             for cns_name, cns in self.opt_.constraints.items():
@@ -139,10 +170,7 @@ class OptunaOptimizer(AbstractOptimizer):
 
         def _postprocess(self):
             # update trial attribute
-            self.opt.current_trial.set_user_attr(
-                self.optuna_attr.key,
-                self.optuna_attr.value,
-            )
+            self.optuna_attr.set_user_attr_to_trial(self.opt.current_trial)
 
     def _create_infeasible_constraints(self, opt_: AbstractOptimizer = None) -> tuple:
         opt_ = opt_ if opt_ is not None else self
@@ -155,9 +183,9 @@ class OptunaOptimizer(AbstractOptimizer):
         return tuple(1e9 * np.ones(count, dtype=np.float64))
 
     def _constraint(self, trial: optuna.trial.FrozenTrial):
-        key = OptunaAttribute(self).key
-        value = trial.user_attrs[key]
-        return OptunaAttribute.get_violation_from_trial_attr(value)
+        main_key = OptunaAttribute(self).key
+        user_attribute: OptunaAttribute.AttributeStructure = trial.user_attrs[main_key]
+        return user_attribute['violation_values']
 
     def _objective(self, trial: optuna.trial.Trial):
 
@@ -226,9 +254,9 @@ class OptunaOptimizer(AbstractOptimizer):
 
             # To avoid trial FAILED with hard constraint
             # violation, check pf_state and raise TrialPruned.
-            key = OptunaAttribute(self).key
-            value = trial.user_attrs[key]
-            state = OptunaAttribute.get_pf_state_from_trial_attr(value)
+            main_key = OptunaAttribute(self).key
+            user_attribute: OptunaAttribute.AttributeStructure = trial.user_attrs[main_key]
+            state: TrialState = user_attribute['pf_state']
             if state in [
                 TrialState.hard_constraint_violation,
                 TrialState.model_error,
@@ -245,9 +273,6 @@ class OptunaOptimizer(AbstractOptimizer):
 
             return y_internal
 
-        if get_client() is None:
-            self.history.save()
-
     def _get_callback(self, n_trials: int):
 
         # restart である場合、追加 N 回と見做す
@@ -587,16 +612,16 @@ def debug_1():
     _opt.add_parameter('x1', 1, -1, 1, step=0.1)
     _opt.add_parameter('x2', 1, -1, 1, step=0.1)
     _opt.add_categorical_parameter('x3', 'a', choices=['a', 'b', 'c'])
-    _opt.add_constraint('cns', _cns, lower_bound=-0.9, args=(_fem, _opt))
-    _opt.add_objective('obj1', _parabola, args=(_fem, _opt))
-    # _opt.add_objective('obj2', _parabola2, args=(_fem, _opt))
+    # _opt.add_constraint('cns', _cns, lower_bound=-0.9, args=(_opt,))
+    _opt.add_objective('obj1', _parabola, args=(_opt,))
+    # _opt.add_objective('obj2', _parabola2, args=(_opt,))
 
     # # ===== sub-fidelity =====
     # __fem = NoFEM()
     # __opt = SubFidelityModel()
     # __opt.fem = __fem
-    # __opt.add_objective('obj1', _parabola, args=(__fem, __opt))
-    # __opt.add_objective('obj2', _parabola2, args=(__fem, __opt))
+    # __opt.add_objective('obj1', _parabola, args=(__opt,))
+    # # __opt.add_objective('obj2', _parabola2, args=(__opt,))
     #
     # _opt.add_sub_fidelity_model(name='low-fidelity', sub_fidelity_model=__opt, fidelity=0.5)
     #
@@ -622,6 +647,96 @@ def debug_1():
     _opt.history.save()
 
 
+def debug_1s():
+    # from pyfemtet.opt.optimizer.optuna_optimizer.pof_botorch.pof_botorch_sampler import
+    # sampler = PoFBoTorchSampler(
+    #     n_startup_trials=5,
+    #     seed=42,
+    #     constraints_func=self._constraint,
+    #     pof_config=PoFConfig(
+    #         # consider_pof=False,
+    #         # feasibility_cdf_threshold='mean',
+    #     ),
+    #     partial_optimize_acqf_kwargs=PartialOptimizeACQFConfig(
+    #         # gen_candidates='scipy',
+    #         timeout_sec=5.,
+    #         # method='SLSQP'  # 'COBYLA, COBYQA, SLSQP or trust-constr
+    #         tol=0.1,
+    #         # scipy_minimize_kwargs=dict(),
+    #     ),
+    # )
+    # from optuna_integration import BoTorchSampler
+    # sampler = BoTorchSampler(n_startup_trials=5)
+
+    os.chdir(os.path.dirname(__file__))
+
+    def _parabola(_fem: AbstractFEMInterface, _opt: AbstractOptimizer) -> float:
+        d = _opt.get_variables()
+        x1 = d['x1']
+        x2 = d['x2']
+        # if _cns(_fem, _opt) < 0:
+        #     raise PostProcessError
+        return x1 ** 2 + x2 ** 2
+
+    def _parabola2(_fem: AbstractFEMInterface, _opt: AbstractOptimizer) -> float:
+        x = _opt.get_variables('values')
+        return ((x - 0.1) ** 2).sum()
+
+    def _cns(_fem: AbstractFEMInterface, _opt: AbstractOptimizer) -> float:
+        x = _opt.get_variables('values')
+        return x[0]
+
+    _fem = NoFEM()
+    _opt = OptunaOptimizer()
+    _opt.fem = _fem
+
+    # _opt.sampler = optuna.samplers.RandomSampler(seed=42)
+    _opt.seed = 42
+    _opt.sampler_class = optuna.samplers.TPESampler
+    # _opt.sampler_class = optuna.samplers.RandomSampler
+    _opt.sampler_kwargs = dict(
+        n_startup_trials=5,
+    )
+    _opt.n_trials = 10
+
+    _opt.add_parameter('x1', 1, -1, 1, step=0.1)
+    _opt.add_parameter('x2', 1, -1, 1, step=0.1)
+    _opt.add_categorical_parameter('x3', 'a', choices=['a', 'b', 'c'])
+    # _opt.add_constraint('cns', _cns, lower_bound=-0.9, args=(_opt,))
+    _opt.add_objective('obj1', _parabola, args=(_opt,))
+    # _opt.add_objective('obj2', _parabola2, args=(_opt,))
+
+    # ===== sub-fidelity =====
+    __fem = NoFEM()
+    __opt = SubFidelityModel()
+    __opt.fem = __fem
+    __opt.add_objective('obj1', _parabola, args=(__opt,))
+    # __opt.add_objective('obj2', _parabola2, args=(__opt,))
+
+    _opt.add_sub_fidelity_model(name='low-fidelity', sub_fidelity_model=__opt, fidelity=0.5)
+
+    def _solve_condition(_history: History):
+
+        sub_fidelity_df = _history.get_df(
+            {'sub_fidelity_name': 'low-fidelity'}
+        )
+        idx = sub_fidelity_df['state'] == TrialState.succeeded
+        pdf = sub_fidelity_df[idx]
+
+        return len(pdf) % 5 == 0
+
+    _opt.set_solve_condition(_solve_condition)
+
+    # _opt.history.path = 'restart-test.csv'
+    _opt.run()
+
+    # import plotly.express as px
+    # _df = _opt.history.get_df()
+    # px.scatter_3d(_df, x='x1', y='x2', z='obj', color='fidelity', opacity=0.5).show()
+
+    _opt.history.save()
+
+
 def substrate_size(Femtet):
     """基板のXY平面上での専有面積を計算します。"""
     substrate_w = Femtet.GetVariableValue('substrate_w')
@@ -669,10 +784,13 @@ def debug_3():
     opt.add_parameter(name="substrate_d", initial_value=60, lower_bound=34, upper_bound=60)
 
     opt.n_trials = 5
-    opt.history.path = os.path.join(os.path.dirname(__file__), 'femtet-test.csv')
+    opt.history.path = os.path.join(os.path.dirname(__file__), 'femtet-test-2.csv')
 
     opt.run()
 
 
 if __name__ == '__main__':
+    debug_1()
+    debug_1s()
+    debug_2()
     debug_3()

pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/pof_botorch_sampler.py

@@ -973,9 +973,9 @@ class PoFBoTorchSampler(BoTorchSampler):
         feasible_trials: list[FrozenTrial] = []
         infeasible_trials: list[FrozenTrial] = []
         for trial in (completed_trials + pruned_trials):
-            state: PFTrialState = OptunaAttribute.get_pf_state_from_trial_attr(
-                trial.user_attrs[OptunaAttribute.main_fidelity_key()]
-            )
+            main_key = OptunaAttribute(self.pyfemtet_optimizer).key
+            user_attribute: OptunaAttribute.AttributeStructure = trial.user_attrs[main_key]
+            state: PFTrialState = user_attribute['pf_state']
 
             if state in self.pof_config._states_to_consider_pof:
                 infeasible_trials.append(trial)

pyfemtet/opt/optimizer/scipy_optimizer/_scipy_optimizer.py

@@ -36,6 +36,25 @@ class _ScipyCallback:
 
 
 class ScipyOptimizer(AbstractOptimizer):
+    """
+    Optimizer class that utilizes SciPy optimization methods.
+
+    This class serves as a wrapper around SciPy's optimization routines,
+    allowing customization of the optimization method, tolerance, and options.
+    It also provides mechanisms for handling constraints with enhancement and scaling.
+
+    Attributes:
+        method (str): The optimization method to use (e.g., 'BFGS', 'Nelder-Mead').
+        tol (float or None): Tolerance for termination.
+        options (dict): Additional options to pass to the SciPy optimizer.
+        constraint_enhancement (float): Small value added to enhance constraint handling.
+        constraint_scaling (float): Scaling factor applied to constraints.
+
+    Args:
+        method (str): The optimization method to use (e.g., 'BFGS', 'Nelder-Mead').
+        tol (float or None): Tolerance for termination.
+        
+    """
 
     _timeout: None = None
     _n_trials: None = None

pyfemtet/opt/problem/variable_manager/_variable_manager.py

@@ -149,41 +149,59 @@ class VariableManager:
             # fun を持つ場合
             if isinstance(var, ExpressionFromFunction):
 
-                # pop するので list をコピーしておく
-                user_def_args = list(var.args)
+                # 関数に渡す引数の初期化
+                final_args = []
+                final_kwargs = {}
 
-                # 位置引数を揃え、残りをキーワード引数にする
-                pos_args = []
-                kw_args = var.kwargs or {}
+                # 関数のシグネチャを取得
+                params = inspect.signature(var.fun).parameters
 
-                # 引数順に調べる
-                required_arg_names = inspect.signature(var.fun).parameters.values()
-                for p in required_arg_names:
+                # 用意された引数をコピー
+                user_args = list(var.args)
+                user_kwargs = var.kwargs.copy()
 
-                    # 位置引数であ（りう）る
+                # 関数に定義されている順に組み立て
+                for p in params.values():
+
+                    # def sample(a, /, b, *c, d=None, **e):
+                    #     ...
+                    # a: POSITIONAL_OR_KEYWORD
+                    # b: POSITIONAL_OR_KEYWORD
+                    # c: VAR_POSITIONAL
+                    # d: KEYWORD_ONLY
+                    # e: VAR_KEYWORD
+
+                    # 位置引数で定義されているもの
                     if p.kind <= inspect.Parameter.POSITIONAL_OR_KEYWORD:
 
                         # 変数である
                         if p.name in self.variables:
                             # order 順に見ているのですでに value が正しいはず
-                            pos_args.append(self.variables[p.name].value)
+                            final_args.append(self.variables[p.name].value)
 
-                        # ユーザー定義位置引数である
+                        # ユーザーが供給する変数である
                         else:
-                            try:
-                                pos_args.append(user_def_args.pop(0))
-                            except IndexError as e:  # pop from empty list
+                            # user kwargs にあるかまず確認する
+                            if p.name in user_kwargs:
+                                # 該当物を抜き出して args に追加
+                                final_args.append(user_kwargs.pop(p.name))
+
+                            # user args がまだある
+                            elif len(user_args) > 0:
+                                # 先頭を抜き出して args に追加
+                                final_args.append(user_args.pop(0))
+
+                            # pos args が空であり、kwargs の中にもない
+                            else:
                                 msg = []
-                                for p_ in required_arg_names:
+                                for p_ in params.values():
                                     if p_.kind == inspect.Parameter.VAR_POSITIONAL:
                                         msg.append(f'*{p_.name}')
                                     elif p_.kind == inspect.Parameter.VAR_KEYWORD:
                                         msg.append(f'**{p_.name}')
                                     else:
                                         msg.append(p_.name)
-                                raise type(e)(
-                                    *e.args,
-                                    _(
+                                raise RuntimeError(_(
                                         'Missing arguments! '
                                         'The arguments specified by `args`: {var_args} / '
                                         'The arguments specified by `kwargs`: {var_kwargs} / '
@@ -191,8 +209,7 @@ class VariableManager:
                                         var_args=var.args,
                                         var_kwargs=var.kwargs,
                                         msg=msg
-                                    ),
-                                ) from None
+                                ))
 
                     # *args である
                     elif p.kind == inspect.Parameter.VAR_POSITIONAL:
@@ -200,25 +217,64 @@ class VariableManager:
                         # ユーザー定義位置引数でないとおかしい
                         assert p.name not in self.variables, _('Extra positional argument name cannot be duplicated with a variable name.')
 
-                        # *args なので残り全部を pos_args に入れる
-                        pos_args.extend(user_def_args)
+                        # *args なので残り全部を抜いて pos_args に入れる
+                        final_args.extend(user_args)
+                        user_args = []
 
-                    # キーワード引数である
+                    # キーワード引数で定義されているもの
                     elif p.kind == inspect.Parameter.KEYWORD_ONLY:
 
                         # 変数である
                         if p.name in self.variables:
                             # order 順に見ているのですでに value が正しいはず
-                            kw_args.update({p.name: self.variables[p.name].value})
+                            final_kwargs.update({p.name: self.variables[p.name].value})
 
-                    # **kwargs である
-                    else:
+                        # ユーザーが供給する変数である
+                        else:
+                            # user kwargs にあるかまず確認する
+                            if p.name in user_kwargs:
+                                # 該当物を抜き出して kwargs に追加
+                                final_kwargs.update({p.name: user_kwargs.pop(p.name)})
+
+                            # user args がまだある
+                            elif len(user_args) > 0:
+                                # 先頭を抜き出して args に追加
+                                final_kwargs.update({p.name: user_args.pop(0)})
+
+                            # pos args が空であり、kwargs の中にもない
+                            else:
+                                msg = []
+                                for p_ in params.values():
+                                    if p_.kind == inspect.Parameter.VAR_POSITIONAL:
+                                        msg.append(f'*{p_.name}')
+                                    elif p_.kind == inspect.Parameter.VAR_KEYWORD:
+                                        msg.append(f'**{p_.name}')
+                                    else:
+                                        msg.append(p_.name)
+                                raise RuntimeError(_(
+                                        'Missing arguments! '
+                                        'The arguments specified by `args`: {var_args} / '
+                                        'The arguments specified by `kwargs`: {var_kwargs} / '
+                                        'Required arguments: {msg}',
+                                        var_args=var.args,
+                                        var_kwargs=var.kwargs,
+                                        msg=msg
+                                ))
 
-                        # kw_args にユーザー定義キーワード引数を入れているので何もしなくてよい
+                    # **kwargs である
+                    elif p.kind == inspect.Parameter.VAR_KEYWORD:
+                        # 変数であってはいけない
                         assert p.name not in self.variables, _('Extra keyword argument name cannot be duplicated with a variable name.')
 
+                        # 残りの kwargs を移す
+                        final_kwargs.update(user_kwargs)
+                        user_kwargs = {}
+
+                    else:
+                        raise NotImplementedError(f'Unknown argument type: {p.kind=}')
+
                 # fun を実行する
-                var.value = var.fun(*pos_args, **kw_args)
+                var.value = var.fun(*final_args, **final_kwargs)
 
             # string expression の場合
             elif isinstance(var, ExpressionFromString):

{pyfemtet-1.0.0b0.dist-info → pyfemtet-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyfemtet
-Version: 1.0.0b0
+Version: 1.0.1
 Summary: Design parameter optimization using Femtet.
 License: MIT
 Author: kazuma.naito

{pyfemtet-1.0.0b0.dist-info → pyfemtet-1.0.1.dist-info}/RECORD

@@ -11,14 +11,14 @@ pyfemtet/_i18n/messages.py,sha256=mzTARnpZPZ-Pmcq8RdOyy5a4XGCCSxwxuoHjN_HJ0TM,17
 pyfemtet/_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/_util/closing.py,sha256=JPcgHDbW249YF20bMOX6UX-LquWoCWA14KhX-qFouR4,502
 pyfemtet/_util/dask_util.py,sha256=Wm_1p_LR1yhhZNaGgazf-yQ-eialLfmqtgBjxha6qWk,2159
-pyfemtet/_util/df_util.py,sha256=J4eij4B99UQI2GBAu2SsIeKzwPRAnnJPJyRmjjrSMYo,860
+pyfemtet/_util/df_util.py,sha256=hEae7YYhMnNmz8La2mmfAGlESqElxTdSSb-LVL2PUN4,1358
 pyfemtet/_util/excel_macro_util.py,sha256=pUCpENpM1q6AbC7wH7rMXwnQ7nIFnabQ4xlbsli9VzM,8028
 pyfemtet/_util/excel_parse_util.py,sha256=k8Y5EI9r0txwkieKUzlZqQ93b-9SMXldNIfq5ksWg28,5525
 pyfemtet/_util/femtet_access_inspection.py,sha256=91E-7wzQTZum1UIsccW26717GnTM2jxf3HeOOR7-lv0,3999
 pyfemtet/_util/femtet_autosave.py,sha256=-9DaYNsSK1QBnTOPo7EdLnMwqwAetCx_Ho5kOFMgwlk,2145
 pyfemtet/_util/femtet_exit.py,sha256=sg3GJ2gqS_V7moOJQUr4T2AphOOat_kUnGF-0AHVB68,4256
 pyfemtet/_util/femtet_version.py,sha256=9bWRMC_Exb-3rh5bg9eKfwBcgkxz_vg_eX99RPukcgA,580
-pyfemtet/_util/helper.py,sha256=WBsKHxXeYa9CN4EZHhlihPO8m-JFlVap2X8bDe5WGbE,2316
+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/str_enum.py,sha256=b-mQRUsSZvk4zupYTxxSaOm3rtxfNyOajywZ82x9rmk,1441
@@ -29,28 +29,28 @@ pyfemtet/logger/__init__.py,sha256=lofBrZHr0P1hsxPUiPG1SQqKxCuSBk8zGnR7vUfCHYw,5
 pyfemtet/logger/_impl.py,sha256=uJ9el3kR-A4W2DvO_G5A6k9z2u1lkyl7GSvZ68uPy-U,6321
 pyfemtet/opt/__init__.py,sha256=1LcwTddtoi8plemxkzmX0YEKiNpAZvKn9OoNQysyDLE,339
 pyfemtet/opt/exceptions.py,sha256=M_O7jm20Y4e_QxsKF6tnEl-OrAtErUOj6hNT7eEXCO4,1327
-pyfemtet/opt/femopt.py,sha256=CeejR3bDipPqCJnSx2X3Af2d4oJZlLKcHIXO2TZT9fc,22567
+pyfemtet/opt/femopt.py,sha256=Ufp9qJuJIEtP_lJtR-FeCkGtH_Us8imlJ1c-FVrVyLU,23186
 pyfemtet/opt/history/__init__.py,sha256=pUp3SO4R7RGzmpNDLBg_pQH0X2yzBd-oqsHXWmB33os,201
-pyfemtet/opt/history/_history.py,sha256=AVnWBVJDCBd4EWqG1LNb87OA9a8s2oiixGWv1ZbrUB8,48690
+pyfemtet/opt/history/_history.py,sha256=NwZvZTsWmZhvOZgC-ZqRtHPRaW6OFbXYTXUuDNjmOdQ,49299
 pyfemtet/opt/history/_hypervolume.py,sha256=_IvGH71ZNreWvDQCG815Q2hS1OEvPFPQhUnNXf1UxRQ,4449
 pyfemtet/opt/history/_optimality.py,sha256=6vLySZmrrklr04Qir0hGethTykf8NYFod88NDGrBrG0,2407
 pyfemtet/opt/interface/__init__.py,sha256=D88d0yj-pQNvDij4HI2BG3OPXP5tvc5ZOomd_Jp4UE0,964
 pyfemtet/opt/interface/_base_interface.py,sha256=A1J2junrjsFXUFulYLNhLEdTZgkZS8ev0trYRXtsSWc,6540
 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=zDl-lhveB0OSFe_9rz9fBEj1kziLyKqekPOcyTnzFm0,39735
+pyfemtet/opt/interface/_excel_interface/excel_interface.py,sha256=ihYbw_i3Bcz690AwSxVAPbRK08TVYJwyF66nFs7hMd0,39682
 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=VY6oRCZ4_LWBhCOvumNwSUPMuA94_f1oqpIUbI4zAmo,44710
+pyfemtet/opt/interface/_femtet_interface/femtet_interface.py,sha256=6EZ-7tCTfqj5NHi9G0HbOnmpPq9eYIVlAUrHtO_IiH4,44742
 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=x1drM80W7gbsZMXWh1B2rFotyEPkDbbCQkxVnl12FcI,8359
 pyfemtet/opt/interface/_femtet_with_nx_interface/model1.prt,sha256=cYVw2izr4_9PCPHOpi46XmDVOuNZ5ksuwKqzBtCZfNA,104833
 pyfemtet/opt/interface/_femtet_with_nx_interface/model1.x_t,sha256=BHZJwc9gCCfleIkPMx7hZmNLZ3y6sJamFv6OSsHWhW0,6804
 pyfemtet/opt/interface/_femtet_with_nx_interface/update_model.py,sha256=2U5SJWnG7Tyu6PP_7mtf6dOguNuub8c_1DBRtF0XuT0,3036
 pyfemtet/opt/interface/_femtet_with_solidworks/__init__.py,sha256=5McSpy2uTmJNBylCrKt4xMSq90hlSpqyXYsjwZT3yGA,128
-pyfemtet/opt/interface/_femtet_with_solidworks/femtet_with_solidworks_interface.py,sha256=Wiaho2qwbnAzrpq2t7CPL2ameiexuqhWxvpWMziPsj4,4347
+pyfemtet/opt/interface/_femtet_with_solidworks/femtet_with_solidworks_interface.py,sha256=TVFC9B6qJH61ipV2m8h8xFQWxYNpmqoLsLyosrqgePM,5888
 pyfemtet/opt/interface/_solidworks_interface/__init__.py,sha256=2c52Hfme1xdJepewRGVkPT4yhrZMQgzlCuqvHzEZPVk,95
-pyfemtet/opt/interface/_solidworks_interface/solidworks_interface.py,sha256=qeGsWhw94PfnK_HAKR08mM8mqdJfMlWAWXVE_GLLxSM,7191
+pyfemtet/opt/interface/_solidworks_interface/solidworks_interface.py,sha256=f-DbgD_WymMjJl4tE6XrdRfmZ3RiuTcqrgb8EqhEZ94,8326
 pyfemtet/opt/interface/_surrogate_model_interface/__init__.py,sha256=9sjzQjJsMLdpBSpURyl8x4VQHEO_PGYgAshCHoycAPI,252
 pyfemtet/opt/interface/_surrogate_model_interface/base_surrogate_interface.py,sha256=vdYw8m09e6OCSYPsXUCXqoJcA_lpAOAYuEGmqDNgffM,6276
 pyfemtet/opt/interface/_surrogate_model_interface/botorch_interface.py,sha256=bteAg6nPAIY8M9BoVycYRDtON7p0RLGT_RuPj0JNRtM,10279
@@ -63,17 +63,17 @@ 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=Pt4-fdCffcAYrv4AJ1EpJIdV-vPYJxYirlM-l74AOFQ,30549
+pyfemtet/opt/optimizer/_base_optimizer.py,sha256=zOoh0o0Um2zponfxWxeHx5MV46JrkC9eYC1JmVXbbVE,31685
 pyfemtet/opt/optimizer/optuna_optimizer/__init__.py,sha256=u2Bwc79tkZTU5dMbhzzrPQi0RlFg22UgXc-m9K9G6wQ,242
-pyfemtet/opt/optimizer/optuna_optimizer/_optuna_attribute.py,sha256=cGI2jIqyBadoEC8C3jXFN0tl2tZpRCqu8vRq44Xy1xU,2206
-pyfemtet/opt/optimizer/optuna_optimizer/_optuna_optimizer.py,sha256=kFX_MUW3lWhHloe_26y1rYG6RVGZlwlBQR639d3FlIo,24494
+pyfemtet/opt/optimizer/optuna_optimizer/_optuna_attribute.py,sha256=7eZsruVCGgMlcnf3a9Vf55FOEE-D7V777MJQajI12Cw,1842
+pyfemtet/opt/optimizer/optuna_optimizer/_optuna_optimizer.py,sha256=CAFqKdb12rud6_akWKgxvCifIcG6DjTi5Tt7Cr2OoCs,28919
 pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/__init__.py,sha256=BFbMNvdXqV9kl1h340pW2sq0-cwNFV5dfTo6UnNnX2M,179
 pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/debug-pof-botorch.reccsv,sha256=K6oI9jPi_5yayhBrI9Tm1RX3PoWWKo74TOdqnaPsIy8,1746
 pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/enable_nonlinear_constraint.py,sha256=FY0fIwiFvakEdeQNv13eb1YtTXKzu2lF67HL2Hfs06w,9814
-pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/pof_botorch_sampler.py,sha256=gChJrOCQSQIwvoK-iIf-LDjDNNGKNXyJmWi-bCPQet4,46765
+pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/pof_botorch_sampler.py,sha256=yVQJAD1yJ-Q2aCRuYCCifejjFS0eZmE2IoDTnKQgMko,46822
 pyfemtet/opt/optimizer/optuna_optimizer/wat_ex14_parametric_jp.femprj,sha256=-M54MTNrV7muZWPm9Tjptd6HDdtgUFBsRroC6ytyqa0,180970
 pyfemtet/opt/optimizer/scipy_optimizer/__init__.py,sha256=oXx2JAVLvgz0WwIXAknuV4p2MupaiutYYvjI8hXcFwc,45
-pyfemtet/opt/optimizer/scipy_optimizer/_scipy_optimizer.py,sha256=41GF7eiyEbeYH1RLhybb-JpF9MIr_25UlzPhbbJyBUQ,12026
+pyfemtet/opt/optimizer/scipy_optimizer/_scipy_optimizer.py,sha256=Og4DyD45nOmnBzrRYB8g_KSMyNH6tPNgItT3j7ThyMA,12901
 pyfemtet/opt/prediction/__init__.py,sha256=-XYo-l5YFjExMtqMKj1YUAhmGSQq_0YITS0qizj2Xbs,104
 pyfemtet/opt/prediction/_botorch_utils.py,sha256=KhPLY4JAPC6BDw_NA_KejzMYPCtGh-Yx1dc7PY1tYVA,3985
 pyfemtet/opt/prediction/_gpytorch_modules_extension.py,sha256=B_qUtFn06dQENOmUOObbCpkeASUKI5JpXROx8zYeaq0,5224
@@ -83,7 +83,7 @@ pyfemtet/opt/problem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 pyfemtet/opt/problem/problem.py,sha256=ohdZ450XH4YoFK4T9t52t8BSja6DpFTfMePQM1DdllU,9782
 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=STqRDTnruV_WC-2tOejaIqVSVnoGJvVSo81R2PQBGvA,9818
+pyfemtet/opt/problem/variable_manager/_variable_manager.py,sha256=XrcmFIfE4J_5zkz4Yx6j4QyDAuJX3M2zJ4wESf8oE1Q,12697
 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
@@ -164,9 +164,9 @@ pyfemtet/opt/visualization/plotter/main_figure_creator.py,sha256=9RXz6Wt52MiSz3H
 pyfemtet/opt/visualization/plotter/pm_graph_creator.py,sha256=hUvvYeckMhkE1nH0FAOkXrA5K3A8PbfpxKYaYnBllB4,10864
 pyfemtet/opt/wat_ex14_parametric_jp.femprj,sha256=dMwQMt6yok_PbZLyxPYdmg5wJQwgQDZ4RhS76zdGLGk,177944
 pyfemtet/opt/worker_status.py,sha256=xSVW9lcw5jzYBwnmlVzk-1zCCyvmXVOH6EoRjqVbE9M,3605
-pyfemtet-1.0.0b0.dist-info/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
-pyfemtet-1.0.0b0.dist-info/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
-pyfemtet-1.0.0b0.dist-info/METADATA,sha256=5ACU3bq6vcFxcOBZ5Krvh3VanMyfiAFL0gTfaQgJZck,3473
-pyfemtet-1.0.0b0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pyfemtet-1.0.0b0.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
-pyfemtet-1.0.0b0.dist-info/RECORD,,
+pyfemtet-1.0.1.dist-info/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
+pyfemtet-1.0.1.dist-info/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
+pyfemtet-1.0.1.dist-info/METADATA,sha256=8GuEhflweMHbq3Ap6e5ecnyPMj3eKxMgYxtEq7hegtw,3471
+pyfemtet-1.0.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pyfemtet-1.0.1.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
+pyfemtet-1.0.1.dist-info/RECORD,,