Commit 2a4beb5f authored by Max Lyon's avatar Max Lyon
Browse files

Merge branch 'marinom/REFORM-922-merge-new-sanitization' into 'master'

WIP REFORM-922 merge new sanitization

See merge request !55
parents bdd20c88 e12b50c0
Pipeline #15360 passed with stages
in 4 minutes and 22 seconds
Subproject commit 0b2ad0687d773584a80d30b819772b6d8c45f827
Subproject commit 542ced54034b53403410599e0f0c6f842a309cc8
......@@ -447,8 +447,7 @@ endif ()
# enable debug stuff
set (COMISO_ENABLE_DEBUG_OUTPUT TRUE CACHE BOOL "Enable CoMISo Debug Output")
if (COMISO_ENABLE_DEBUG_OUTPUT)
#add_definitions(-DDEB_ON)
target_compile_definitions(CoMISo PRIVATE -DDEB_ON)
target_compile_definitions(CoMISo PUBLIC -DDEB_ON)
endif ()
if (WIN32)
......
......@@ -6,6 +6,5 @@ acg_add_executable (factored_solver ${sources} ${headers} )
set_target_properties(factored_solver PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (factored_solver
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (quadratic_solver ${sources} ${headers} )
set_target_properties(quadratic_solver PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (quadratic_solver
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (small_AQP ${sources} ${headers} )
set_target_properties(small_AQP PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_AQP
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (small_adolc ${sources} ${headers} )
set_target_properties(small_adolc PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_adolc
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -7,6 +7,5 @@ acg_add_executable (small_cplex_soc ${sources} ${headers} )
set_target_properties(small_cplex_soc PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_cplex_soc
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (small_eigenproblem ${sources} ${headers} )
set_target_properties(small_eigenproblem PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_eigenproblem
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (small_exact_constraint_satifaction_example ${sources} ${head
set_target_properties(small_exact_constraint_satifaction_example PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_exact_constraint_satifaction_example
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -30,6 +30,9 @@
#include <vector>
#include <CoMISo/Utils/ExactConstraintSatisfaction.hh>
#include <Base/Debug/DebConfig.hh>
//------------------------------------------------------------------------------------------------------
class SmallNProblem : public COMISO::NProblemInterface
......@@ -120,10 +123,12 @@ int main(void)
std::cout << "---------- 3) Solve with Newton Solver..." << std::endl;
COMISO::NewtonSolver nsolver;
nsolver.set_verbosity(15);
Eigen::SparseMatrix<double> Ad = A.cast<double>();
Eigen::VectorXd bd = b.cast<double>();
nsolver.solve(&problem, Ad, bd);
{
Debug::ScopedOutputLevel output_lvl(0); // disable output for solve method
nsolver.solve(&problem, Ad, bd);
}
std::cout << "---------- 4) Print solution..." << std::endl;
std::cout << std::setprecision(100);
......
......@@ -6,6 +6,5 @@ acg_add_executable (small_factored_solver ${sources} ${headers} )
set_target_properties(small_factored_solver PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_factored_solver
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (small_finite_element ${sources} ${headers} )
set_target_properties(small_finite_element PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_finite_element
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (small_linear_problem ${sources} ${headers} )
set_target_properties(small_linear_problem PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_linear_problem
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (small_miqp ${sources} ${headers} )
set_target_properties(small_miqp PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_miqp
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (small_nleast_squares ${sources} ${headers} )
set_target_properties(small_nleast_squares PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_nleast_squares
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (small_nsolver ${sources} ${headers} )
set_target_properties(small_nsolver PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_nsolver
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (small_quadratic_solver ${sources} ${headers} )
set_target_properties(small_quadratic_solver PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_quadratic_solver
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (small_quadratic_resolve ${sources} ${headers} )
set_target_properties(small_quadratic_resolve PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_quadratic_resolve
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (small_sparseqr ${sources} ${headers} )
set_target_properties(small_sparseqr PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_sparseqr
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
......@@ -6,6 +6,5 @@ acg_add_executable (small_symmetric_dirichlet ${sources} ${headers} )
set_target_properties(small_symmetric_dirichlet PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1)
target_link_libraries (small_symmetric_dirichlet
CoMISo
${COMISO_LINK_LIBRARIES}
CoMISo::CoMISo
)
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