diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Auxiliaries.dyn_o b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Auxiliaries.dyn_o index e187ca4..fd5c787 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Auxiliaries.dyn_o and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Auxiliaries.dyn_o differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Auxiliaries.o b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Auxiliaries.o index 86d4eab..2f087db 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Auxiliaries.o and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Auxiliaries.o differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.dyn_hi b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.dyn_hi index 1a5d656..1df8944 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.dyn_hi and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.dyn_hi differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.dyn_o b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.dyn_o index 1cc50cb..878dc0c 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.dyn_o and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.dyn_o differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.hi b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.hi index ce9acb0..1aec51e 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.hi and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.hi differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.o b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.o index 7e59261..0aab953 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.o and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Huffman.o differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Paths_huffman.dyn_o b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Paths_huffman.dyn_o index a0296b2..4c8fa65 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Paths_huffman.dyn_o and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Paths_huffman.dyn_o differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Paths_huffman.o b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Paths_huffman.o index a6822d2..48226da 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Paths_huffman.o and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/Paths_huffman.o differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe index c0504f5..19065d8 100755 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe-tmp/Main.hi b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe-tmp/Main.hi index 299d17a..74d6841 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe-tmp/Main.hi and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe-tmp/Main.hi differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe-tmp/Main.o b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe-tmp/Main.o index 7418615..69e66bc 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe-tmp/Main.o and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe-tmp/Main.o differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe-tmp/Paths_huffman.o b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe-tmp/Paths_huffman.o index e08aafc..0eb98b1 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe-tmp/Paths_huffman.o and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/huffman-exe-tmp/Paths_huffman.o differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-5hb8DvQH04kAhx22YvzXdK-ghc9.4.7.so b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-5hb8DvQH04kAhx22YvzXdK-ghc9.4.7.so new file mode 100755 index 0000000..caa6d02 Binary files /dev/null and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-5hb8DvQH04kAhx22YvzXdK-ghc9.4.7.so differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-5hb8DvQH04kAhx22YvzXdK.a b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-5hb8DvQH04kAhx22YvzXdK.a new file mode 100644 index 0000000..55ac747 Binary files /dev/null and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-5hb8DvQH04kAhx22YvzXdK.a differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt-ghc9.4.7.so b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt-ghc9.4.7.so index bf6b246..9552af9 100755 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt-ghc9.4.7.so and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt-ghc9.4.7.so differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt.a b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt.a index 5fea785..92d0420 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt.a and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt.a differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/unit-tests/unit-tests b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/unit-tests/unit-tests index 96051fc..0f615f0 100755 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/unit-tests/unit-tests and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/unit-tests/unit-tests differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/unit-tests/unit-tests-tmp/Main.hi b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/unit-tests/unit-tests-tmp/Main.hi index fc1ed3c..1edd788 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/unit-tests/unit-tests-tmp/Main.hi and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/unit-tests/unit-tests-tmp/Main.hi differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/unit-tests/unit-tests-tmp/Main.o b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/unit-tests/unit-tests-tmp/Main.o index da62e59..229e0ed 100644 Binary files a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/unit-tests/unit-tests-tmp/Main.o and b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/unit-tests/unit-tests-tmp/Main.o differ diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/stack-build-caches/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/exe-huffman-exe b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/stack-build-caches/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/exe-huffman-exe index e0e7c4f..ff71c60 100644 --- a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/stack-build-caches/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/exe-huffman-exe +++ b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/stack-build-caches/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/exe-huffman-exe @@ -5,7 +5,7 @@ ? /home/a/Documents/Repositories/Anwendungsentwicklung_Haskell/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/build/huffman-exe/autogen/cabal_macros.h : hash: 5c589f29d12e441a25182925543712cdca33bb844ebce29bafe987697bb2b9b1 /home/a/Documents/Repositories/Anwendungsentwicklung_Haskell/Aufgabe_6/code/exe/Main.hs: - hash: bc321c5e6dea106198eca53ccb8e31b17746ac198c7de206483c2989e73b1fd0 + hash: cf1567e91a414e222d1367991772f86ee6c1e99c676b68448f0fa6cb0d72c644 /home/a/Documents/Repositories/Anwendungsentwicklung_Haskell/Aufgabe_6/code/huffman.cabal: hash: 0f828acaf94c12587e96d013bb3f48a4c4abac1e2efe6cce31dbffe48864d1f2 /home/a/Documents/Repositories/Anwendungsentwicklung_Haskell/Aufgabe_6/code/package.yaml: diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/stack-build-caches/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/lib b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/stack-build-caches/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/lib index e334d46..cfb5c95 100644 --- a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/stack-build-caches/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/lib +++ b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/stack-build-caches/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/lib @@ -11,6 +11,6 @@ /home/a/Documents/Repositories/Anwendungsentwicklung_Haskell/Aufgabe_6/code/src/Auxiliaries.hs: hash: 5a404af397ad51d6d268ac0a318157dd9511d113c3fbfce35cc238d42974425f /home/a/Documents/Repositories/Anwendungsentwicklung_Haskell/Aufgabe_6/code/src/Huffman.hs: - hash: c379eba92ecb90bbd210add96734d89b196535d973d68cbdb8f9c7195284211f + hash: fcfb7f6cab0bc26c8b2258916aa5caa36930d88be23b19270856417be6e93942 /usr/include/stdc-predef.h: hash: d6bcc58441a423bbb3a52171fcd3b84d8b36e332a55221a1c3e6e899bc43ccb3 diff --git a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/stack-build-caches/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/test-unit-tests b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/stack-build-caches/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/test-unit-tests index 5f7653f..f4e1611 100644 --- a/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/stack-build-caches/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/test-unit-tests +++ b/Aufgabe_6/code/.stack-work/dist/x86_64-linux/ghc-9.4.7/stack-build-caches/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/test-unit-tests @@ -9,6 +9,6 @@ /home/a/Documents/Repositories/Anwendungsentwicklung_Haskell/Aufgabe_6/code/package.yaml: hash: e9fcddf7857388c0e51188152e25a1d446e2e46628ed45552bdc3b635472171c /home/a/Documents/Repositories/Anwendungsentwicklung_Haskell/Aufgabe_6/code/test/Tests.hs: - hash: d146588effdec1312dbcdc1609a1293ad40f1b8f14cea6b19181cbfa13e499cc + hash: 95a1810395f150adb8f70b92eed6390ce6624481a185ab1b481856e22a1e1400 /usr/include/stdc-predef.h: hash: d6bcc58441a423bbb3a52171fcd3b84d8b36e332a55221a1c3e6e899bc43ccb3 diff --git a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/bin/huffman-exe b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/bin/huffman-exe index 0ce75b1..d94b4fe 100755 Binary files a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/bin/huffman-exe and b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/bin/huffman-exe differ diff --git a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Auxiliaries.dyn_hi b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Auxiliaries.dyn_hi new file mode 100644 index 0000000..25439f4 Binary files /dev/null and b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Auxiliaries.dyn_hi differ diff --git a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Auxiliaries.hi b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Auxiliaries.hi new file mode 100644 index 0000000..a626e61 Binary files /dev/null and b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Auxiliaries.hi differ diff --git a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Huffman.dyn_hi b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Huffman.dyn_hi new file mode 100644 index 0000000..6d7207f Binary files /dev/null and b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Huffman.dyn_hi differ diff --git a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Huffman.hi b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Huffman.hi new file mode 100644 index 0000000..0db16e3 Binary files /dev/null and b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Huffman.hi differ diff --git a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Paths_huffman.dyn_hi b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Paths_huffman.dyn_hi new file mode 100644 index 0000000..bb8d640 Binary files /dev/null and b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Paths_huffman.dyn_hi differ diff --git a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Paths_huffman.hi b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Paths_huffman.hi new file mode 100644 index 0000000..6854c4b Binary files /dev/null and b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/Paths_huffman.hi differ diff --git a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/libHShuffman-0.1-5hb8DvQH04kAhx22YvzXdK.a b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/libHShuffman-0.1-5hb8DvQH04kAhx22YvzXdK.a new file mode 100644 index 0000000..57b41d1 Binary files /dev/null and b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-5hb8DvQH04kAhx22YvzXdK/libHShuffman-0.1-5hb8DvQH04kAhx22YvzXdK.a differ diff --git a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-FYSjga9JLF2kZjOZ6zeLt/Huffman.dyn_hi b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-FYSjga9JLF2kZjOZ6zeLt/Huffman.dyn_hi index 1a5d656..1df8944 100644 Binary files a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-FYSjga9JLF2kZjOZ6zeLt/Huffman.dyn_hi and b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-FYSjga9JLF2kZjOZ6zeLt/Huffman.dyn_hi differ diff --git a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-FYSjga9JLF2kZjOZ6zeLt/Huffman.hi b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-FYSjga9JLF2kZjOZ6zeLt/Huffman.hi index ce9acb0..1aec51e 100644 Binary files a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-FYSjga9JLF2kZjOZ6zeLt/Huffman.hi and b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-FYSjga9JLF2kZjOZ6zeLt/Huffman.hi differ diff --git a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-FYSjga9JLF2kZjOZ6zeLt/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt.a b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-FYSjga9JLF2kZjOZ6zeLt/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt.a index e66114b..264544a 100644 Binary files a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-FYSjga9JLF2kZjOZ6zeLt/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt.a and b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/huffman-0.1-FYSjga9JLF2kZjOZ6zeLt/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt.a differ diff --git a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/libHShuffman-0.1-5hb8DvQH04kAhx22YvzXdK-ghc9.4.7.so b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/libHShuffman-0.1-5hb8DvQH04kAhx22YvzXdK-ghc9.4.7.so new file mode 100755 index 0000000..4f9198b Binary files /dev/null and b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/libHShuffman-0.1-5hb8DvQH04kAhx22YvzXdK-ghc9.4.7.so differ diff --git a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt-ghc9.4.7.so b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt-ghc9.4.7.so index e5ee25c..3332769 100755 Binary files a/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt-ghc9.4.7.so and b/Aufgabe_6/code/.stack-work/install/x86_64-linux/fd8ac145ead3a583cca317bafb4c9c6398f22e51e51cd57da906cdb1a7b27beb/9.4.7/lib/x86_64-linux-ghc-9.4.7/libHShuffman-0.1-FYSjga9JLF2kZjOZ6zeLt-ghc9.4.7.so differ diff --git a/Aufgabe_6/code/.stack-work/stack.sqlite3 b/Aufgabe_6/code/.stack-work/stack.sqlite3 index 994b656..2c63242 100644 Binary files a/Aufgabe_6/code/.stack-work/stack.sqlite3 and b/Aufgabe_6/code/.stack-work/stack.sqlite3 differ diff --git a/Aufgabe_6/code/Aaron.comp b/Aufgabe_6/code/Aaron.comp deleted file mode 100644 index ccee939..0000000 Binary files a/Aufgabe_6/code/Aaron.comp and /dev/null differ diff --git a/Aufgabe_6/code/Aaron.txt b/Aufgabe_6/code/Aaron.txt deleted file mode 100644 index f32d818..0000000 --- a/Aufgabe_6/code/Aaron.txt +++ /dev/null @@ -1,9 +0,0 @@ -Aaron Adrian -Aaron Adrian -Aaron Adrian -Aaron Adrian -Aaron Adrian -Aaron Adrian -Aaron Adrian -Aaron Adrian -Aaron Adrian \ No newline at end of file diff --git a/Aufgabe_6/code/exe/Main.hs b/Aufgabe_6/code/exe/Main.hs index 48e8483..b00ff97 100755 --- a/Aufgabe_6/code/exe/Main.hs +++ b/Aufgabe_6/code/exe/Main.hs @@ -1,6 +1,12 @@ module Main where --- import Huffman +import System.Environment ( getArgs ) +import Data.List (isSuffixOf) +import Huffman main :: IO () -main = pure () +main = do + [input,output] <- getArgs + if ".comp" `isSuffixOf` output + then encodeFile input output + else decodeFile input output \ No newline at end of file diff --git a/Aufgabe_6/code/hitchhiker.comp b/Aufgabe_6/code/hitchhiker.comp deleted file mode 100644 index 46819e9..0000000 Binary files a/Aufgabe_6/code/hitchhiker.comp and /dev/null differ diff --git a/Aufgabe_6/code/src/Huffman.hs b/Aufgabe_6/code/src/Huffman.hs index ea0e03f..cae29fb 100755 --- a/Aufgabe_6/code/src/Huffman.hs +++ b/Aufgabe_6/code/src/Huffman.hs @@ -5,7 +5,7 @@ import Auxiliaries ( Bit (..), FileContent (FileContent, fc_codingTable, fc_cont import Data.Maybe (fromMaybe) import Data.Char (toUpper) import qualified Data.IntMap.Strict as IntMap -import System.IO +import System.IO ( hGetContents, hPutStr, withFile, IOMode(WriteMode, ReadMode) ) type IntMap = IntMap.IntMap type Map = Map.Map @@ -237,15 +237,15 @@ treeAAABC = Root (Inner (Inner (Leaf 'C' 1) (Leaf 'B' 1) 2) (Leaf 'A' 3) 5) ----------------------------------------------------------------------- toDecodeTree :: CodingTable -> HTree -toDecodeTree table = foldl1 mergeTrees $ map (uncurry partTree) (Map.toList table) +toDecodeTree table = foldl1 mergeTrees (map (\(char, bitCode) -> partTree char bitCode) (Map.toList table)) partTree :: Char -> [Bit] -> HTree partTree char bits = case bits of [] -> Root (Leaf char 0) - (x:rest) -> - let next = partTree char rest in - case x of + (bit:rest) -> + let next = partTree char rest + in case bit of Zero -> Root (Inner (getNode next) (Leaf 'e' 1) 0) One -> Root (Inner (Leaf 'e' 1) (getNode next) 0) @@ -291,4 +291,14 @@ decodeFile input output = do in do withFile output WriteMode (\handle -> do hPutStr handle decodedString) bitlistToList :: Bitlist -> [Bit] -bitlistToList (Bitlist bits) = bits \ No newline at end of file +bitlistToList (Bitlist bits) = bits + +----------------------------------------------------------------------- +-- Aufgabe 9 +----------------------------------------------------------------------- +-- siehe Tests.hs + +----------------------------------------------------------------------- +-- Aufgabe 10 +----------------------------------------------------------------------- +-- siehe Main.hs \ No newline at end of file diff --git a/Aufgabe_6/code/test.txt b/Aufgabe_6/code/test.txt new file mode 100644 index 0000000..6453d55 --- /dev/null +++ b/Aufgabe_6/code/test.txt @@ -0,0 +1 @@ +Test text for excercise 9. \ No newline at end of file diff --git a/Aufgabe_6/code/test/Tests.hs b/Aufgabe_6/code/test/Tests.hs index d9a6812..5591aaa 100755 --- a/Aufgabe_6/code/test/Tests.hs +++ b/Aufgabe_6/code/test/Tests.hs @@ -5,6 +5,7 @@ import qualified Data.Map.Strict as Map import Huffman import Test.HUnit import Auxiliaries (Bit (..)) +import System.IO ( hGetContents, withFile, IOMode(ReadMode) ) type CodingTable = Map.Map Char [Bit] @@ -48,9 +49,14 @@ test_toFromWord8 :: IO () test_toFromWord8 = pure () test_encodeDecodeFile :: IO () -test_encodeDecodeFile = pure() --do - --_ <- encodeFile "hitchhiker.txt" "hitchhiker.comp" --- decodeFile "hitchhiker.comp" "hitchhiker2.txt" +test_encodeDecodeFile = do + _ <- encodeFile "test.txt" "test.comp" + _ <- decodeFile "test.comp" "test2.txt" + withFile "test.txt" ReadMode $ \handle -> do + inputContent <- hGetContents handle + withFile "test2.txt" ReadMode $ \handle -> do + outputContent <- hGetContents handle + assertEqual "test encodeDecodeFile" True (inputContent == outputContent) allTests :: Test allTests =