Studium
/
Java_2
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kleine Änderungen

This commit is contained in:
Johannes Theiner 2018-05-31 09:45:43 +02:00
parent d3459a5077
commit 2dd8cc4f39
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/de/joethei/hs/java2/praktikum/praktikum4/KlausurenServer.java
View File

@ -48,35 +48,17 @@ public class KlausurenServer {
ConcurrentMap<String, TreeSet<Integer>> set = new ConcurrentHashMap<>(data); ConcurrentMap<String, TreeSet<Integer>> set = new ConcurrentHashMap<>(data);
Set<TreeSet<Integer>> result = new HashSet<>(); Set<TreeSet<Integer>> result = new HashSet<>();
set.forEach((key, value) -> { set.forEach((key, value) -> set.forEach((s, integers) -> {
set.forEach((s, integers) -> {
if(!value.equals(integers)) { if(!value.equals(integers)) {
if (integers.containsAll(value)) { if (integers.containsAll(value)) {
set.remove(key); set.remove(key);
} }
} }
}); }));
});
set.forEach((key, value) -> { set.forEach((key, value) -> result.add(value));
result.add(value);
});
/* result.removeIf(TreeSet::isEmpty);
data.forEach((key, value) -> {
result.forEach(integers -> {
if(!integers.containsAll(value)) {
result.add(integers);
}
});
});
*/
Iterator<TreeSet<Integer>> iterator = result.iterator();
while (iterator.hasNext()) {
if(iterator.next().isEmpty()) {
iterator.remove();
}
}
writer.write(result.toString().substring(1, result.toString().length()-1).replace(" ", "")); writer.write(result.toString().substring(1, result.toString().length()-1).replace(" ", ""));
} else { } else {
@ -138,7 +120,7 @@ public class KlausurenServer {
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} }
try (BufferedReader br = new BufferedReader(fileReader)) { try (BufferedReader br = new BufferedReader(Objects.requireNonNull(fileReader))) {
for (String line = br.readLine(); line != null; line = br.readLine()) { for (String line = br.readLine(); line != null; line = br.readLine()) {
TreeSet<Integer> set = new TreeSet<>(); TreeSet<Integer> set = new TreeSet<>();
String[] array = line.split(":"); String[] array = line.split(":");

2
src/main/resources/praktikum3/vorlesungen-db.txt
View File

@ -1,4 +1,4 @@
A1:Relativitätstheorie:Einstein:15 A1:Relativitätstheorie:Einstein:15
B2:Quantenmechanik:Heisenberg:17 B2:Quantenmechanik:Heisenberg:17
C2:Quantenphysik:Planck:5 C2:Quantenphysik:Planck:5
T4:Thermodynamik:Kelvin:78 T4:Thermodynamik:Kelvin:78