From 198f8f53898c2ebee770f45ecb8f0b429c406639 Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Thu, 17 Sep 2020 15:22:59 +0200 Subject: [PATCH] clearer naming of cost variables --- core/test/test_cost_terms.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/test/test_cost_terms.cpp b/core/test/test_cost_terms.cpp index 95fbcfd3..ee62f0c8 100644 --- a/core/test/test_cost_terms.cpp +++ b/core/test/test_cost_terms.cpp @@ -242,14 +242,14 @@ TEST(CostTerm, PassThroughUsesCost) { Standalone container(robot); auto stage{ std::make_unique() }; - auto constant_stage{ std::make_shared(84.0) }; - stage->setCostTerm(constant_stage); + auto constant{ std::make_shared(84.0) }; + stage->setCostTerm(constant); container.computeWithStages({ std::move(stage) }); auto& wrapped{ dynamic_cast(*container.solutions().front()) }; - EXPECT_EQ(wrapped.cost(), constant_stage->cost) << "PassThrough forwards children's cost"; - EXPECT_EQ(wrapped.wrapped()->cost(), constant_stage->cost) << "Child cost equals PassThrough cost"; + EXPECT_EQ(wrapped.cost(), constant->cost) << "PassThrough forwards children's cost"; + EXPECT_EQ(wrapped.wrapped()->cost(), constant->cost) << "Child cost equals PassThrough cost"; } TEST(CostTerm, PassThroughOverwritesCost) { @@ -258,16 +258,16 @@ TEST(CostTerm, PassThroughOverwritesCost) { Standalone container(robot); auto stage{ std::make_unique() }; - auto constant_stage{ std::make_shared(84.0) }; - stage->setCostTerm(constant_stage); + auto constant_inner{ std::make_shared(84.0) }; + stage->setCostTerm(constant_inner); - auto constant_passthrough{ std::make_shared(72.0) }; - container.setCostTerm(constant_passthrough); + auto constant_outer{ std::make_shared(72.0) }; + container.setCostTerm(constant_outer); container.computeWithStages({ std::move(stage) }); auto& wrapped{ dynamic_cast(*container.solutions().front()) }; - EXPECT_EQ(wrapped.cost(), constant_passthrough->cost) << "PassThrough can apply custom cost"; - EXPECT_EQ(wrapped.wrapped()->cost(), constant_stage->cost) << "child's cost is not affected"; + EXPECT_EQ(wrapped.cost(), constant_outer->cost) << "PassThrough can apply custom cost"; + EXPECT_EQ(wrapped.wrapped()->cost(), constant_inner->cost) << "child's cost is not affected"; } TEST(CostTerm, PassThroughCanModifyCost) {