diff --git a/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByAlphabet.java b/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByAlphabet.java index 8df2c3db620a15c25060d053bffdeb68fe750d50..ce6f074692b2b925c28a32155d7c8e587eb651af 100644 --- a/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByAlphabet.java +++ b/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByAlphabet.java @@ -6,17 +6,17 @@ public class TestDisplayWordOccurrencesByAlphabet { public static void main(String[] args) { WordsManager man = new WordsManager(new HashSet<String>()); - man.addWord("test1"); - man.addWord("test2"); man.addWord("test3"); man.addWord("test4"); + man.addWord("test1"); + man.addWord("test2"); man.addWord("test2"); man.addWord("test2"); man.addWord("test3"); man.addWord("test4"); man.displayWordOccurrencesByAlphabet(); - man.displayWordOccurrencesByAlphabet(); +// man.displayWordOccurrencesByAlphabet(); } diff --git a/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByCount.java b/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByCount.java new file mode 100644 index 0000000000000000000000000000000000000000..9e8eb00cfcef5ca99f705424c5071047513faedb --- /dev/null +++ b/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByCount.java @@ -0,0 +1,38 @@ +package tp10.exo2; + +import java.util.HashSet; + +public class TestDisplayWordOccurrencesByCount { + + public static void main(String[] args) { + WordsManager man = new WordsManager(new HashSet<String>()); + man.addWord("test3"); + man.addWord("test4"); + man.addWord("test1"); + man.addWord("test2"); + man.addWord("test2"); + man.addWord("test2"); + man.addWord("test3"); + man.addWord("test4"); + man.addWord("test3"); + man.addWord("test4"); + man.addWord("test1"); + man.addWord("test2"); + man.addWord("test2"); + man.addWord("test2"); + man.addWord("test3"); + man.addWord("test4"); + man.addWord("test3"); + man.addWord("test4"); + man.addWord("test1"); + man.addWord("test2"); + man.addWord("test2"); + man.addWord("test2"); + man.addWord("test3"); + man.addWord("test4"); + man.addWord("test1"); + + man.displayWordOccurrencesByCount(); + } + +} diff --git a/CCI_Java/CCI_Java/src/tp10/exo2/WordsManager.java b/CCI_Java/CCI_Java/src/tp10/exo2/WordsManager.java index 68db29c72ce29a9c4fed3f04eb785fb696e24704..871cd2d797c54bf0916a6c7deffabdbbb7f3bec3 100644 --- a/CCI_Java/CCI_Java/src/tp10/exo2/WordsManager.java +++ b/CCI_Java/CCI_Java/src/tp10/exo2/WordsManager.java @@ -40,22 +40,19 @@ public class WordsManager { void displayWordOccurrencesByAlphabet() { List<String> list = new ArrayList<>(this.uniqueWords); - String[] list2 = new String[list.size()]; - int pos = 0; StringComparator comp = new StringComparator(); list.sort(comp); - for (String word : list) { System.out.println(word + " : " + wordOccurrences.get(word)); } } void displayWordOccurrencesByCount() { - List<Map.Entry<String, Integer>> list = new ArrayList<Map.Entry<String, Integer>>(); + List<Map.Entry<String, Integer>> list = new ArrayList<Map.Entry<String, Integer>>(wordOccurrences.entrySet()); ComparatorMapEntry comp = new ComparatorMapEntry(); list.sort(comp); - for (int idx = 0; idx < list.size(); idx++) { - + for (Map.Entry<String, Integer> entry : list) { + System.out.println(entry.getKey() + " : " + entry.getValue()); } }