Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check that all the settings are actually available. #52

Merged
merged 2 commits into from
May 14, 2020
Merged

Check that all the settings are actually available. #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e7284b
Check that all the settings are actually available.
S-Dafarra Feb 6, 2020
6e1e14e
Bumped patch version.
S-Dafarra Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
cmake_minimum_required(VERSION 3.5)

project(OsqpEigen
VERSION 0.6.101)
VERSION 0.6.102)

# ouptut paths
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}")
Expand Down
6 changes: 6 additions & 0 deletions include/OsqpEigen/Settings.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,12 @@ namespace OsqpEigen
*/
void setWarmStart(const bool warmStart);

/**
* Set the maximum number of seconds allowed to solve the problem.
* @param timeLimit is the time limit in seconds. If 0, then disabled.
*/
void setTimeLimit(const double timeLimit);

/**
* Get a pointer to Settings struct.
* @return a const pointer to OSQPSettings struct.
Expand Down
58 changes: 58 additions & 0 deletions src/Settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
*/

#include <OsqpEigen/Settings.hpp>
#include <iostream>

template <typename... Args> inline void unused(Args&&...) {}
S-Dafarra marked this conversation as resolved.
Show resolved Hide resolved

OsqpEigen::Settings::Settings()
{
Expand Down Expand Up @@ -40,22 +43,47 @@ void OsqpEigen::Settings::setScaling(const int scaling)

void OsqpEigen::Settings::setAdaptiveRho(const bool isRhoStepSizeAdactive)
{
# if EMBEDDED != 1
m_settings->adaptive_rho = (c_int)isRhoStepSizeAdactive;
# else
std::cerr<< "[OsqpEigen::Settings::setAdaptiveRho] OSPQ has been set to EMBEDDED, hence this setting is disabled." << std::endl;
unused(isRhoStepSizeAdactive);
# endif
}

void OsqpEigen::Settings::setAdaptiveRhoInterval(const int rhoInterval)
{
# if EMBEDDED != 1
m_settings->adaptive_rho_interval = (c_int)rhoInterval;
# else
std::cerr<< "[OsqpEigen::Settings::setAdaptiveRhoInterval] OSPQ has been set to EMBEDDED, hence this setting is disabled." << std::endl;
unused(rhoInterval);
# endif
}

void OsqpEigen::Settings::setAdaptiveRhoTolerance(const double adaptiveRhoTolerance)
{
# if EMBEDDED != 1
m_settings->adaptive_rho_tolerance = (c_float)adaptiveRhoTolerance;
# else
std::cerr<< "[OsqpEigen::Settings::setAdaptiveRhoTolerance] OSPQ has been set to EMBEDDED, hence this setting is disabled." << std::endl;
unused(adaptiveRhoTolerance);
# endif
}

void OsqpEigen::Settings::setAdaptiveRhoFraction(const double adaptiveRhoFraction)
{
# if EMBEDDED != 1
# ifdef PROFILING
m_settings->adaptive_rho_fraction = (c_float)adaptiveRhoFraction;
# else
std::cerr<< "[OsqpEigen::Settings::setAdaptiveRhoFraction] OSPQ has been set without PROFILING, hence this setting is disabled." << std::endl;
unused(adaptiveRhoFraction);
# endif //ifdef PROFILING
# else //# if EMBEDDED != 1
std::cerr<< "[OsqpEigen::Settings::setAdaptiveRhoFraction] OSPQ has been set to EMBEDDED, hence this setting is disabled." << std::endl;
unused(adaptiveRhoFraction);
# endif //# if EMBEDDED != 1
}
void OsqpEigen::Settings::setMaxIteraction(const int maxIteration)
{
Expand Down Expand Up @@ -94,22 +122,42 @@ void OsqpEigen::Settings::setLinearSystemSolver(const int linsysSolver)

void OsqpEigen::Settings::setDelta(const double delta)
{
# ifndef EMBEDDED
m_settings->delta = (c_float)delta;
# else
std::cerr<< "[OsqpEigen::Settings::setDelta] OSPQ has been set to EMBEDDED, hence this setting is disabled." << std::endl;
unused(delta);
# endif
}

void OsqpEigen::Settings::setPolish(const bool polish)
{
# ifndef EMBEDDED
m_settings->polish = (c_int)polish;
# else
std::cerr<< "[OsqpEigen::Settings::setPolish] OSPQ has been set to EMBEDDED, hence this setting is disabled." << std::endl;
unused(polish);
# endif
}

void OsqpEigen::Settings::setPolishRefineIter(const int polishRefineIter)
{
# ifndef EMBEDDED
m_settings->polish_refine_iter = (c_int)polishRefineIter;
# else
std::cerr<< "[OsqpEigen::Settings::setPolishRefineIter] OSPQ has been set to EMBEDDED, hence this setting is disabled." << std::endl;
unused(polishRefineIter);
# endif
}

void OsqpEigen::Settings::setVerbosity(const bool isVerbose)
{
#ifndef EMBEDDED
m_settings->verbose = (c_int)isVerbose;
#else
std::cerr<< "[OsqpEigen::Settings::setVerbosity] OSPQ has been set to EMBEDDED, hence this setting is disabled." << std::endl;
unused(isVerbose);
#endif
}

void OsqpEigen::Settings::setScaledTerimination(const bool scaledTermination)
Expand All @@ -127,6 +175,16 @@ void OsqpEigen::Settings::setWarmStart(const bool warmStart)
m_settings->warm_start = (c_int)warmStart;
}

void OsqpEigen::Settings::setTimeLimit(const double timeLimit)
{
# ifdef PROFILING
m_settings->time_limit = (c_float)timeLimit;
# else
std::cerr<< "[OsqpEigen::Settings::setTimeLimit] OSPQ has been set without PROFILING, hence this setting is disabled." << std::endl;
unused(timeLimit);
# endif
}

OSQPSettings* const & OsqpEigen::Settings::getSettings() const
{
return m_settings;
Expand Down