Skip to content

Commit 25ddd61

Browse files
committed
Clean up
1 parent bcd45cf commit 25ddd61

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed

src/mip/HighsCliqueTable.cpp

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1788,6 +1788,34 @@ void HighsCliqueTable::separateCliques(const HighsMipSolver& mipsolver,
17881788
}
17891789
}
17901790

1791+
std::vector<std::vector<HighsCliqueTable::CliqueVar>>
1792+
HighsCliqueTable::separateCliques(const std::vector<double>& sol,
1793+
const HighsDomain& globaldom,
1794+
double feastol) {
1795+
exit(0);
1796+
#if 0
1797+
BronKerboschData data(sol);
1798+
data.feastol = feastol;
1799+
1800+
HighsInt numcols = globaldom.col_lower_.size();
1801+
assert(int(numcliquesvar.size()) == 2 * numcols);
1802+
for (HighsInt i = 0; i != numcols; ++i) {
1803+
if (colsubstituted[i]) continue;
1804+
1805+
if (numcliquesvar[CliqueVar(i, 0).index()] != 0 &&
1806+
CliqueVar(i, 0).weight(sol) > feastol)
1807+
data.P.emplace_back(i, 0);
1808+
if (numcliquesvar[CliqueVar(i, 1).index()] != 0 &&
1809+
CliqueVar(i, 1).weight(sol) > feastol)
1810+
data.P.emplace_back(i, 1);
1811+
}
1812+
1813+
bronKerboschRecurse(data, data.P.size(), nullptr, 0);
1814+
1815+
return std::move(data.cliques);
1816+
#endif
1817+
}
1818+
17911819
std::vector<std::vector<HighsCliqueTable::CliqueVar>>
17921820
HighsCliqueTable::computeMaximalCliques(const std::vector<CliqueVar>& vars,
17931821
double feastol) {

src/mip/HighsCliqueTable.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,10 @@ class HighsCliqueTable {
278278
const std::vector<double>& sol, HighsCutPool& cutpool,
279279
double feastol);
280280

281+
std::vector<std::vector<CliqueVar>> separateCliques(
282+
const std::vector<double>& sol, const HighsDomain& globaldom,
283+
double feastol);
284+
281285
std::vector<std::vector<CliqueVar>> computeMaximalCliques(
282286
const std::vector<CliqueVar>& vars, double feastol);
283287

0 commit comments

Comments
 (0)