always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backport from main: sat, graph, lp_data, glop

Browse Source
This commit is contained in:
Laurent Perron
2024-09-13 13:29:25 -07:00
parent ed94162b91
commit 701cc87e1e
51 changed files with 2483 additions and 1217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ortools/sat/diffn_util.cc
View File

@@ -25,6 +25,7 @@
#include <ostream>
#include <sstream>
#include <string>
#include <string_view>
#include <tuple>
#include <utility>
#include <vector>
@@ -1539,7 +1540,8 @@ FindRectanglesResult FindRectanglesWithEnergyConflictMC(
}
std::string RenderDot(std::optional<Rectangle> bb,
absl::Span<const Rectangle> solution) {
absl::Span<const Rectangle> solution,
std::string_view extra_dot_payload) {
const std::vector<std::string> colors = {"red", "green", "blue",
"cyan", "yellow", "purple"};
std::stringstream ss;
@@ -1559,6 +1561,7 @@ std::string RenderDot(std::optional<Rectangle> bb,
<< "!\" shape=box width=" << 2 * solution[i].SizeX()
<< " height=" << 2 * solution[i].SizeY() << "]\n";
}
ss << extra_dot_payload;
ss << "}\n";
return ss.str();
}