summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test-maths.cpp24
-rw-r--r--test/test-network.cpp189
2 files changed, 98 insertions, 115 deletions
diff --git a/test/test-maths.cpp b/test/test-maths.cpp
index c181686..98a7b1e 100644
--- a/test/test-maths.cpp
+++ b/test/test-maths.cpp
@@ -151,30 +151,6 @@ BOOST_DATA_TEST_CASE(TestCreateArc,
BOOST_CHECK_CLOSE(arc.second, expAngles.second, 1.F);
}
-using FindArcCentreData = std::tuple<glm::vec2, float, glm::vec2, float, glm::vec2, bool>;
-
-BOOST_DATA_TEST_CASE(TestFindArcCentre,
- boost::unit_test::data::make<FindArcCentreData>({
- {{2, 2}, pi, {3, 3}, half_pi, {3, 2}, true},
- {{2, 2}, pi, {1, 3}, -half_pi, {1, 2}, false},
- {{-1100, -1000}, pi, {-900, -800}, half_pi, {-900, -1000}, true},
- {{1100, 1000}, 0, {1050, 900}, pi + 0.92F, {973, 1000}, true},
- {{1050, 900}, 0.92F, {1000, 800}, pi, {1127, 800}, false},
- }),
- startPoint, startEntryAngle, endPoint, endEntryAngle, expCentre, leftRight)
-{
- const auto centre = find_arc_centre(startPoint, startEntryAngle, endPoint, endEntryAngle);
- BOOST_CHECK_CLOSE(expCentre.x, centre.first.x, 1);
- BOOST_CHECK_CLOSE(expCentre.y, centre.first.y, 1);
- BOOST_CHECK_EQUAL(leftRight, centre.second);
-}
-
-BOOST_AUTO_TEST_CASE(TestFindArcsRadius)
-{
- BOOST_CHECK_CLOSE(
- find_arcs_radius(RelativePosition2D {10.32, 26.71}, {0.4, .92}, {2.92, 22.41}, {-0.89, -0.45}), 2.29, 1);
-}
-
namespace {
struct TestLinkStraight : public LinkStraight {
explicit TestLinkStraight(glm::vec3 entryVector) :
diff --git a/test/test-network.cpp b/test/test-network.cpp
index a5e4f75..9a9ceb3 100644
--- a/test/test-network.cpp
+++ b/test/test-network.cpp
@@ -102,21 +102,25 @@ namespace {
struct TestNetwork : public EmptyNetwork {
TestNetwork()
{
- /* 0 1 2
- / -> p000 <-> p100 <-> p200 <-> p300
- / / / \.
- / 3 5 4
- / \ / /
- / --> p110 <------------- */
+ /*
+ * 4--> p110 <---------6-------
+ * / 8 \.
+ * 3 7 5
+ * \ \ /
+ * -> p000 <-0-> p100 <-1-> p200 <-2-> p300 */
+ // 0, 1 and 2 - 3 straight links between 4 nodes
add(nullptr, createChain(nullptr, std::array {P000, P100, P200, P300}));
+ // 3 and 4 - RH biarc from p000 to p110
add(nullptr,
create(nullptr,
{.fromEnd = {.position = P000, .direction = -half_pi},
.toEnd = {.position = P110, .direction = -half_pi}}));
+ // 5 and 6 - LH biarc from p200 to p110
add(nullptr,
create(nullptr,
{.fromEnd = {.position = P200, .direction = half_pi},
.toEnd = {.position = P110, .direction = half_pi}}));
+ // 7 and 8 - RL S biarc from p100 to p110
add(nullptr,
create(nullptr,
{.fromEnd = {.position = P100, .direction = -half_pi},
@@ -182,21 +186,25 @@ BOOST_AUTO_TEST_CASE(NetworkJoins)
// Join 0 <-> 1
BOOST_REQUIRE_EQUAL(links[0]->ends[1].nexts.size(), 2);
BOOST_CHECK_EQUAL(links[0]->ends[1].nexts[0].first.lock().get(), links[1].get());
- BOOST_CHECK_EQUAL(links[0]->ends[1].nexts[0].second, 1);
+ BOOST_CHECK_EQUAL(links[0]->ends[1].nexts[0].second, 0);
BOOST_CHECK_EQUAL(links[0]->ends[1].nexts[1].first.lock().get(), links[7].get());
BOOST_CHECK_EQUAL(links[0]->ends[1].nexts[1].second, 1);
BOOST_REQUIRE_EQUAL(links[1]->ends[0].nexts.size(), 2);
- BOOST_CHECK_EQUAL(links[1]->ends[0].nexts[0].first.lock().get(), links[2].get());
- BOOST_CHECK_EQUAL(links[1]->ends[0].nexts[0].second, 0);
- BOOST_CHECK_EQUAL(links[1]->ends[0].nexts[1].first.lock().get(), links[5].get());
- BOOST_CHECK_EQUAL(links[1]->ends[0].nexts[1].second, 0);
+ BOOST_CHECK_EQUAL(links[1]->ends[0].nexts[0].first.lock().get(), links[0].get());
+ BOOST_CHECK_EQUAL(links[1]->ends[0].nexts[0].second, 1);
+ BOOST_CHECK_EQUAL(links[1]->ends[0].nexts[1].first.lock().get(), links[7].get());
+ BOOST_CHECK_EQUAL(links[1]->ends[0].nexts[1].second, 1);
// Join 1 <-> 2
BOOST_REQUIRE_EQUAL(links[1]->ends[1].nexts.size(), 2);
- BOOST_CHECK_EQUAL(links[1]->ends[1].nexts[0].first.lock().get(), links[0].get());
- BOOST_CHECK_EQUAL(links[1]->ends[1].nexts[0].second, 1);
+ BOOST_CHECK_EQUAL(links[1]->ends[1].nexts[0].first.lock().get(), links[2].get());
+ BOOST_CHECK_EQUAL(links[1]->ends[1].nexts[0].second, 0);
+ BOOST_CHECK_EQUAL(links[1]->ends[1].nexts[1].first.lock().get(), links[5].get());
+ BOOST_CHECK_EQUAL(links[1]->ends[1].nexts[1].second, 0);
BOOST_REQUIRE_EQUAL(links[2]->ends[0].nexts.size(), 2);
BOOST_CHECK_EQUAL(links[2]->ends[0].nexts[0].first.lock().get(), links[1].get());
- BOOST_CHECK_EQUAL(links[2]->ends[0].nexts[0].second, 0);
+ BOOST_CHECK_EQUAL(links[2]->ends[0].nexts[0].second, 1);
+ BOOST_CHECK_EQUAL(links[2]->ends[0].nexts[1].first.lock().get(), links[5].get());
+ BOOST_CHECK_EQUAL(links[2]->ends[0].nexts[1].second, 0);
}
BOOST_DATA_TEST_CASE(RouteToNodeNotInNetwork, INVALID_NODES, dest)
@@ -274,7 +282,10 @@ BOOST_DATA_TEST_CASE(GenCurveDefs,
}),
start, end, startDir, exp)
{
- BOOST_CHECK_EQUAL(genCurveDef(start, end, startDir), exp);
+ const auto defs = genDef(start, end, startDir);
+ BOOST_REQUIRE_EQUAL(defs.size(), 1);
+ BOOST_REQUIRE_EQUAL(defs.front().index(), 1);
+ BOOST_CHECK_EQUAL(std::get<GenCurveDef>(defs.front()), exp);
}
BOOST_AUTO_TEST_CASE(NetworkCreateStraight)
@@ -299,6 +310,54 @@ BOOST_AUTO_TEST_CASE(NetworkCreateStraight)
BOOST_CHECK_EQUAL(nodes.size(), 2);
}
+BOOST_AUTO_TEST_CASE(NetworkCreateExtendingStraight)
+{
+ const auto link = create(nullptr,
+ CreationDefinition {
+ .fromEnd = {.position = {0, 0, 0}, .direction = pi + quarter_pi},
+ .toEnd = {.position = {1000, 1000, 0}, .direction = {}},
+ });
+ BOOST_REQUIRE_EQUAL(link.size(), 1);
+ BOOST_CHECK(links.empty());
+ BOOST_CHECK(nodes.empty());
+
+ BOOST_CHECK_IF(straight, std::dynamic_pointer_cast<TestLinkS>(link.front())) {
+ BOOST_CHECK_CLOSE(straight->length, 1414, 1);
+ BOOST_CHECK_CLOSE_VECI(straight->ends.front().node->pos, GlobalPosition3D(0, 0, 0));
+ BOOST_CHECK_CLOSE(straight->ends.front().dir, quarter_pi - pi, 1);
+ BOOST_CHECK_CLOSE_VECI(straight->ends.back().node->pos, GlobalPosition3D(1000, 1000, 0));
+ BOOST_CHECK_CLOSE(straight->ends.back().dir, quarter_pi, 1);
+ }
+
+ add(nullptr, link.front());
+ BOOST_CHECK_EQUAL(links.size(), 1);
+ BOOST_CHECK_EQUAL(nodes.size(), 2);
+}
+
+BOOST_AUTO_TEST_CASE(NetworkCreateExtendeeStraight)
+{
+ const auto link = create(nullptr,
+ CreationDefinition {
+ .fromEnd = {.position = {0, 0, 0}, .direction = {}},
+ .toEnd = {.position = {1000, 1000, 0}, .direction = quarter_pi},
+ });
+ BOOST_REQUIRE_EQUAL(link.size(), 1);
+ BOOST_CHECK(links.empty());
+ BOOST_CHECK(nodes.empty());
+
+ BOOST_CHECK_IF(straight, std::dynamic_pointer_cast<TestLinkS>(link.front())) {
+ BOOST_CHECK_CLOSE(straight->length, 1414, 1);
+ BOOST_CHECK_CLOSE_VECI(straight->ends.front().node->pos, GlobalPosition3D(1000, 1000, 0));
+ BOOST_CHECK_CLOSE(straight->ends.front().dir, quarter_pi, 1);
+ BOOST_CHECK_CLOSE_VECI(straight->ends.back().node->pos, GlobalPosition3D(0, 0, 0));
+ BOOST_CHECK_CLOSE(straight->ends.back().dir, quarter_pi - pi, 1);
+ }
+
+ add(nullptr, link.front());
+ BOOST_CHECK_EQUAL(links.size(), 1);
+ BOOST_CHECK_EQUAL(nodes.size(), 2);
+}
+
BOOST_AUTO_TEST_CASE(NetworkCreateExtendingCurve)
{
const auto link = create(nullptr,
@@ -393,24 +452,41 @@ BOOST_AUTO_TEST_CASE(NetworkCreateBiarcPair)
BOOST_CHECK_EQUAL(link.back()->ends.back().nexts.front().first.lock(), link.front());
}
-BOOST_AUTO_TEST_CASE(NetworkCreateBiarcPairEqTan)
+BOOST_AUTO_TEST_CASE(NetworkCreateBiarcPairEqTanLH)
{
- // This could be achieved with a single curve, but not there yet
+ // Creates a biarc pair and then merges them into a single curve
const auto link = create(nullptr,
CreationDefinition {
- .fromEnd = {.position = {0, 0, 0}, .direction = 0},
- .toEnd = {.position = {1000, 0, 0}, .direction = 0},
+ .fromEnd = {.position = {1000, 0, 0}, .direction = 0},
+ .toEnd = {.position = {0, 0, 0}, .direction = 0},
});
- BOOST_REQUIRE_EQUAL(link.size(), 2);
+ BOOST_REQUIRE_EQUAL(link.size(), 1);
BOOST_CHECK(links.empty());
BOOST_CHECK(nodes.empty());
BOOST_CHECK_IF(firstCurve, std::dynamic_pointer_cast<TestLinkC>(link.front())) {
+ BOOST_CHECK_CLOSE_VECI(firstCurve->ends.front().node->pos, GlobalPosition3D(1000, 0, 0));
+ BOOST_CHECK_CLOSE_VECI(firstCurve->ends.back().node->pos, GlobalPosition3D(0, 0, 0));
BOOST_CHECK_CLOSE_VECI(firstCurve->centreBase, GlobalPosition3D(500, 0, 0));
}
+}
- BOOST_CHECK_IF(secondCurve, std::dynamic_pointer_cast<TestLinkC>(link.back())) {
- BOOST_CHECK_CLOSE_VECI(secondCurve->centreBase, GlobalPosition3D(500, 0, 0));
+BOOST_AUTO_TEST_CASE(NetworkCreateBiarcPairEqTanRH)
+{
+ // Creates a biarc pair and then merges them into a single curve
+ const auto link = create(nullptr,
+ CreationDefinition {
+ .fromEnd = {.position = {0, 0, 0}, .direction = 0},
+ .toEnd = {.position = {1000, 0, 0}, .direction = 0},
+ });
+ BOOST_REQUIRE_EQUAL(link.size(), 1);
+ BOOST_CHECK(links.empty());
+ BOOST_CHECK(nodes.empty());
+
+ BOOST_CHECK_IF(firstCurve, std::dynamic_pointer_cast<TestLinkC>(link.front())) {
+ BOOST_CHECK_CLOSE_VECI(firstCurve->ends.front().node->pos, GlobalPosition3D(1000, 0, 0));
+ BOOST_CHECK_CLOSE_VECI(firstCurve->ends.back().node->pos, GlobalPosition3D(0, 0, 0));
+ BOOST_CHECK_CLOSE_VECI(firstCurve->centreBase, GlobalPosition3D(500, 0, 0));
}
}
@@ -436,72 +512,3 @@ BOOST_AUTO_TEST_CASE(NetworkCreateBiarcPairEqTanPerp)
}
BOOST_AUTO_TEST_SUITE_END()
-
-BOOST_FIXTURE_TEST_CASE(TestRailNetwork, RailLinks)
-{
- // 0 1 2
- // --p000 <-> p100 <-> p200 <-> p300 \ x
- // / ?----- \ x
- // / / \ |
- // | / 4 /
- // 3 p110 \ /
- // \ | \ /
- // \ / ------/
- // --------
- auto link0 = addLinksBetween(P000, P100);
- BOOST_CHECK(dynamic_cast<RailLinkStraight *>(link0.get()));
- BOOST_CHECK_EQUAL(link0->length, ::distance(P000, P100));
- BOOST_CHECK_CLOSE(link0->ends[0].dir, half_pi, 0.1F);
- BOOST_CHECK_CLOSE(link0->ends[1].dir, -half_pi, 0.1F);
- BOOST_CHECK(link0->ends[0].nexts.empty());
- BOOST_CHECK(link0->ends[1].nexts.empty());
-
- auto link1 = addLinksBetween(P200, P100);
- BOOST_CHECK(dynamic_cast<RailLinkStraight *>(link1.get()));
- BOOST_CHECK_EQUAL(link1->length, ::distance(P200, P100));
- BOOST_CHECK_CLOSE(link1->ends[0].dir, half_pi, 0.1F);
- BOOST_CHECK_CLOSE(link1->ends[1].dir, -half_pi, 0.1F);
- BOOST_CHECK(link0->ends[0].nexts.empty());
- BOOST_CHECK_EQUAL(link0->ends[1].nexts.at(0).first.lock(), link1);
- BOOST_CHECK_EQUAL(link0->ends[1].nexts.at(0).second, 0);
- BOOST_CHECK_EQUAL(link1->ends[0].nexts.at(0).first.lock(), link0);
- BOOST_CHECK_EQUAL(link1->ends[0].nexts.at(0).second, 1);
- BOOST_CHECK(link1->ends[1].nexts.empty());
-
- auto link2 = addLinksBetween(P200, P300);
- BOOST_CHECK(dynamic_cast<RailLinkStraight *>(link2.get()));
- BOOST_CHECK_EQUAL(link2->length, ::distance(P200, P300));
- BOOST_CHECK_CLOSE(link2->ends[0].dir, half_pi, 0.1F);
- BOOST_CHECK_CLOSE(link2->ends[1].dir, -half_pi, 0.1F);
- BOOST_CHECK(link0->ends[0].nexts.empty());
- BOOST_CHECK_EQUAL(link1->ends[1].nexts.at(0).first.lock(), link2);
- BOOST_CHECK_EQUAL(link1->ends[1].nexts.at(0).second, 0);
- BOOST_CHECK_EQUAL(link2->ends[0].nexts.at(0).first.lock(), link1);
- BOOST_CHECK_EQUAL(link2->ends[0].nexts.at(0).second, 1);
- BOOST_CHECK(link2->ends[1].nexts.empty());
-
- BOOST_CHECK_IF(link3, addLinksBetween(P000, P110)) {
- BOOST_CHECK_IF(link3c, dynamic_cast<RailLinkCurve *>(link3.get())) {
- BOOST_CHECK_CLOSE(link3c->radius, 10'300.F, 0.1F);
- BOOST_CHECK_CLOSE(link3c->arc.length(), pi + half_pi, 0.5F);
- BOOST_CHECK_CLOSE(link3->length, 48'563.F, 0.1F);
- BOOST_CHECK_CLOSE(link3->ends[0].dir, -half_pi, 0.5F);
- BOOST_CHECK_CLOSE(link3->ends[1].dir, -0.0097F, 0.5F);
- BOOST_CHECK_EQUAL(link0->ends[0].nexts.at(0).first.lock(), link3);
- BOOST_CHECK_EQUAL(link0->ends[0].nexts.at(0).second, 0);
- BOOST_CHECK_EQUAL(link3->ends[0].nexts.at(0).first.lock(), link0);
- BOOST_CHECK_EQUAL(link3->ends[0].nexts.at(0).second, 0);
- BOOST_CHECK(link3->ends[1].nexts.empty());
- }
- }
-
- BOOST_CHECK_IF(link4, addLinksBetween(P110, P300)) {
- BOOST_CHECK_IF(link4c, dynamic_cast<RailLinkCurve *>(link4.get())) {
- BOOST_CHECK_CLOSE(link4c->radius, 6950.F, 0.1F);
- BOOST_CHECK_CLOSE(link4c->arc.length(), 4.456F, 0.1F);
- BOOST_CHECK_CLOSE(link4->length, 30'981.F, 0.1F);
- BOOST_CHECK_BETWEEN(link4->ends[0].dir, .25F, .26F);
- BOOST_CHECK_CLOSE(link4->ends[1].dir, half_pi, 0.1F);
- }
- }
-}
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-14 20:42:40 +0000