reindent; span

This commit is contained in:
Laurent Perron
2025-06-11 15:03:14 +02:00
parent d3617d58b2
commit e25617bac8
4 changed files with 8 additions and 4 deletions

View File

@@ -240,6 +240,7 @@ cc_test(
"//ortools/base:gmock_main",
"//ortools/util:time_limit",
"@abseil-cpp//absl/base:core_headers",
"@abseil-cpp//absl/types:span",
],
)

View File

@@ -18,6 +18,7 @@
#include <vector>
#include "absl/base/macros.h"
#include "absl/types/span.h"
#include "gtest/gtest.h"
#include "ortools/util/time_limit.h"
@@ -26,8 +27,8 @@ namespace {
const int kInvalidSolution = -1;
bool IsSolutionValid(const std::vector<int64_t>& profits,
const std::vector<std::vector<int64_t> >& weights,
bool IsSolutionValid(absl::Span<const int64_t> profits,
absl::Span<const std::vector<int64_t>> weights,
const std::vector<int64_t>& capacities,
const std::vector<bool>& best_solution,
int64_t optimal_profit) {
@@ -59,7 +60,7 @@ int64_t SolveKnapsackProblemUsingSpecificSolverAndReduction(
std::vector<int64_t> profits(profit_array, profit_array + number_of_items);
std::vector<int64_t> capacities(capacity_array,
capacity_array + number_of_dimensions);
std::vector<std::vector<int64_t> > weights;
std::vector<std::vector<int64_t>> weights;
for (int i = 0; i < number_of_dimensions; ++i) {
const int64_t* one_dimension = weight_array + number_of_items * i;
std::vector<int64_t> weights_one_dimension(one_dimension,
@@ -484,7 +485,7 @@ TEST(KnapsackSolverTest, SolveTwoDimensionsSettingPrimaryPropagator) {
std::vector<int64_t> profits(kProfitArray, kProfitArray + kArraySize);
std::vector<int64_t> capacities(kCapacityArray,
kCapacityArray + kNumberOfDimensions);
std::vector<std::vector<int64_t> > weights;
std::vector<std::vector<int64_t>> weights;
for (int i = 0; i < kNumberOfDimensions; ++i) {
const int64_t* one_dimension = kWeightArray + kArraySize * i;
std::vector<int64_t> weights_one_dimension(one_dimension,

View File

@@ -16,6 +16,7 @@
# [START program]
# [START import]
from ortools.algorithms.python import knapsack_solver
# [END import]

View File

@@ -16,6 +16,7 @@
"""A simple knapsack problem."""
# [START import]
from ortools.algorithms.python import knapsack_solver
# [END import]