Add a program icon, remove debugging classes and methods.

Author: AspireOne

CompressionTest.cs

@@ -9,7 +9,6 @@
 
 namespace HuffmanCompression
 {
-
     public class Compressor
     {
         public static readonly string CompressedFileExtension = ".comp";
@@ -74,26 +73,7 @@ public static string GetCompressionSummary(long originalFileSize, long compresse
             return $"\noriginal size: {originalFileSize} bytes.\nCompressed size: {compressedFileSize} bytes.\nReduced by {percentage}%";
         }
 
-        // Only for debugging purposes.  
-        static void WriteCompressionInfo(string beforeWritingToBytes, byte[] afterWritingToBytes, Dictionary<char, string> dict)
-        {
-            Console.WriteLine("Dictionary:");
-            int j = 0;
-            foreach (var pair in dict)
-                Console.WriteLine(++j + " { '" + (pair.Key == '\n' ? "[new line]" : "" + pair.Key) + "', \"" + pair.Value + "\" },");
-
-            Console.Write("Bits before writing to bytes: ");
-            IOUtils.PrintFirst48Chars(beforeWritingToBytes);
-
-            Console.Write("\nBits after writing to bytes:  ");
-            IOUtils.PrintFirst48Bits(afterWritingToBytes);
-
-            Console.Write($"\nAmount of redundant zeros: {afterWritingToBytes.Length * 8 - beforeWritingToBytes.Length}");
-
-            Console.Write("\n\n\n");
-        }
-
-        static bool CodesAreTooLong(Dictionary<char, string> codes)
+        private static bool CodesAreTooLong(Dictionary<char, string> codes)
         {
             foreach (var pair in codes)
                 if (pair.Value.Length > MaxCodeLength)
@@ -102,7 +82,7 @@ static bool CodesAreTooLong(Dictionary<char, string> codes)
         }
 
         // [1][length][as encoded bits][code] OR [0][code]
-        static string AddTreeInfoAndReplaceCharsWithCode(string text, Dictionary<char, string> dict)
+        private static string AddTreeInfoAndReplaceCharsWithCode(string text, Dictionary<char, string> dict)
         {
             var textCopy = new StringBuilder(text);
             var usedChars = new List<char>();
@@ -140,7 +120,7 @@ static string AddTreeInfoAndReplaceCharsWithCode(string text, Dictionary<char, s
             return textCopy.ToString();
         }
 
-        static string CorrectCodeLength(string codeLength)
+        private static string CorrectCodeLength(string codeLength)
         {
             int difference = AmountOfBitsToRepresentCodeLength - codeLength.Length;
 
@@ -151,7 +131,7 @@ static string CorrectCodeLength(string codeLength)
             return codeLength;
         }
 
-        static byte EncodeCharacter(char character)
+        private static byte EncodeCharacter(char character)
         {
             var bytes = TextEncoding.GetBytes(new char[] { character });
 
@@ -162,15 +142,15 @@ static byte EncodeCharacter(char character)
         }
 
         // Character | the character's representation code.
-        static Dictionary<char, string> CreateCodesDictionary((int occurence, char character)[] occurences)
+        private static Dictionary<char, string> CreateCodesDictionary((int occurence, char character)[] occurences)
         {
             var codes = new Dictionary<char, string>();
             BoxCharacters(occurences).ForEach(x => codes.Add(x.Character, FindCharacterCode(x)));
 
             return codes;
         }
 
-        static string FindCharacterCode(CharacterBox box)
+        private static string FindCharacterCode(CharacterBox box)
         {
             string code = "";
 
@@ -182,8 +162,8 @@ static string FindCharacterCode(CharacterBox box)
             return code.Reverse();
         }
 
-        // Correct.  
-        static List<CharacterBox> BoxCharacters((int occurence, char character)[] occurences)
+        // Correct.
+        private static List<CharacterBox> BoxCharacters((int occurence, char character)[] occurences)
         {
             var CharacterList = new List<CharacterBox>();
             var tree = new List<Box>();
@@ -212,8 +192,8 @@ static List<CharacterBox> BoxCharacters((int occurence, char character)[] occure
             return CharacterList;
         }
 
-        // Correct.  
-        static void InsertAtAppropriatePlace(List<Box> tree, Box boxToInsert)
+        // Correct.
+        private static void InsertAtAppropriatePlace(List<Box> tree, Box boxToInsert)
         {
             if (tree.Count == 0 || boxToInsert.Sum > tree.Last().Sum || (boxToInsert.Sum == tree.Last().Sum && tree.Last().Depth < boxToInsert.Depth))
             {
@@ -235,9 +215,8 @@ static void InsertAtAppropriatePlace(List<Box> tree, Box boxToInsert)
             throw new Exception($"Could not insert box with sum {boxToInsert.Sum} to a tree with count {tree.Count} and highest sum {tree.Last().Sum}.");
         }
 
-
-        // Correct.  
-        static (int occurence, char character)[] GetCharactersOccurence(string text)
+        // Correct.
+        private static (int occurence, char character)[] GetCharactersOccurence(string text)
         {
             var set = new HashSet<(int occurence, char character)>();
             foreach (char ch in text)

Compressor/Compressor.cs

@@ -8,7 +8,7 @@ namespace HuffmanCompression
 {
     internal class Decompressor
     {
-        const char EmptyChar = '\0';
+        private const char EmptyChar = '\0';
 
         public static string Decompress(byte[] compressedAsBytes)
         {
@@ -43,7 +43,7 @@ public static void DecompressFile(string path)
             File.WriteAllText(pathToDecompressedFile, decompressedText);
         }
 
-        static void RemoveBeginningZeros(StringBuilder text)
+        private static void RemoveBeginningZeros(StringBuilder text)
         {
             for (int i = 0; i < IOUtils.BitsInByte; ++i)
                 if (text[i] != '0')
@@ -53,7 +53,7 @@ static void RemoveBeginningZeros(StringBuilder text)
                 }
         }
 
-        static (string code, char character) ExtractInfoCodeNotEncountered(StringBuilder compressed)
+        private static (string code, char character) ExtractInfoCodeNotEncountered(StringBuilder compressed)
         {
             string codeLengthAsBinary = compressed.ToString(0, Compressor.AmountOfBitsToRepresentCodeLength);
             int codeLength = Convert.ToInt32(codeLengthAsBinary, 2);
@@ -69,7 +69,7 @@ static void RemoveBeginningZeros(StringBuilder text)
             return (code, charDecoded);
         }
 
-        static (string code, char character) TryRecognizeCode(StringBuilder bits, Dictionary<string, char> dict)
+        private static (string code, char character) TryRecognizeCode(StringBuilder bits, Dictionary<string, char> dict)
         {
             string unfinishedBits = "";
 

Decompressor/Decompressor.cs

@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{15C28BC2-6294-4BE6-A46C-D075D51EB3CF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>HuffmanTree</RootNamespace>
-    <AssemblyName>HuffmanTree</AssemblyName>
+    <RootNamespace>HuffmanCompression</RootNamespace>
+    <AssemblyName>HuffmanCompression</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -53,6 +53,9 @@
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -64,7 +67,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CompressionTest.cs" />
     <Compile Include="Utils\IOUtils.cs" />
     <Compile Include="Compressor\TooManyCharactersException.cs" />
     <Compile Include="Compressor\TreeElements\Box.cs" />
@@ -91,7 +93,9 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="Resources\icon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

HuffmanCompression.csproj

@@ -6,13 +6,13 @@ namespace HuffmanCompression
 {
     public static class Program
     {
-        static readonly string NoArgumentErrorText = "You have not specified any files to compress/decompress.";
-        static readonly string TooManyCharactersExceptionText = "The specified file has too many characters.";
-        static readonly string UnexpectedErrorText = "There was an unexpected error. Skipping.";
-        static readonly string WaitForKeypressText = "Press any button to close...";
-        static readonly string ProcessDoneText = "Done.";
+        private static readonly string NoArgumentErrorText = "You have not specified any files to compress/decompress.";
+        private static readonly string TooManyCharactersExceptionText = "The specified file has too many characters.";
+        private static readonly string UnexpectedErrorText = "There was an unexpected error. Skipping.";
+        private static readonly string WaitForKeypressText = "Press any button to close...";
+        private static readonly string ProcessDoneText = "Done.";
 
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
             if (!args.Any())
                 Console.WriteLine(NoArgumentErrorText);
@@ -22,13 +22,13 @@ static void Main(string[] args)
             WaitForKeyPress();
         }
 
-        static void WaitForKeyPress()
+        private static void WaitForKeyPress()
         {
             Console.WriteLine(WaitForKeypressText);
             Console.ReadKey();
         }
 
-        static void DoActionsOnFiles(string[] paths)
+        private static void DoActionsOnFiles(string[] paths)
         {
             foreach (string path in paths)
             {