Add tests for GetNumberOfConstraints()

Author: sebrockm

tsplp/src/MtspModel.cpp

@@ -342,8 +342,7 @@ void tsplp::MtspModel::BranchAndCutSolve(
             auto top = queue.Pop(threadId);
             if (!top.has_value())
             {
-                SPDLOG_INFO(
-                    "{}: thread {} exited because Pop returned nothing..", m_name, threadId);
+                SPDLOG_INFO("{}: thread {} exited because Pop returned nothing.", m_name, threadId);
                 break;
             }
 

tsplp/test/tsplp-test.cpp

@@ -12,6 +12,9 @@ TEST_CASE("3 variables, 3 constraints", "[lp]")
 {
     tsplp::Model model(3);
 
+    REQUIRE(model.GetBinaryVariables().size() == 3);
+    CHECK(model.GetNumberOfConstraints() == 0);
+
     auto x1 = model.GetBinaryVariables()[0];
     auto x2 = model.GetBinaryVariables()[1];
     auto x3 = model.GetBinaryVariables()[2];
@@ -26,20 +29,25 @@ TEST_CASE("3 variables, 3 constraints", "[lp]")
     auto objective = x1 + 4 * x2 + 9 * x3 - 10;
     model.SetObjective(objective);
 
+    CHECK(model.GetNumberOfConstraints() == 0);
+
     auto c1 = x1 + x2 <= 5;
     auto c2 = x1 + x3 >= 10;
     auto c3 = -x2 + x3 == 7;
 
-    std::vector<tsplp::LinearConstraint> constraints { c1, c2, c3 };
+    const std::vector<tsplp::LinearConstraint> constraints { c1, c2, c3 };
 
     model.AddConstraints(constraints.cbegin(), constraints.cend());
 
+    CHECK(model.GetNumberOfConstraints() == 3);
+
     using namespace std::chrono_literals;
     auto status = model.Solve(std::chrono::steady_clock::now() + 10ms);
 
-    REQUIRE(status == tsplp::Status::Optimal);
-    REQUIRE(c1.Evaluate(model));
-    REQUIRE(c2.Evaluate(model));
-    REQUIRE(c3.Evaluate(model));
-    REQUIRE(objective.Evaluate(model) == Approx(44));
+    CHECK(model.GetNumberOfConstraints() == 3);
+    CHECK(status == tsplp::Status::Optimal);
+    CHECK(c1.Evaluate(model));
+    CHECK(c2.Evaluate(model));
+    CHECK(c3.Evaluate(model));
+    CHECK(objective.Evaluate(model) == Approx(44));
 }