Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite0f1f47

Browse files
committed
Added repr, added add
1 parent2df7535 commite0f1f47

File tree

2 files changed

+41
-15
lines changed

2 files changed

+41
-15
lines changed

‎trees/avl_tree.py‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,23 @@ def __init__(self, value, left, right):
2323
childin [left,right]])
2424

2525
defadd(self,element):
26-
ifelement>self.valueandself.rightisnotNone:
27-
returnAVLTree(self.value,self.left,
28-
self.right.add(element)).balance()
26+
ifelement>self.value:
27+
ifself.rightisnotNone:
28+
returnAVLTree(self.value,self.left,
29+
self.right.add(element)).balance()
2930

30-
elifself.leftisnotNone:
31-
returnAVLTree(self.value,self.left.add(element),
32-
self.right).balance()
31+
else:
32+
returnAVLTree(self.value,self.left,AVLTree(element,None,
33+
None)).balance()
3334

34-
returnAVLTree(element,None,None).balance()
35+
else:
36+
ifself.leftisnotNone:
37+
returnAVLTree(self.value,self.left.add(element),
38+
self.right).balance()
39+
40+
else:
41+
returnAVLTree(self.value,AVLTree(element,None,None),
42+
self.right).balance()
3543

3644
defbalance(self):
3745
returnself
@@ -92,3 +100,7 @@ def __len__(self):
92100

93101
def__cmp__(self,other):
94102
returncmp(self.value,other.value)
103+
104+
def__repr__(self):
105+
return"%s(%s, %r, %r)"% (self.__class__.__name__,
106+
self.value,self.left,self.right)

‎trees/trees_unittests.py‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,21 @@ def test_init_empty(self):
223223
pass
224224

225225
deftest_add(self):
226-
avl=AVLTree(50,AVLTree(17,AVLTree(12,None,None),AVLTree(23,
227-
None,
228-
None)),
229-
AVLTree(72,AVLTree(54,None,None),
230-
AVLTree(76,None,None)))
226+
avl=AVLTree(50,AVLTree(17,None,AVLTree(23,
227+
None,
228+
None)),
229+
AVLTree(72,None,
230+
None))
231+
232+
avl=avl.add(13).add(-1).add(100).add(200).add(300).add(40).add(39)
233+
234+
expected_itered=sorted([50,17,23,72,13,-1,100,200,300,40,
235+
39],reverse=True)
236+
actual_itered=list(avl)
231237

232-
avl.add(4)
238+
printavl
239+
240+
self.assertEqual(actual_itered,expected_itered)
233241

234242
deftest_remove(self):
235243
pass
@@ -262,7 +270,13 @@ def test_str(self):
262270
self.assertEqual(str(avl),"76,72,54,50,23,17,12")
263271

264272
deftest_repr(self):
265-
pass
273+
avl=AVLTree(50,AVLTree(17,AVLTree(12,None,None),AVLTree(23,
274+
None,
275+
None)),
276+
AVLTree(72,AVLTree(54,None,None),
277+
AVLTree(76,None,None)))
278+
279+
self.assertEqual(eval(repr(avl)),avl)
266280

267281
deftest_iter(self):
268282
avl=AVLTree(50,AVLTree(17,AVLTree(12,None,None),AVLTree(23,
@@ -274,7 +288,7 @@ def test_iter(self):
274288
expected_itered= [76,72,54,50,23,17,12]
275289
actual_itered=list(avl)
276290

277-
self.assertTrue(actual_itered,expected_itered)
291+
self.assertEqual(actual_itered,expected_itered)
278292

279293
deftest_cmp(self):
280294
avl1=AVLTree(1,None,None)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp