From 92ebf246475a2048fe1b145d2002acacf8601c80 Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Wed, 7 Dec 2022 13:22:53 +0100 Subject: [PATCH] set_node_supply -> set_node_supplies in python min cost flow --- ortools/graph/python/min_cost_flow.cc | 2 +- ortools/graph/samples/balance_min_flow.py | 1 - ortools/graph/samples/simple_min_cost_flow_program.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ortools/graph/python/min_cost_flow.cc b/ortools/graph/python/min_cost_flow.cc index b9dfcd1624..18e4efb463 100644 --- a/ortools/graph/python/min_cost_flow.cc +++ b/ortools/graph/python/min_cost_flow.cc @@ -32,7 +32,7 @@ PYBIND11_MODULE(min_cost_flow, m) { pybind11::vectorize(&SimpleMinCostFlow::AddArcWithCapacityAndUnitCost)); smcf.def("set_node_supply", &SimpleMinCostFlow::SetNodeSupply, arg("node"), arg("supply")); - smcf.def("set_nodes_supply", + smcf.def("set_nodes_supplies", pybind11::vectorize(&SimpleMinCostFlow::SetNodeSupply)); smcf.def("num_nodes", &SimpleMinCostFlow::NumNodes); smcf.def("num_arcs", &SimpleMinCostFlow::NumArcs); diff --git a/ortools/graph/samples/balance_min_flow.py b/ortools/graph/samples/balance_min_flow.py index 87f4d64c50..57b924377c 100755 --- a/ortools/graph/samples/balance_min_flow.py +++ b/ortools/graph/samples/balance_min_flow.py @@ -70,7 +70,6 @@ def main(): # [START print_solution] if status == smcf.OPTIMAL: - smcf.solve() print('Total cost = ', smcf.optimal_cost()) print() for arc in range(smcf.num_arcs()): diff --git a/ortools/graph/samples/simple_min_cost_flow_program.py b/ortools/graph/samples/simple_min_cost_flow_program.py index ae77a1d9eb..7c7d067b48 100755 --- a/ortools/graph/samples/simple_min_cost_flow_program.py +++ b/ortools/graph/samples/simple_min_cost_flow_program.py @@ -47,7 +47,7 @@ def main(): start_nodes, end_nodes, capacities, unit_costs) # Add supply for each nodes. - smcf.set_nodes_supply(np.arange(0, len(supplies)), supplies) + smcf.set_nodes_supplies(np.arange(0, len(supplies)), supplies) # [END constraints] # [START solve]