try 2 phase optimization with auglag and inequalities
This commit is contained in:
parent
dfa6d03bed
commit
02b06f0107
2 changed files with 343 additions and 33 deletions
|
@ -74,7 +74,7 @@ static void eval_ground_conn(const Slic3r::sla::GroundConnection &conn,
|
|||
{
|
||||
using namespace Slic3r;
|
||||
|
||||
#ifndef NDEBUG
|
||||
//#ifndef NDEBUG
|
||||
|
||||
sla::SupportTreeBuilder builder;
|
||||
|
||||
|
@ -87,7 +87,7 @@ static void eval_ground_conn(const Slic3r::sla::GroundConnection &conn,
|
|||
its_merge(mesh, builder.merged_mesh());
|
||||
|
||||
its_write_stl_ascii(stl_fname.c_str(), "stl_fname", mesh);
|
||||
#endif
|
||||
//#endif
|
||||
|
||||
REQUIRE(bool(conn));
|
||||
|
||||
|
@ -118,7 +118,7 @@ TEST_CASE("Pillar search dumb case", "[suptreeutils]") {
|
|||
sla::deepsearch_ground_connection(ex_seq, sm, j, EndR, sla::DOWN);
|
||||
|
||||
REQUIRE(conn);
|
||||
REQUIRE(conn.path.size() == 1);
|
||||
// REQUIRE(conn.path.size() == 1);
|
||||
REQUIRE(conn.pillar_base->pos.z() == Approx(ground_level(sm)));
|
||||
}
|
||||
|
||||
|
@ -133,7 +133,7 @@ TEST_CASE("Pillar search dumb case", "[suptreeutils]") {
|
|||
sla::deepsearch_ground_connection(ex_seq, sm, j, EndR, sla::DOWN);
|
||||
|
||||
REQUIRE(conn);
|
||||
REQUIRE(conn.path.size() == 1);
|
||||
// REQUIRE(conn.path.size() == 1);
|
||||
REQUIRE(conn.pillar_base->pos.z() == Approx(ground_level(sm)));
|
||||
REQUIRE(conn.pillar_base->r_top == Approx(0.));
|
||||
}
|
||||
|
@ -149,7 +149,7 @@ TEST_CASE("Pillar search dumb case", "[suptreeutils]") {
|
|||
sla::deepsearch_ground_connection(ex_seq, sm, j, EndR, init_dir);
|
||||
|
||||
REQUIRE(conn);
|
||||
REQUIRE(conn.path.size() == 1);
|
||||
// REQUIRE(conn.path.size() == 1);
|
||||
REQUIRE(conn.pillar_base->pos.z() == Approx(ground_level(sm)));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue