From 94bae689df01fde64df91412d866e9a883c55562 Mon Sep 17 00:00:00 2001
From: Oscar Bauer <oscar.bauer@etu.univ-amu.fr>
Date: Tue, 3 Dec 2024 15:51:26 +0100
Subject: [PATCH] =?UTF-8?q?tp10=20termin=C3=A9=20et=20les=20deux=20en=20fo?=
=?UTF-8?q?rme=20de=20rendu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../TestDisplayWordOccurrencesByAlphabet.java | 6 +--
.../TestDisplayWordOccurrencesByCount.java | 38 +++++++++++++++++++
.../CCI_Java/src/tp10/exo2/WordsManager.java | 9 ++---
3 files changed, 44 insertions(+), 9 deletions(-)
create mode 100644 CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByCount.java
diff --git a/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByAlphabet.java b/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByAlphabet.java
index 8df2c3d..ce6f074 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 0000000..9e8eb00
--- /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 68db29c..871cd2d 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());
}
}
--
GitLab