Skip to content

Commit

Permalink
Fix trust region params boost serialization
Browse files Browse the repository at this point in the history
  • Loading branch information
Levi-Armstrong committed Jan 16, 2025
1 parent f8f5802 commit 3eb5503
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions trajopt_optimizers/trajopt_sqp/include/trajopt_sqp/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ struct SQPParameters
/** @brief NLP converges if approx_merit_improves is smaller than this */
double min_approx_improve = 1e-4;
/** @brief NLP converges if approx_merit_improve / best_exact_merit < min_approx_improve_frac */
double min_approx_improve_frac = static_cast<double>(-INFINITY);
double min_approx_improve_frac = std::numeric_limits<double>::lowest();
/** @brief Max number of QP calls allowed */
int max_iterations = 50;

Expand All @@ -73,7 +73,7 @@ struct SQPParameters
/** @brief Constraints are scaled by this amount when inflated */
double merit_coeff_increase_ratio = 10;
/** @brief Max time in seconds that the optimizer will run */
double max_time = static_cast<double>(INFINITY);
double max_time = std::numeric_limits<double>::max();
/** @brief Initial coefficient that is used to scale the constraints. The total constaint cost is constaint_value
* coeff * merit_coeff */
double initial_merit_error_coeff = 10;
Expand Down
4 changes: 2 additions & 2 deletions trajopt_sco/include/trajopt_sco/optimizers.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ struct BasicTrustRegionSQPParameters
/** @brief If model improves less than this, exit and report convergence */
double min_approx_improve = 1e-4;
/** @brief If model improves less than this, exit and report convergence */
double min_approx_improve_frac = static_cast<double>(-INFINITY);
double min_approx_improve_frac = std::numeric_limits<double>::lowest();
/** @brief The max number of iterations */
double max_iter = 50;
/** @brief If improvement is less than improve_ratio_threshold, shrink trust region by this ratio */
Expand All @@ -105,7 +105,7 @@ struct BasicTrustRegionSQPParameters
/** @brief Ratio that we increase coeff each time */
double merit_coeff_increase_ratio = 10;
/** @brief Max time in seconds that the optimizer will run */
double max_time = static_cast<double>(INFINITY);
double max_time = std::numeric_limits<double>::max();
/** @brief Initial coefficient that is used to scale the constraints. The total constaint cost is constaint_value *
* coeff * merit_coeff */
double initial_merit_error_coeff = 10;
Expand Down

0 comments on commit 3eb5503

Please sign in to comment.