Commit f2ad2483 authored by Bryce Hepner's avatar Bryce Hepner

This is the one that should have the change messag

parent d4e64dd5
...@@ -507,37 +507,38 @@ if __name__ == "__main__": ...@@ -507,37 +507,38 @@ if __name__ == "__main__":
scenes = file_extractor(folder_name) scenes = file_extractor(folder_name)
images = image_extractor(scenes) images = image_extractor(scenes)
newnamesforlater = [] newnamesforlater = []
list_dic, bins = make_dictionary(images, 4, False) # list_dic, bins = make_dictionary(images, 4, False)
file_sizes_new = [] file_sizes_new = []
file_sizes_old = [] file_sizes_old = []
# list_dic = np.load("first_dic.npy", allow_pickle="TRUE") list_dic = np.load("first_dic.npy", allow_pickle="TRUE")
bins = [21,32,48] bins = [21,32,48]
np.save("first_dic.npy", list_dic) # np.save("first_dic.npy", list_dic)
for i in range(len(images)): for i in range(len(images)):
image, new_error, diff = huffman(images[i], 4, False) # image, new_error, diff = huffman(images[i], 4, False)
encoded_string = encoder(new_error, list_dic, diff, bins) # encoded_string = encoder(new_error, list_dic, diff, bins)
inletters = bitstring_to_bytes(encoded_string) # inletters = bitstring_to_bytes(encoded_string)
if images[i][-5:] == ".tiff": if images[i][-5:] == ".tiff":
newname = images[i][:-5] newname = images[i][:-5]
else: else:
newname = images[i][:-4] newname = images[i][:-4]
newnamesforlater.append(newname + "_Compressed.txt") newnamesforlater.append(newname + "_Compressed.txt")
with open(newname + "_Compressed.txt", 'wb') as f: # with open(newname + "_Compressed.txt", 'wb') as f:
f.write(inletters) # f.write(inletters)
file_sizes_new.append((os.path.getsize(newname + "_Compressed.txt"))) file_sizes_new.append((os.path.getsize(newname + "_Compressed.txt")))
file_sizes_old.append((os.path.getsize(images[i]))) file_sizes_old.append((os.path.getsize(images[i])))
sleep(5) # sleep(5)
if i % 50 == 0: # if i % 50 == 0:
print(i) # print(i)
sleep(20) # sleep(20)
file_sizes_new.append(os.path.getsize("first_dic.npy")) file_sizes_new.append(os.path.getsize("first_dic.npy"))
print(np.sum(file_sizes_new)/np.sum(file_sizes_old)) print(np.sum(file_sizes_new)/np.sum(file_sizes_old))
list_dic = np.load("first_dic.npy", allow_pickle="TRUE") list_dic = np.load("first_dic.npy", allow_pickle="TRUE")
bins = [21,32,48] bins = [21,32,48]
# starttime = time() # starttime = time()
for i,item in enumerate(newnamesforlater[2:5]): for i,item in enumerate(newnamesforlater[0:5]):
print(item) print(item)
image, new_error, diff = huffman(images[i], 4, False) image, new_error, diff = huffman(images[i], 4, False)
encoded_string2 = bytes_to_bitstring(read_from_file(item)) encoded_string2 = bytes_to_bitstring(read_from_file(item))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment