Profile: improve profiling code

pypesto/profile/options.py

@@ -44,13 +44,13 @@ def __init__(
  self,
  default_step_size: float = 0.01,
  min_step_size: float = 0.001,
- max_step_size: float = 1.0,
+ max_step_size: float = 0.1,
  step_size_factor: float = 1.25,
  delta_ratio_max: float = 0.1,
  ratio_min: float = 0.145,
  reg_points: int = 10,
  reg_order: int = 4,
- magic_factor_obj_value: float = 0.5,
+ magic_factor_obj_value: float = 1.5,
  whole_path: bool = False,
  ):
  super().__init__()
@@ -112,5 +112,5 @@ def validate(self):
  if self.default_step_size < self.min_step_size:
  raise ValueError("default_step_size must be >= min_step_size.")
 
- if self.magic_factor_obj_value < 0 or self.magic_factor_obj_value >= 1:
- raise ValueError("magic_factor_obj_value must be >= 0 and < 1.")
+ if self.magic_factor_obj_value < 1:
+ raise ValueError("magic_factor_obj_value must be > 1.")

pypesto/profile/profile.py

@@ -24,7 +24,7 @@ def parameter_profile(
  profile_index: Iterable[int] = None,
  profile_list: int = None,
  result_index: int = 0,
- next_guess_method: Union[Callable, str] = "adaptive_step_regression",
+ next_guess_method: Union[Callable, str] = "adaptive_step_order_1",
  profile_options: ProfileOptions = None,
  progress_bar: bool = None,
  filename: Union[str, Callable, None] = None,
@@ -104,6 +104,8 @@ def create_next_guess(
  current_profile_,
  problem_,
  global_opt_,
+ min_step_increase_factor_,
+ max_step_reduce_factor_,
  ):
  return next_guess(
  x,
@@ -114,6 +116,8 @@ def create_next_guess(
  current_profile_,
  problem_,
  global_opt_,
+ min_step_increase_factor_,
+ max_step_reduce_factor_,
  )
 
  elif callable(next_guess_method):