Skip to content

Commit 786567d

Browse files
committed
format sth
1 parent 2b5e13f commit 786567d

File tree

4 files changed

+8
-29
lines changed

4 files changed

+8
-29
lines changed

Algorithm/sort/merge/merge-sort.py

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,3 @@ def merge(left, right):
2929
if __name__ == "__main__":
3030
L = [randrange(1000) for _ in range(10)]
3131
print(merge_sort(L))
32-
33-
# Another
34-
from random import randrange
35-
36-
37-
def merge_sort(seq):
38-
mid = len(seq) // 2
39-
lft, rgt = seq[:mid], seq[mid:]
40-
if len(lft) > 1:
41-
lft = merge_sort(lft)
42-
if len(rgt) > 1:
43-
rgt = merge_sort(rgt)
44-
45-
res = []
46-
while lft and rgt:
47-
if lft[-1] >= rgt[-1]: # 取lft和rgt序列中最大的值
48-
res.append(lft.pop())
49-
else:
50-
res.append(rgt.pop())
51-
res.reverse() # 反序一下
52-
return (lft or rgt) + res
53-
54-
55-
if __name__ == '__main__':
56-
seq = [randrange(100) for _ in range(10)]
57-
print(merge_sort(seq))

decorate/decorater_of_class.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# coding=utf-8
2-
32
class Log():
3+
44
def __init__(self, file="info.log"):
55
self.file = file
6+
67
def __call__(self, func):
7-
log = func.__name__ + " was called"
8+
log = func.__name__ + " was called"
89
print(log)
910
with open(self.file, 'a') as f:
10-
f.write(log+'\n')
11+
f.write(log + '\n')
12+
1113

1214
@Log()
1315
def hello():

decorate/decorater_with_para.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from functools import wraps
44

5+
56
def logs(file="info.log"):
67
def decorate(func):
78
@wraps(func)

decorate/decorater_without_para.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from functools import wraps
44

5+
56
def log(func):
67
@wraps(func)
78
def wrapper(*args, **kw):
@@ -10,6 +11,7 @@ def wrapper(*args, **kw):
1011
return result
1112
return wrapper
1213

14+
1315
@log
1416
def hello():
1517
print('Hello everybody')

0 commit comments

Comments
 (0)