always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use snake case in knapsack_solver

Browse Source
This commit is contained in:
Laurent Perron
2023-07-01 06:08:49 +02:00
parent c22933c1b9
commit 91c1adc3e1
5 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ortools/algorithms/samples/BUILD.bazel
View File

@@ -13,17 +13,12 @@
load(
":code_samples.bzl",
"code_sample_cc",
"code_sample_cc_py",
"code_sample_java",
"code_sample_py",
)
code_sample_cc(name = "knapsack")
code_sample_cc_py(name = "knapsack")
code_sample_py(name = "knapsack")
code_sample_cc(name = "simple_knapsack_program")
code_sample_py(name = "simple_knapsack_program")
code_sample_cc_py(name = "simple_knapsack_program")
code_sample_java(name = "Knapsack")

6
ortools/algorithms/samples/knapsack.py
View File

@@ -139,8 +139,8 @@ def main():
# [END data]
# [START solve]
solver.Init(values, weights, capacities)
computed_value = solver.Solve()
solver.init(values, weights, capacities)
computed_value = solver.solve()
# [END solve]
# [START print_solution]
@@ -149,7 +149,7 @@ def main():
total_weight = 0
print("Total value =", computed_value)
for i in range(len(values)):
if solver.BestSolutionContains(i):
if solver.best_solution_contains(i):
packed_items.append(i)
packed_weights.append(weights[0][i])
total_weight += weights[0][i]

6
ortools/algorithms/samples/simple_knapsack_program.py
View File

@@ -56,13 +56,13 @@ def main():
# [END data]
# [START solve]
solver.Init(values, weights, capacities)
computed_value = solver.Solve()
solver.init(values, weights, capacities)
computed_value = solver.solve()
# [END solve]
# [START print_solution]
packed_items = [
x for x in range(0, len(weights[0])) if solver.BestSolutionContains(x)
x for x in range(0, len(weights[0])) if solver.best_solution_contains(x)
]
packed_weights = [weights[0][i] for i in packed_items]