From eb1207f0cbe45f0d200ec1dbe2ca52e4abb1f31d Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Sun, 2 Mar 2025 15:13:37 +0100 Subject: [PATCH] minor --- ortools/sat/parameters_validation.cc | 1 + ortools/sat/routing_cuts_test.cc | 48 ++++++++++++++-------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/ortools/sat/parameters_validation.cc b/ortools/sat/parameters_validation.cc index 4d64b1aaad..4d3125585a 100644 --- a/ortools/sat/parameters_validation.cc +++ b/ortools/sat/parameters_validation.cc @@ -100,6 +100,7 @@ std::string ValidateParameters(const SatParameters& params) { TEST_IN_RANGE(lns_initial_difficulty, 0.0, 1.0); TEST_POSITIVE(at_most_one_max_expansion_size); + TEST_POSITIVE(max_alldiff_domain_size); TEST_NOT_NAN(max_time_in_seconds); TEST_NOT_NAN(max_deterministic_time); diff --git a/ortools/sat/routing_cuts_test.cc b/ortools/sat/routing_cuts_test.cc index feabdae33c..ef4cf142f2 100644 --- a/ortools/sat/routing_cuts_test.cc +++ b/ortools/sat/routing_cuts_test.cc @@ -1217,30 +1217,30 @@ TEST(MaybeFillMissingRoutesConstraintNodeExpressions, EXPECT_EQ(num_routes, 1); EXPECT_EQ(num_dimensions, 1); const ConstraintProto expected_constraint = ParseTestProto(R"pb( - routes { - tails: [ 1, 2, 1, 2 ] - heads: [ 0, 0, 2, 3 ] - literals: [ 0, 1, 2, 3 ] - dimensions { - exprs { - vars: [ 4 ] - coeffs: [ 1 ] - } - exprs { - vars: [ 5 ] - coeffs: [ 1 ] - } - exprs { - vars: [ 6 ] - coeffs: [ 1 ] - } - exprs { - vars: [ 7 ] - coeffs: [ 1 ] - } - } - } - )pb"); + routes { + tails: [ 1, 2, 1, 2 ] + heads: [ 0, 0, 2, 3 ] + literals: [ 0, 1, 2, 3 ] + dimensions { + exprs { + vars: [ 4 ] + coeffs: [ 1 ] + } + exprs { + vars: [ 5 ] + coeffs: [ 1 ] + } + exprs { + vars: [ 6 ] + coeffs: [ 1 ] + } + exprs { + vars: [ 7 ] + coeffs: [ 1 ] + } + } + } + )pb"); EXPECT_THAT(new_cp_model.constraints(0), EqualsProto(expected_constraint)); }