Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion resolve/hykkt/permutation/Permutation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ namespace ReSolve
double Control[AMD_CONTROL], Info[AMD_INFO];

amd_defaults(Control);
amd_control(Control);

int result = amd_order(n_hes_, hes_i_, hes_j_, perm_, Control, Info);

Expand Down
6 changes: 5 additions & 1 deletion tests/unit/hykkt/HykktSolverTests.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <resolve/matrix/Csr.hpp>
#include <resolve/matrix/MatrixHandler.hpp>
#include <resolve/matrix/io.hpp>
#include <resolve/utilities/logger/Logger.hpp>
#include <resolve/vector/VectorHandler.hpp>
#include <tests/unit/TestBase.hpp>

Expand Down Expand Up @@ -214,12 +215,15 @@ namespace ReSolve
status *= validateResult(zero_rhs_error, tol);

// Check that the solver raises an error when trying to change J_d
// from nonempty to empty.
// from nonempty to empty.
matrix::Csr* J_d_empty = new matrix::Csr(J_d->getNumRows(),
J_d->getNumColumns(),
0);

io::Logger::Verbosity saved_verbosity = io::Logger::verbosity();
io::Logger::setVerbosity(io::Logger::NONE); //The error is expected, so mute the logger before triggering it.
int structure_status = hykktSolver.setMatrixBlocks(H, D_s_reuse, J, J_d_empty);
io::Logger::setVerbosity(saved_verbosity);
status *= (structure_status != 0);

// Exercise initialization and reuse with an empty J_d.
Expand Down