diff --git a/huffman_coding/src/huffman_coding/Main.java b/huffman_coding/src/huffman_coding/Main.java index fc1dd87..f8f129d 100644 --- a/huffman_coding/src/huffman_coding/Main.java +++ b/huffman_coding/src/huffman_coding/Main.java @@ -121,11 +121,16 @@ class Util { return sorted; } - // Insert a Tree into an ArrayList of trees already sorted in [0, i], where + // Insert a Tree into an ArrayList of trees already sorted in [0, i), where // 0 <= i <= trees.size(), such that it is sorted through [0, i]. static void insert(ITree tree, ArrayList trees, int i) { +<<<<<<< Updated upstream System.out.println("Set j = 0. While j < " + (i + 1) + ", j++."); for (int j = 0; j < (i + 1); j++) { +======= + for (int j = 0; j < i + 1; j++) { + System.out.println("it's here it's fucking here"); +>>>>>>> Stashed changes if (trees.get(j).lessThan(tree)) { trees.add(j, tree); return; @@ -138,6 +143,7 @@ class Util { // Insert a Tree in an already fully sorted ArrayList of Trees. static void insert(ITree tree, ArrayList sortedTrees) { for (int i = 0; i < sortedTrees.size(); i++) { + System.out.println("h"); if (sortedTrees.get(i).lessThan(tree)) { sortedTrees.add(i, tree); return;