Skip to content

Commit

Permalink
- Code cleanup on linearProgramming
Browse files Browse the repository at this point in the history
  • Loading branch information
rperrot committed Apr 19, 2016
1 parent 9991189 commit b952cf9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/openMVG/linearProgramming/bisectionLP.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ bool BisectionLP(
double gammaLow = 0.0, // lower bound
double eps = 1e-8, // precision that stop dichotomy
const int maxIteration = 20, // max number of iteration
double * bestFeasibleGamma = NULL, // value of best bisection found value
double * bestFeasibleGamma = nullptr , // value of best bisection found value
bool bVerbose = false)
{
int k = 0;
Expand Down
8 changes: 4 additions & 4 deletions src/openMVG/linearProgramming/linearProgrammingMOSEK.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ public :
// Inherited functions :
//--

bool setup(const LP_Constraints & constraints);
bool setup(const LP_Constraints_Sparse & constraints);
bool setup(const LP_Constraints & constraints) override ;
bool setup(const LP_Constraints_Sparse & constraints) override ;

bool solve();
bool solve() override ;

bool getSolution(std::vector<double> & estimatedParams);
bool getSolution(std::vector<double> & estimatedParams) override ;

private :
//MSKenv_t env;
Expand Down
6 changes: 3 additions & 3 deletions src/openMVG/linearProgramming/linearProgrammingOSI_X.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ public :
// Inherited functions :
//--

bool setup(const LP_Constraints & constraints);
bool setup(const LP_Constraints_Sparse & constraints);
bool setup(const LP_Constraints & constraints) override;
bool setup(const LP_Constraints_Sparse & constraints) override ;

bool solve();
bool solve() override ;

bool getSolution(std::vector<double> & estimatedParams);

Expand Down

0 comments on commit b952cf9

Please sign in to comment.