Commit 66450a47 authored by Martin Marinov's avatar Martin Marinov

Fixed IPOPTSolver,cc which was not merged correctly from VCI

parent 62630f66
...@@ -12,6 +12,7 @@ SET(my_headers ...@@ -12,6 +12,7 @@ SET(my_headers
${CMAKE_CURRENT_SOURCE_DIR}/FiniteElementProblem.hh ${CMAKE_CURRENT_SOURCE_DIR}/FiniteElementProblem.hh
${CMAKE_CURRENT_SOURCE_DIR}/GurobiHelper.hh ${CMAKE_CURRENT_SOURCE_DIR}/GurobiHelper.hh
${CMAKE_CURRENT_SOURCE_DIR}/GUROBISolver.hh ${CMAKE_CURRENT_SOURCE_DIR}/GUROBISolver.hh
${CMAKE_CURRENT_SOURCE_DIR}/IPOPTSolver.hh
${CMAKE_CURRENT_SOURCE_DIR}/IPOPTSolverLean.hh ${CMAKE_CURRENT_SOURCE_DIR}/IPOPTSolverLean.hh
${CMAKE_CURRENT_SOURCE_DIR}/LeastSquaresProblem.hh ${CMAKE_CURRENT_SOURCE_DIR}/LeastSquaresProblem.hh
${CMAKE_CURRENT_SOURCE_DIR}/LinearConstraint.hh ${CMAKE_CURRENT_SOURCE_DIR}/LinearConstraint.hh
...@@ -58,6 +59,7 @@ SET(my_sources ...@@ -58,6 +59,7 @@ SET(my_sources
${CMAKE_CURRENT_SOURCE_DIR}/FiniteElementProblem.cc ${CMAKE_CURRENT_SOURCE_DIR}/FiniteElementProblem.cc
${CMAKE_CURRENT_SOURCE_DIR}/GurobiHelper.cc ${CMAKE_CURRENT_SOURCE_DIR}/GurobiHelper.cc
${CMAKE_CURRENT_SOURCE_DIR}/GUROBISolver.cc ${CMAKE_CURRENT_SOURCE_DIR}/GUROBISolver.cc
${CMAKE_CURRENT_SOURCE_DIR}/IPOPTSolver.cc
${CMAKE_CURRENT_SOURCE_DIR}/IPOPTSolverLean.cc ${CMAKE_CURRENT_SOURCE_DIR}/IPOPTSolverLean.cc
${CMAKE_CURRENT_SOURCE_DIR}/LeastSquaresProblem.cc ${CMAKE_CURRENT_SOURCE_DIR}/LeastSquaresProblem.cc
${CMAKE_CURRENT_SOURCE_DIR}/LinearConstraint.cc ${CMAKE_CURRENT_SOURCE_DIR}/LinearConstraint.cc
......
This diff is collapsed.
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "IPOPTSolverLean.hh" #include "IPOPTSolverLean.hh"
#include "NProblemGmmInterface.hh" #include "NProblemGmmInterface.hh"
#include "NProblemInterface.hh" #include "NProblemInterface.hh"
#include "NProblemIPOPT.hh"
#include "NConstraintInterface.hh" #include "NConstraintInterface.hh"
#include "BoundConstraint.hh" #include "BoundConstraint.hh"
#include "CoMISo/Utils/CoMISoError.hh" #include "CoMISo/Utils/CoMISoError.hh"
...@@ -321,6 +320,6 @@ private: ...@@ -321,6 +320,6 @@ private:
//============================================================================= //=============================================================================
#endif // COMISO_IPOPTLEAN_AVAILABLE #endif // COMISO_IPOPTLEAN_AVAILABLE
//============================================================================= //=============================================================================
#endif // ACG_IPOPTSOLVER_HH defined #endif // COMISO_NPROBLEMIPOPT_HH
//============================================================================= //=============================================================================
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment