Skip to content

Commit

Permalink
remove unnecessary mc++ includes
Browse files Browse the repository at this point in the history
- only interval.hpp is needed
- no more use of fadbad++ and cpplapack headers
  • Loading branch information
svigerske committed Jun 27, 2023
1 parent 9e947a3 commit 2e5a339
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 9 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,8 @@ include_directories(SYSTEM "${BOOST_DIR}")
include_directories(SYSTEM "${CPPAD_DIR}/include/")
include_directories(SYSTEM "${EIGEN_DIR}")
include_directories(SYSTEM "${MCPP_DIR}/include")
include_directories(SYSTEM "${MCPP_DIR}/3rdparty/cpplapack/include")
include_directories(SYSTEM "${MCPP_DIR}/3rdparty/fadbad++")
#include_directories(SYSTEM "${MCPP_DIR}/3rdparty/cpplapack/include")
#include_directories(SYSTEM "${MCPP_DIR}/3rdparty/fadbad++")
include_directories(SYSTEM "${SPDLOG_DIR}/include")

# Make sure the source file lists are in the correct format
Expand Down
1 change: 0 additions & 1 deletion src/Model/NonlinearExpressions.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

#include "../Utilities.h"

#include "ffunc.hpp"
#include "cppad/cppad.hpp"

#include <memory>
Expand Down
2 changes: 0 additions & 2 deletions src/Model/Terms.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

#include "Variables.h"

#include "ffunc.hpp"

#include <Eigen/Eigenvalues>
#include <vector>

Expand Down
2 changes: 0 additions & 2 deletions src/Model/Variables.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
#include "Variables.h"
#include "Problem.h"

#include "ffunc.hpp"

#include "spdlog/fmt/fmt.h"

#include "../Environment.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Model/Variables.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <ostream>
#include <string>

#include "ffunc.hpp"
#include "interval.hpp"
#include "cppad/cppad.hpp"

namespace SHOT
Expand Down
2 changes: 1 addition & 1 deletion src/Results.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,7 @@ int Results::getNumberOfIterations() { return (iterations.size()); }

double Results::getPrimalBound()
{
if(!isnan(this->currentPrimalBound))
if(!std::isnan(this->currentPrimalBound))
return (this->currentPrimalBound);
else if(env->problem->objectiveFunction->direction == E_ObjectiveFunctionDirection::Minimize)
return (SHOT_DBL_MAX);
Expand Down

0 comments on commit 2e5a339

Please sign in to comment.