enhancement (#803)

nikolasvargas · poyea · commit c47c1ab03ce8 · 2019-05-16T19:20:42.000+08:00
diff --git a/compression/huffman.py b/compression/huffman.py
@@ -18,7 +18,7 @@ def __init__(self, freq, left, right):
 
 
 def parse_file(file_path):
- """ 
+ """
 Read the file and build a dict of all letters and their
 frequences, then convert the dict into a list of Letters.
 """
@@ -29,15 +29,10 @@ def parse_file(file_path):
 if not c:
 break
 chars[c] = chars[c] + 1 if c in chars.keys() else 1
- letters = []
- for char, freq in chars.items():
- letter = Letter(char, freq)
- letters.append(letter)
- letters.sort(key=lambda l: l.freq)
- return letters
+ return sorted([Letter(c, f) for c, f in chars.items()], key=lambda l: l.freq)
 
 def build_tree(letters):
- """ 
+ """
 Run through the list of Letters and build the min heap
 for the Huffman Tree.
 """
@@ -51,7 +46,7 @@ def build_tree(letters):
 return letters[0]
 
 def traverse_tree(root, bitstring):
- """ 
+ """
 Recursively traverse the Huffman Tree to set each
 Letter's bitstring, and return the list of Letters
 """
@@ -64,9 +59,9 @@ def traverse_tree(root, bitstring):
 return letters
 
 def huffman(file_path):
- """ 
+ """
 Parse the file, build the tree, then run through the file
- again, using the list of Letters to find and print out the 
+ again, using the list of Letters to find and print out the
 bitstring for each letter.
 """
 letters_list = parse_file(file_path)

-Original file line number
+Diff line change
 defparse_file(file_path):
 -"""
 +"""
  Read the file and build a dict of all letters and their
  frequences, then convert the dict into a list of Letters.
  """
 ifnotc:
 break
 chars[c] =chars[c] +1ifcinchars.keys() else1
 -letters= []
 -forchar, freqinchars.items():
 -letter=Letter(char, freq)
 -letters.append(letter)
 -letters.sort(key=lambdal: l.freq)
 -returnletters
 +returnsorted([Letter(c, f) forc, finchars.items()], key=lambdal: l.freq)
 defbuild_tree(letters):
 -"""
 +"""
  Run through the list of Letters and build the min heap
  for the Huffman Tree.
  """
 returnletters[0]
 deftraverse_tree(root, bitstring):
 -"""
 +"""
  Recursively traverse the Huffman Tree to set each
  Letter's bitstring, and return the list of Letters
  """
 returnletters
 defhuffman(file_path):
 -"""
 +"""
  Parse the file, build the tree, then run through the file
 - again, using the list of Letters to find and print out the
 + again, using the list of Letters to find and print out the
  bitstring for each letter.
  """
 letters_list=parse_file(file_path)