Skip to content

Commit fe6d70e

Browse files
committed
routing: fixup model_test.py
1 parent 717be1c commit fe6d70e

File tree

1 file changed

+7
-28
lines changed

1 file changed

+7
-28
lines changed

ortools/routing/python/model_test.py

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,37 +27,18 @@ def Distance(node_i, node_j):
2727

2828

2929
def TransitDistance(manager, i, j):
30-
return Distance(manager.IndexToNode(i), manager.IndexToNode(j))
30+
return Distance(manager.index_to_node(i), manager.index_to_node(j))
3131

3232

3333
def UnaryTransitDistance(manager, i):
34-
return Distance(manager.IndexToNode(i), 0)
34+
return Distance(manager.index_to_node(i), 0)
3535

3636

37-
def One(unused_i, unused_j):
38-
return 1
39-
40-
41-
def Two(unused_i, unused_j):
42-
return 1
43-
44-
45-
def Three(unused_i, unused_j):
46-
return 1
47-
48-
49-
class Callback:
50-
51-
def __init__(self, model):
52-
self.model = model
53-
self.costs = []
54-
55-
def __call__(self):
56-
self.costs.append(self.model.CostVar().Max())
5737

5838
class TestRoutingIndexManager(absltest.TestCase):
5939

6040
def test_create_index_manager(self):
41+
print("test_create_index_manager")
6142
manager = model.RoutingIndexManager(42, 3, 7)
6243
self.assertIsNotNone(manager)
6344
print(manager)
@@ -68,17 +49,15 @@ def test_create_index_manager(self):
6849
self.assertEqual(7, manager.index_to_node(manager.get_start_index(i)))
6950
self.assertEqual(7, manager.index_to_node(manager.get_end_index(i)))
7051

71-
class ModelTest(absltest.TestCase):
7252

73-
def test_create_index_manager(self):
74-
print("test_create_index_manager")
75-
manager = model.RoutingIndexManager(42, 3, 0)
76-
print(manager)
53+
class ModelTest(absltest.TestCase):
7754

7855
def test_create_model(self):
7956
print("test_create_model")
80-
manager = model.RoutingIndexManager(42, 3, 0)
57+
manager = model.RoutingIndexManager(42, 3, 7)
58+
self.assertIsNotNone(manager)
8159
routing_model = model.RoutingModel(manager)
60+
self.assertIsNotNone(routing_model)
8261
print(routing_model)
8362

8463

0 commit comments

Comments
 (0)