From 51f38ddeeb58908370f7ab68b168eb878d3bec5f Mon Sep 17 00:00:00 2001
From: Oscar Bauer <oscar.bauer@etu.univ-amu.fr>
Date: Tue, 3 Dec 2024 13:28:58 +0100
Subject: [PATCH] started tp 11 but tp10 not finished
---
.../src/tp10/exo2/ComparatorMapEntry.java | 19 ++++++++++++
.../src/tp10/exo2/StringComparator.java | 13 ++++++++
.../tp10/exo2/TestDisplayWordOccurrences.java | 3 +-
.../TestDisplayWordOccurrencesByAlphabet.java | 23 ++++++++++++++
.../CCI_Java/src/tp10/exo2/WordsManager.java | 31 +++++++++++++++++--
CCI_Java/CCI_Java/src/tp10/exo2/fiddling.java | 27 ++++++++++++++++
CCI_Java/CCI_Java/src/tp11/exo1/Message.java | 5 +++
CCI_Java/CCI_Java/src/tp11/exo1/User.java | 18 +++++++++++
8 files changed, 136 insertions(+), 3 deletions(-)
create mode 100644 CCI_Java/CCI_Java/src/tp10/exo2/ComparatorMapEntry.java
create mode 100644 CCI_Java/CCI_Java/src/tp10/exo2/StringComparator.java
create mode 100644 CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByAlphabet.java
create mode 100644 CCI_Java/CCI_Java/src/tp10/exo2/fiddling.java
create mode 100644 CCI_Java/CCI_Java/src/tp11/exo1/Message.java
create mode 100644 CCI_Java/CCI_Java/src/tp11/exo1/User.java
diff --git a/CCI_Java/CCI_Java/src/tp10/exo2/ComparatorMapEntry.java b/CCI_Java/CCI_Java/src/tp10/exo2/ComparatorMapEntry.java
new file mode 100644
index 0000000..b935792
--- /dev/null
+++ b/CCI_Java/CCI_Java/src/tp10/exo2/ComparatorMapEntry.java
@@ -0,0 +1,19 @@
+package tp10.exo2;
+
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public class ComparatorMapEntry implements Comparator<Map.Entry<String, Integer>> {
+
+ @Override
+ public int compare(Entry<String, Integer> o1, Entry<String, Integer> o2) {
+ // TODO Auto-generated method stub
+ if (o1.getValue() > o2.getValue())
+ return -1;
+ if (o1.getValue() < o2.getValue())
+ return 1;
+ return new StringComparator().compare(o1.getKey(), o2.getKey());
+ }
+
+}
diff --git a/CCI_Java/CCI_Java/src/tp10/exo2/StringComparator.java b/CCI_Java/CCI_Java/src/tp10/exo2/StringComparator.java
new file mode 100644
index 0000000..0f49d8d
--- /dev/null
+++ b/CCI_Java/CCI_Java/src/tp10/exo2/StringComparator.java
@@ -0,0 +1,13 @@
+package tp10.exo2;
+
+import java.util.Comparator;
+
+public class StringComparator implements Comparator<String> {
+
+ @Override
+ public int compare(String o1, String o2) {
+ // TODO Auto-generated method stub
+ return o1.compareTo(o2) > 0 ? 1 : o1.compareTo(o2);
+ }
+
+}
diff --git a/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrences.java b/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrences.java
index b4b656e..ae5f111 100644
--- a/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrences.java
+++ b/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrences.java
@@ -10,13 +10,14 @@ public class TestDisplayWordOccurrences {
man.addWord("test2");
man.addWord("test3");
man.addWord("test4");
- man.addWord("btest2");
+ man.addWord("test2");
man.addWord("test2");
man.addWord("test3");
man.addWord("test4");
man.displayWordOccurrences();
man.displayUniqueWordsByAlphabet();
+ man.displayWordOccurrencesByAlphabet();
}
diff --git a/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByAlphabet.java b/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByAlphabet.java
new file mode 100644
index 0000000..8df2c3d
--- /dev/null
+++ b/CCI_Java/CCI_Java/src/tp10/exo2/TestDisplayWordOccurrencesByAlphabet.java
@@ -0,0 +1,23 @@
+package tp10.exo2;
+
+import java.util.HashSet;
+
+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("test2");
+ man.addWord("test2");
+ man.addWord("test3");
+ man.addWord("test4");
+
+ man.displayWordOccurrencesByAlphabet();
+ man.displayWordOccurrencesByAlphabet();
+
+ }
+
+}
diff --git a/CCI_Java/CCI_Java/src/tp10/exo2/WordsManager.java b/CCI_Java/CCI_Java/src/tp10/exo2/WordsManager.java
index fe20ce9..79862d2 100644
--- a/CCI_Java/CCI_Java/src/tp10/exo2/WordsManager.java
+++ b/CCI_Java/CCI_Java/src/tp10/exo2/WordsManager.java
@@ -5,6 +5,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
public class WordsManager {
@@ -30,14 +31,40 @@ public class WordsManager {
void displayWordOccurrences() {
System.out.println(wordOccurrences);
}
-
+
void displayUniqueWordsByAlphabet() {
List<String> list = new ArrayList<>(this.uniqueWords);
Collections.sort(list);
System.out.println(list);
}
-
+
void displayWordOccurrencesByAlphabet() {
+ List<String> list = new ArrayList<>(this.uniqueWords);
+ String[] list2 = new String[list.size()];
+ int pos = 0;
+ for (String word : list) {
+ for (int idx = 0; idx < list.size(); idx++) {
+
+ if(list.indexOf(word) == idx) {
+ pos += word.compareTo(list.get(idx));
+ }
+ }
+ }
+ System.out.println(list);
+ System.out.println("pos: "+pos);
+// Collections.sort(list);
+//
+// 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>>();
+ StringComparator comp = new StringComparator();
+ for (int idx = 0; idx < list.size(); idx++) {
+
+ }
}
}
diff --git a/CCI_Java/CCI_Java/src/tp10/exo2/fiddling.java b/CCI_Java/CCI_Java/src/tp10/exo2/fiddling.java
new file mode 100644
index 0000000..2764567
--- /dev/null
+++ b/CCI_Java/CCI_Java/src/tp10/exo2/fiddling.java
@@ -0,0 +1,27 @@
+package tp10.exo2;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class fiddling {
+
+ public static void main(String[] args) {
+ String test = "halloa";
+ String test2 = "hallob";
+ String test3 = "hallolc";
+ String test4 = "hallold";
+ List<String> list = new ArrayList<String>();
+ list.add(test);
+ list.add(test4);
+ list.add(test2);
+ list.add(test4);
+ list.add(test3);
+ Collections.sort(list, new StringComparator());
+ int bool = test.compareTo(test2);
+
+
+ System.out.println(list);
+ }
+
+}
diff --git a/CCI_Java/CCI_Java/src/tp11/exo1/Message.java b/CCI_Java/CCI_Java/src/tp11/exo1/Message.java
new file mode 100644
index 0000000..ca35843
--- /dev/null
+++ b/CCI_Java/CCI_Java/src/tp11/exo1/Message.java
@@ -0,0 +1,5 @@
+package tp11.exo1;
+
+public class Message {
+
+}
diff --git a/CCI_Java/CCI_Java/src/tp11/exo1/User.java b/CCI_Java/CCI_Java/src/tp11/exo1/User.java
new file mode 100644
index 0000000..574fd80
--- /dev/null
+++ b/CCI_Java/CCI_Java/src/tp11/exo1/User.java
@@ -0,0 +1,18 @@
+package tp11.exo1;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+public class User {
+
+ private String name;
+ private List<String> messages;
+ private Set<User> followers;
+
+ public User(String name) {
+ this.name = name;
+ this.messages = new ArrayList<String>();
+ this.followers = new
+ }
+}
--
GitLab