diff --git a/ArtificialAutism/NOTES.txt b/ArtificialAutism/NOTES.txt
index 1af5db41..072ca518 100644
--- a/ArtificialAutism/NOTES.txt
+++ b/ArtificialAutism/NOTES.txt
@@ -11,4 +11,6 @@ kinda fucking huge
now requires about 4 GB ram atleast to run.
also now requires nlp.stanford.edu/software/stanford-corenlp-full-2018-10-05.zip
because it needs lexicalized parsers which shift reduce parser does not posses.
-also requires the regular stanford parser except of just shift reduce parser
\ No newline at end of file
+also requires the regular stanford parser except of just shift reduce parser
+
+jars too large for /lib folder: CorenlpModels-1.0, srParser-1, ws4j-1.0.1, StanfordParserModel-1.0
\ No newline at end of file
diff --git a/ArtificialAutism/pom.xml b/ArtificialAutism/pom.xml
index 6d04c29c..732f301e 100644
--- a/ArtificialAutism/pom.xml
+++ b/ArtificialAutism/pom.xml
@@ -1,99 +1,127 @@
-
- 4.0.0
- com.mycompany
- ArtificialAutism
- 1.0
- jar
-
-
- org.apache.commons
- commons-dbcp2
- 2.5.0
- jar
-
-
- mysql
- mysql-connector-java
- 8.0.13
-
-
- org.javacord
- javacord-api
- 3.0.1
- jar
-
-
- org.javacord
- javacord
- 3.0.1
- pom
-
-
- com.google.guava
- guava
- 26.0-jre
-
-
- com.github.mpkorstanje
- simmetrics-core
- 4.1.1
-
-
- ws4j
- ws4j
- 1.0.1
-
-
- StanfordParser
- StanfordParser
- 1.0
-
-
- StanfordParserModel
- StanfordParserModel
- 1.0
-
-
- srParser
- srParser
- 1
-
-
-
- UTF-8
- 1.8
- 1.8
- PresentationLayer.DiscordHandler
-
-
-
-
- maven-dependency-plugin
-
-
- install
-
- copy-dependencies
-
-
- ${project.build.directory}/lib
-
-
-
-
-
- maven-jar-plugin
-
-
-
- true
- lib/
- ${mainClass}
-
-
-
-
-
-
-
\ No newline at end of file
+
+ 4.0.0
+ com.mycompany
+ ArtificialAutism
+ 1.0
+ jar
+
+
+ org.apache.commons
+ commons-dbcp2
+ 2.5.0
+ jar
+
+
+ mysql
+ mysql-connector-java
+ 8.0.13
+
+
+ com.google.guava
+ guava
+ 26.0-jre
+
+
+ com.github.mpkorstanje
+ simmetrics-core
+ 4.1.1
+
+
+ ws4j
+ ws4j
+ 1.0.1
+
+
+ StanfordParser
+ StanfordParser
+ 1.0
+
+
+ StanfordParserModel
+ StanfordParserModel
+ 1.0
+
+
+ srParser
+ srParser
+ 1
+
+
+ ejml
+ ejml
+ 0.2.3
+ jar
+
+
+ jmweAnno
+ jmweAnno
+ 1.0
+ jar
+
+
+ edu.mit.jmwe
+ edu.mit.jmwe
+ 1.0.2
+ jar
+
+
+ CoreNLP
+ CoreNLP
+ 1.0
+ jar
+
+
+ org.apache.lucene
+ lucene-analyzers-common
+ 7.2.0
+ jar
+
+
+ CorenlpModels
+ CorenlpModels
+ 1.0
+
+
+ com.discord4j
+ discord4j-core
+ 3.1.1
+
+
+
+ UTF-8
+ 1.8
+ 1.8
+ PresentationLayer.DiscordHandler
+
+
+
+
+ maven-dependency-plugin
+
+
+ install
+
+ copy-dependencies
+
+
+ ${project.build.directory}/lib
+
+
+
+
+
+ maven-jar-plugin
+
+
+
+ true
+ lib/
+ ${mainClass}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.java b/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.java
index 30098f07..55feec8d 100644
--- a/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.java
+++ b/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.java
@@ -179,7 +179,7 @@ public class Datahandler {
public void updateStringCache() {
try {
- checkIfUpdateStrings(true);
+ checkIfUpdateStrings();
} catch (CustomError ex) {
Logger.getLogger(Datahandler.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -225,7 +225,7 @@ public class Datahandler {
hlStatsMessages.put(str, hlStatsMessages.size());
}
}
- int capacity = 50;
+ int capacity = 150;
hlStatsMessages.keySet().forEach(str -> {
if (!str.startsWith("!") && MessageResponseHandler.getStr().values().size() < capacity) {
String orElse = strCacheLocal.values().parallelStream().filter(e -> e.equals(str)).findAny().orElse(null);
@@ -318,8 +318,16 @@ public class Datahandler {
SentimentValueCache sentimentCacheStr = sentimentCachingMap.getOrDefault(strCollection, null);
List smxReturnList = new ArrayList();
List randomIterationComparision = new ArrayList();
- int iteratecap = strCacheLocal.size() > prefix_size ? strCacheLocal.size() - prefix_size : strCacheLocal.size();
+ if (strCacheLocal.size() < prefix_size)
+ {
+ for (String colStr : strCollection)
+ {
+ strCacheLocal.put(strCacheLocal.size(), colStr);
+ }
+ }
+ int iteratecap = strCacheLocal.size() > prefix_size ? strCacheLocal.size() - prefix_size : strCacheLocal.size() - 1;
int iterator = ThreadLocalRandom.current().nextInt(0, iteratecap);
+
int iterated = 0;
for (String str1 : strCacheLocal.values()) {
if (iterated >= iterator && iterated < iterator + prefix_size) {
@@ -390,7 +398,6 @@ public class Datahandler {
//System.out.println("strmap siuze: " + strmap.size());
List StrComparringNoSentenceRelationMap = StrComparringNoSentenceRelationMap(strCacheLocal, strmap.values(),
localJMWEMap, localPipelineAnnotation, localPipelineSentimentAnnotation, localCoreDocumentMap);
- System.out.println("StrComparringNoSentenceRelationMap size: " + StrComparringNoSentenceRelationMap.size());
Collections.sort(StrComparringNoSentenceRelationMap, (e1, e2) -> e1.getPrimaryString().compareTo(e2.getPrimaryString()));
ConcurrentMap strmapreturn = futuresReturnOverallEvaluation(StrComparringNoSentenceRelationMap);
//System.out.println("strmapreturn size: " + strmapreturn.size());
@@ -398,7 +405,7 @@ public class Datahandler {
}
private ConcurrentMap removeNonSensicalStrings(ConcurrentMap strmap) {
- final ConcurrentMap strCacheLocal = stringCache.size() < 150 ? strmap : stringCache;
+ final ConcurrentMap strCacheLocal = stringCache;
final ConcurrentMap localJMWEMap = getMultipleJMWEAnnotation(strmap.values());
final ConcurrentMap localPipelineAnnotation = getMultiplePipelineAnnotation(strmap.values());
final ConcurrentMap localPipelineSentimentAnnotation = getMultiplePipelineSentimentAnnotation(strmap.values());
@@ -406,16 +413,13 @@ public class Datahandler {
return stringIteratorComparator(strmap, strCacheLocal, localJMWEMap, localPipelineAnnotation, localPipelineSentimentAnnotation, localCoreDocumentMap);
}
- public synchronized void checkIfUpdateStrings(boolean hlStatsMsg) throws CustomError {
+ public synchronized void checkIfUpdateStrings() throws CustomError {
if (stopwatch.elapsed(TimeUnit.SECONDS) >= EXPIRE_TIME_IN_SECONDS || !stopwatch.isRunning()) {
ConcurrentMap str = MessageResponseHandler.getStr();
System.out.println("str size: " + str.size());
- str = cutContent(str, hlStatsMsg);
str = filterContent(str);
- str = removeSlacks(str);
- //System.out.println("finished removeSlacks \n" + str.size() + "\n");
str = removeNonSensicalStrings(str);
- System.out.println("removeNonSensicalStrings str size POST: " + str.size() + "\n");
+ //System.out.println("removeNonSensicalStrings str size POST: " + str.size() + "\n");
str = annotationCacheUpdate(str);
System.out.println("annotationCacheUpdate str size POST: " + str.size() + "\n");
ConcurrentMap strf = str;
@@ -616,20 +620,6 @@ public class Datahandler {
return 0.0;
}
- public static ConcurrentMap cutContent(ConcurrentMap str, boolean hlStatsMsg) {
- ConcurrentMap returnlist = new MapMaker().concurrencyLevel(2).makeMap();
- str.values().forEach(str1 -> {
- int iend = str1.indexOf("content: ");
- if (iend != -1) {
- String trs = str1.substring(iend + 9);
- returnlist.put(returnlist.size() + 1, trs.substring(0, trs.length() - 1));
- } else if (hlStatsMsg) {
- returnlist.put(returnlist.size() + 1, str1);
- }
- });
- return returnlist;
- }
-
public static ConcurrentMap filterContent(ConcurrentMap str) {
ConcurrentMap strlistreturn = new MapMaker().concurrencyLevel(2).makeMap();
str.values().forEach(str1 -> {
@@ -641,12 +631,15 @@ public class Datahandler {
if (str1.contains("AM*")) {
str1 = str1.substring(str1.indexOf("AM*") + 3);
}
- for (Character c : str1.toCharArray()) {
- if (c == '?' || c == '°') {
+ if (str1.contains("?") || str1.contains("°"))
+ {
+ if (!str1.contains("http"))
+ {
str1 = str1.replace("?", " <:wlenny:514861023002624001> ");
str1 = str1.replace("°", " <:wlenny:514861023002624001> ");
}
}
+
if (str1.contains("(Counter-Terrorist)")) {
str1 = str1.replace("(Counter-Terrorist)", " ");
}
@@ -730,38 +723,13 @@ public class Datahandler {
}
str1 = str1.trim();
if (str1.length() > 2 && (!str1.startsWith("!"))) {
- strlistreturn.put(strlistreturn.size() + 1, str1);
+ strlistreturn.put(strlistreturn.size(), str1);
}
}
});
return strlistreturn;
}
- private ConcurrentMap removeSlacks(ConcurrentMap str) {
- ConcurrentMap strreturn = new MapMaker().concurrencyLevel(2).makeMap();
- if (stringCache.isEmpty()) {
- return str;
- }
- Collection values = stringCache.values();
- str.values().forEach(str1 -> {
- boolean tooclosematch = false;
- for (String strVals : values) {
- LevenshteinDistance leven = new LevenshteinDistance(strVals, str1);
- double Distance = leven.computeLevenshteinDistance();
- Double maxpermittedDistance = 2.5;
- if (Distance < maxpermittedDistance) {
- tooclosematch = true;
- break;
- }
- }
- if (!tooclosematch) {
- strreturn.put(strreturn.size() + 1, str1);
- //System.out.println("adding strreturn str1: " + str1 + "\n");
- }
- });
- return strreturn;
- }
-
private ConcurrentMap annotationCacheUpdate(ConcurrentMap strmap) {
ConcurrentMap jmweAnnotation = PipelineJMWESingleton.INSTANCE.getJMWEAnnotation(strmap.values());
for (Entry jmweitr : jmweAnnotation.entrySet()) {
diff --git a/ArtificialAutism/src/main/java/FunctionLayer/DoStuff.java b/ArtificialAutism/src/main/java/FunctionLayer/DoStuff.java
index 903e4eb3..412e393f 100644
--- a/ArtificialAutism/src/main/java/FunctionLayer/DoStuff.java
+++ b/ArtificialAutism/src/main/java/FunctionLayer/DoStuff.java
@@ -6,13 +6,17 @@
package FunctionLayer;
import PresentationLayer.DiscordHandler;
+import discord4j.core.event.domain.message.MessageCreateEvent;
+import discord4j.core.object.entity.User;
+import discord4j.core.object.entity.channel.TextChannel;
+import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.javacord.api.DiscordApi;
-import org.javacord.api.entity.user.User;
-import org.javacord.api.event.message.MessageCreateEvent;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
/**
*
@@ -26,17 +30,25 @@ public class DoStuff {
return occupied;
}
- public static void doStuff(MessageCreateEvent event, DiscordApi api) {
- if (!event.getMessage().getAuthor().isYourself()) {
+ public static void doStuff(MessageCreateEvent event, String usernameBot) {
+ String username = null;
+ try {
+ username = event.getMessage().getAuthor().get().getUsername();
+ } catch (java.util.NoSuchElementException e) {
+ username = null;
+ }
+ if (username != null && !username.equals(usernameBot)) {
occupied = true;
- String strtest = event.getServerTextChannel().get().getCategory().toString();
- strtest = strtest.substring(9, strtest.length() - 1);
+ TextChannel block = event.getMessage().getChannel().cast(TextChannel.class).block();
+ String name = block.getCategory().block().getName();
+ name = name.toLowerCase();
+ String channelName = block.getName().toLowerCase();
boolean channelpermissionsDenied = false;
- switch (strtest) {
- case "Public Area": {
+ switch (name) {
+ case "public area": {
break;
}
- case "Information Area": {
+ case "information area": {
break;
}
default: {
@@ -44,25 +56,35 @@ public class DoStuff {
break;
}
}
+ List blockLast = event.getMessage().getUserMentions().buffer().blockLast();
+ String content = event.getMessage().getContent();
if (!channelpermissionsDenied) {
- List userlist = event.getMessage().getMentionedUsers();
- String strresult = event.getMessage().toString();
- if (userlist != null) {
- for (User user : userlist) {
- strresult = strresult.replace(user.getIdAsString(), "");
+ if (blockLast != null)
+ {
+ for (User user : blockLast) {
+ content = content.replace(user.getId().asString(), "");
}
}
- MessageResponseHandler.getMessage(strresult);
+ MessageResponseHandler.getMessage(content);
}
- if (event.getMessage().getMentionedUsers().contains(api.getYourself())
- || event.getServerTextChannel().get().toString().contains("general-autism")) {
+ boolean mentionedBot = false;
+ if (blockLast != null){
+ for (User user : blockLast)
+ {
+ if (user.getUsername().equals(usernameBot))
+ {
+ mentionedBot = true;
+ break;
+ }
+ }
+ }
+ if (mentionedBot || channelName.contains("general-autism")) {
try {
String ResponseStr;
- String person = event.getMessageAuthor().getName();
- ResponseStr = MessageResponseHandler.selectReponseMessage(event.getMessage().toString(), person);
+ ResponseStr = MessageResponseHandler.selectReponseMessage(content, username);
if (!ResponseStr.isEmpty()) {
System.out.print("\nResponseStr3: " + ResponseStr + "\n");
- event.getChannel().sendMessage(ResponseStr);
+ event.getMessage().getChannel().block().createMessage(ResponseStr).block();
}
} catch (CustomError ex) {
Logger.getLogger(DoStuff.class.getName()).log(Level.SEVERE, null, ex);
@@ -71,7 +93,7 @@ public class DoStuff {
}
new Thread(() -> {
try {
- Datahandler.instance.checkIfUpdateStrings(false);
+ Datahandler.instance.checkIfUpdateStrings();
} catch (CustomError ex) {
Logger.getLogger(DiscordHandler.class.getName()).log(Level.SEVERE, null, ex);
}
diff --git a/ArtificialAutism/src/main/java/FunctionLayer/MessageResponseHandler.java b/ArtificialAutism/src/main/java/FunctionLayer/MessageResponseHandler.java
index a4c1fb12..a498e057 100644
--- a/ArtificialAutism/src/main/java/FunctionLayer/MessageResponseHandler.java
+++ b/ArtificialAutism/src/main/java/FunctionLayer/MessageResponseHandler.java
@@ -46,7 +46,6 @@ public class MessageResponseHandler {
public static String selectReponseMessage(String toString, String personName) throws CustomError {
ConcurrentMap str1 = new MapMaker().concurrencyLevel(6).makeMap();
str1.put(str1.size() + 1, toString);
- str1 = Datahandler.cutContent(str1, false);
String strreturn = "";
for (String str : str1.values()) {
if (!str.isEmpty()) {
diff --git a/ArtificialAutism/src/main/java/PresentationLayer/DiscordHandler.java b/ArtificialAutism/src/main/java/PresentationLayer/DiscordHandler.java
index 51ab633f..733e7ab0 100644
--- a/ArtificialAutism/src/main/java/PresentationLayer/DiscordHandler.java
+++ b/ArtificialAutism/src/main/java/PresentationLayer/DiscordHandler.java
@@ -17,14 +17,19 @@ package PresentationLayer;
import FunctionLayer.Datahandler;
import FunctionLayer.DoStuff;
import FunctionLayer.PipelineJMWESingleton;
+import discord4j.core.DiscordClient;
+import discord4j.core.GatewayDiscordClient;
import java.io.IOException;
import java.sql.SQLException;
import java.util.Timer;
import java.util.TimerTask;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.javacord.api.DiscordApi;
-import org.javacord.api.DiscordApiBuilder;
+import DataLayer.settings;
+import discord4j.common.util.Snowflake;
+import discord4j.core.event.domain.message.MessageCreateEvent;
+import java.math.BigInteger;
+
/**
*
@@ -48,15 +53,19 @@ public class DiscordHandler {
System.out.println("FINISHED ALL ANNOTATIONS");
Datahandler.instance.addHLstatsMessages();
Datahandler.instance.updateStringCache();
- String token = "NTI5NzAxNTk5NjAyMjc4NDAx.Dw0vDg.7-aMjVWdQMYPl8qVNyvTCPS5F_A";
- DiscordApi api = new DiscordApiBuilder().setToken(token).login().join();
+ //String token = "NTI5NzAxNTk5NjAyMjc4NDAx.Dw0vDg.7-aMjVWdQMYPl8qVNyvTCPS5F_A";
+ String token = new settings().getDiscordToken();
+ final DiscordClient client = DiscordClient.create(token);
+ final GatewayDiscordClient gateway = client.login().block();
+ String usernameBot = gateway.getSelf().block().getUsername();
new Thread(() -> {
Datahandler.instance.update_autismo_socket_msg();
}).start();
- api.addMessageCreateListener(event -> {
+ gateway.on(MessageCreateEvent.class).subscribe(event -> {
if (!FunctionLayer.DoStuff.isOccupied()) {
- FunctionLayer.DoStuff.doStuff(event, api);
+ FunctionLayer.DoStuff.doStuff(event, usernameBot);
}
});
+ gateway.onDisconnect().block();
}
}
diff --git a/ArtificialAutism/target/ArtificialAutism-1.0.jar b/ArtificialAutism/target/ArtificialAutism-1.0.jar
index 64615d0a..7ab6f19c 100644
Binary files a/ArtificialAutism/target/ArtificialAutism-1.0.jar and b/ArtificialAutism/target/ArtificialAutism-1.0.jar differ
diff --git a/ArtificialAutism/target/classes/DataLayer/DBCPDataSource.class b/ArtificialAutism/target/classes/DataLayer/DBCPDataSource.class
index f8a3caaa..688bce0f 100644
Binary files a/ArtificialAutism/target/classes/DataLayer/DBCPDataSource.class and b/ArtificialAutism/target/classes/DataLayer/DBCPDataSource.class differ
diff --git a/ArtificialAutism/target/classes/DataLayer/DBCPDataSourceHLstats.class b/ArtificialAutism/target/classes/DataLayer/DBCPDataSourceHLstats.class
new file mode 100644
index 00000000..e6efe6cd
Binary files /dev/null and b/ArtificialAutism/target/classes/DataLayer/DBCPDataSourceHLstats.class differ
diff --git a/ArtificialAutism/target/classes/DataLayer/DataMapper.class b/ArtificialAutism/target/classes/DataLayer/DataMapper.class
index b4d06b29..e3b840d5 100644
Binary files a/ArtificialAutism/target/classes/DataLayer/DataMapper.class and b/ArtificialAutism/target/classes/DataLayer/DataMapper.class differ
diff --git a/ArtificialAutism/target/classes/DataLayer/settings.class b/ArtificialAutism/target/classes/DataLayer/settings.class
new file mode 100644
index 00000000..8367b2c1
Binary files /dev/null and b/ArtificialAutism/target/classes/DataLayer/settings.class differ
diff --git a/ArtificialAutism/target/classes/FunctionLayer/Datahandler$1.class b/ArtificialAutism/target/classes/FunctionLayer/Datahandler$1.class
new file mode 100644
index 00000000..8411f9d9
Binary files /dev/null and b/ArtificialAutism/target/classes/FunctionLayer/Datahandler$1.class differ
diff --git a/ArtificialAutism/target/classes/FunctionLayer/Datahandler$AnnotationCollector.class b/ArtificialAutism/target/classes/FunctionLayer/Datahandler$AnnotationCollector.class
new file mode 100644
index 00000000..d1a6e514
Binary files /dev/null and b/ArtificialAutism/target/classes/FunctionLayer/Datahandler$AnnotationCollector.class differ
diff --git a/ArtificialAutism/target/classes/FunctionLayer/Datahandler.class b/ArtificialAutism/target/classes/FunctionLayer/Datahandler.class
new file mode 100644
index 00000000..481fba63
Binary files /dev/null and b/ArtificialAutism/target/classes/FunctionLayer/Datahandler.class differ
diff --git a/ArtificialAutism/target/classes/FunctionLayer/DoStuff.class b/ArtificialAutism/target/classes/FunctionLayer/DoStuff.class
new file mode 100644
index 00000000..7e530ca5
Binary files /dev/null and b/ArtificialAutism/target/classes/FunctionLayer/DoStuff.class differ
diff --git a/ArtificialAutism/target/classes/FunctionLayer/LevenshteinDistance.class b/ArtificialAutism/target/classes/FunctionLayer/LevenshteinDistance.class
new file mode 100644
index 00000000..4dbeada9
Binary files /dev/null and b/ArtificialAutism/target/classes/FunctionLayer/LevenshteinDistance.class differ
diff --git a/ArtificialAutism/target/classes/FunctionLayer/MessageResponseHandler.class b/ArtificialAutism/target/classes/FunctionLayer/MessageResponseHandler.class
index 909729fc..02b28d2a 100644
Binary files a/ArtificialAutism/target/classes/FunctionLayer/MessageResponseHandler.class and b/ArtificialAutism/target/classes/FunctionLayer/MessageResponseHandler.class differ
diff --git a/ArtificialAutism/target/classes/FunctionLayer/PipelineJMWESingleton.class b/ArtificialAutism/target/classes/FunctionLayer/PipelineJMWESingleton.class
new file mode 100644
index 00000000..770ccf73
Binary files /dev/null and b/ArtificialAutism/target/classes/FunctionLayer/PipelineJMWESingleton.class differ
diff --git a/ArtificialAutism/target/classes/FunctionLayer/SimilarityMatrix.class b/ArtificialAutism/target/classes/FunctionLayer/SimilarityMatrix.class
index 849e96c1..3573cf4a 100644
Binary files a/ArtificialAutism/target/classes/FunctionLayer/SimilarityMatrix.class and b/ArtificialAutism/target/classes/FunctionLayer/SimilarityMatrix.class differ
diff --git a/ArtificialAutism/target/classes/FunctionLayer/StanfordParser/SentimentAnalyzerTest.class b/ArtificialAutism/target/classes/FunctionLayer/StanfordParser/SentimentAnalyzerTest.class
index eb272be5..b4d5847b 100644
Binary files a/ArtificialAutism/target/classes/FunctionLayer/StanfordParser/SentimentAnalyzerTest.class and b/ArtificialAutism/target/classes/FunctionLayer/StanfordParser/SentimentAnalyzerTest.class differ
diff --git a/ArtificialAutism/target/classes/FunctionLayer/StanfordParser/SentimentValueCache.class b/ArtificialAutism/target/classes/FunctionLayer/StanfordParser/SentimentValueCache.class
new file mode 100644
index 00000000..9baae2cc
Binary files /dev/null and b/ArtificialAutism/target/classes/FunctionLayer/StanfordParser/SentimentValueCache.class differ
diff --git a/ArtificialAutism/target/classes/FunctionLayer/StopwordAnnotator.class b/ArtificialAutism/target/classes/FunctionLayer/StopwordAnnotator.class
new file mode 100644
index 00000000..05fe57dd
Binary files /dev/null and b/ArtificialAutism/target/classes/FunctionLayer/StopwordAnnotator.class differ
diff --git a/ArtificialAutism/target/classes/PresentationLayer/DiscordHandler.class b/ArtificialAutism/target/classes/PresentationLayer/DiscordHandler.class
index b87d4d03..a435dbb4 100644
Binary files a/ArtificialAutism/target/classes/PresentationLayer/DiscordHandler.class and b/ArtificialAutism/target/classes/PresentationLayer/DiscordHandler.class differ
diff --git a/ArtificialAutism/target/lib/CoreNLP-1.0.jar b/ArtificialAutism/target/lib/CoreNLP-1.0.jar
new file mode 100644
index 00000000..5427fb93
Binary files /dev/null and b/ArtificialAutism/target/lib/CoreNLP-1.0.jar differ
diff --git a/ArtificialAutism/target/lib/Servicer-1.0.3.jar b/ArtificialAutism/target/lib/Servicer-1.0.3.jar
new file mode 100644
index 00000000..b2d8af31
Binary files /dev/null and b/ArtificialAutism/target/lib/Servicer-1.0.3.jar differ
diff --git a/ArtificialAutism/target/lib/discord-json-1.5.4.jar b/ArtificialAutism/target/lib/discord-json-1.5.4.jar
new file mode 100644
index 00000000..4637f2e7
Binary files /dev/null and b/ArtificialAutism/target/lib/discord-json-1.5.4.jar differ
diff --git a/ArtificialAutism/target/lib/discord-json-api-1.5.4.jar b/ArtificialAutism/target/lib/discord-json-api-1.5.4.jar
new file mode 100644
index 00000000..f7ac69f0
Binary files /dev/null and b/ArtificialAutism/target/lib/discord-json-api-1.5.4.jar differ
diff --git a/ArtificialAutism/target/lib/discord4j-common-3.1.1.jar b/ArtificialAutism/target/lib/discord4j-common-3.1.1.jar
new file mode 100644
index 00000000..44af92a2
Binary files /dev/null and b/ArtificialAutism/target/lib/discord4j-common-3.1.1.jar differ
diff --git a/ArtificialAutism/target/lib/discord4j-core-3.1.1.jar b/ArtificialAutism/target/lib/discord4j-core-3.1.1.jar
new file mode 100644
index 00000000..977dbd70
Binary files /dev/null and b/ArtificialAutism/target/lib/discord4j-core-3.1.1.jar differ
diff --git a/ArtificialAutism/target/lib/discord4j-gateway-3.1.1.jar b/ArtificialAutism/target/lib/discord4j-gateway-3.1.1.jar
new file mode 100644
index 00000000..edcb3788
Binary files /dev/null and b/ArtificialAutism/target/lib/discord4j-gateway-3.1.1.jar differ
diff --git a/ArtificialAutism/target/lib/discord4j-rest-3.1.1.jar b/ArtificialAutism/target/lib/discord4j-rest-3.1.1.jar
new file mode 100644
index 00000000..50f73903
Binary files /dev/null and b/ArtificialAutism/target/lib/discord4j-rest-3.1.1.jar differ
diff --git a/ArtificialAutism/target/lib/discord4j-voice-3.1.1.jar b/ArtificialAutism/target/lib/discord4j-voice-3.1.1.jar
new file mode 100644
index 00000000..9b1a907d
Binary files /dev/null and b/ArtificialAutism/target/lib/discord4j-voice-3.1.1.jar differ
diff --git a/ArtificialAutism/target/lib/edu.mit.jmwe-1.0.2.jar b/ArtificialAutism/target/lib/edu.mit.jmwe-1.0.2.jar
new file mode 100644
index 00000000..ea8ad972
Binary files /dev/null and b/ArtificialAutism/target/lib/edu.mit.jmwe-1.0.2.jar differ
diff --git a/ArtificialAutism/target/lib/ejml-0.2.3.jar b/ArtificialAutism/target/lib/ejml-0.2.3.jar
new file mode 100644
index 00000000..60a37dfe
Binary files /dev/null and b/ArtificialAutism/target/lib/ejml-0.2.3.jar differ
diff --git a/ArtificialAutism/target/lib/jackson-annotations-2.11.2.jar b/ArtificialAutism/target/lib/jackson-annotations-2.11.2.jar
new file mode 100644
index 00000000..8a6f1884
Binary files /dev/null and b/ArtificialAutism/target/lib/jackson-annotations-2.11.2.jar differ
diff --git a/ArtificialAutism/target/lib/jackson-core-2.11.2.jar b/ArtificialAutism/target/lib/jackson-core-2.11.2.jar
new file mode 100644
index 00000000..b31deebf
Binary files /dev/null and b/ArtificialAutism/target/lib/jackson-core-2.11.2.jar differ
diff --git a/ArtificialAutism/target/lib/jackson-databind-2.11.2.jar b/ArtificialAutism/target/lib/jackson-databind-2.11.2.jar
new file mode 100644
index 00000000..92e080a5
Binary files /dev/null and b/ArtificialAutism/target/lib/jackson-databind-2.11.2.jar differ
diff --git a/ArtificialAutism/target/lib/jackson-datatype-jdk8-2.11.2.jar b/ArtificialAutism/target/lib/jackson-datatype-jdk8-2.11.2.jar
new file mode 100644
index 00000000..16586802
Binary files /dev/null and b/ArtificialAutism/target/lib/jackson-datatype-jdk8-2.11.2.jar differ
diff --git a/ArtificialAutism/target/lib/jmweAnno-1.0.jar b/ArtificialAutism/target/lib/jmweAnno-1.0.jar
new file mode 100644
index 00000000..6efcab19
Binary files /dev/null and b/ArtificialAutism/target/lib/jmweAnno-1.0.jar differ
diff --git a/ArtificialAutism/target/lib/lucene-analyzers-common-7.2.0.jar b/ArtificialAutism/target/lib/lucene-analyzers-common-7.2.0.jar
new file mode 100644
index 00000000..26b89d96
Binary files /dev/null and b/ArtificialAutism/target/lib/lucene-analyzers-common-7.2.0.jar differ
diff --git a/ArtificialAutism/target/lib/lucene-core-7.2.0.jar b/ArtificialAutism/target/lib/lucene-core-7.2.0.jar
new file mode 100644
index 00000000..f39c92c2
Binary files /dev/null and b/ArtificialAutism/target/lib/lucene-core-7.2.0.jar differ
diff --git a/ArtificialAutism/target/lib/netty-buffer-4.1.52.Final.jar b/ArtificialAutism/target/lib/netty-buffer-4.1.52.Final.jar
new file mode 100644
index 00000000..de12a9c1
Binary files /dev/null and b/ArtificialAutism/target/lib/netty-buffer-4.1.52.Final.jar differ
diff --git a/ArtificialAutism/target/lib/netty-codec-4.1.52.Final.jar b/ArtificialAutism/target/lib/netty-codec-4.1.52.Final.jar
new file mode 100644
index 00000000..ed498ac7
Binary files /dev/null and b/ArtificialAutism/target/lib/netty-codec-4.1.52.Final.jar differ
diff --git a/ArtificialAutism/target/lib/netty-codec-http-4.1.52.Final.jar b/ArtificialAutism/target/lib/netty-codec-http-4.1.52.Final.jar
new file mode 100644
index 00000000..87c54e26
Binary files /dev/null and b/ArtificialAutism/target/lib/netty-codec-http-4.1.52.Final.jar differ
diff --git a/ArtificialAutism/target/lib/netty-codec-http2-4.1.52.Final.jar b/ArtificialAutism/target/lib/netty-codec-http2-4.1.52.Final.jar
new file mode 100644
index 00000000..ebcc74af
Binary files /dev/null and b/ArtificialAutism/target/lib/netty-codec-http2-4.1.52.Final.jar differ
diff --git a/ArtificialAutism/target/lib/netty-codec-socks-4.1.52.Final.jar b/ArtificialAutism/target/lib/netty-codec-socks-4.1.52.Final.jar
new file mode 100644
index 00000000..64fab9bf
Binary files /dev/null and b/ArtificialAutism/target/lib/netty-codec-socks-4.1.52.Final.jar differ
diff --git a/ArtificialAutism/target/lib/netty-common-4.1.52.Final.jar b/ArtificialAutism/target/lib/netty-common-4.1.52.Final.jar
new file mode 100644
index 00000000..c991abee
Binary files /dev/null and b/ArtificialAutism/target/lib/netty-common-4.1.52.Final.jar differ
diff --git a/ArtificialAutism/target/lib/netty-handler-4.1.52.Final.jar b/ArtificialAutism/target/lib/netty-handler-4.1.52.Final.jar
new file mode 100644
index 00000000..27a84e91
Binary files /dev/null and b/ArtificialAutism/target/lib/netty-handler-4.1.52.Final.jar differ
diff --git a/ArtificialAutism/target/lib/netty-handler-proxy-4.1.52.Final.jar b/ArtificialAutism/target/lib/netty-handler-proxy-4.1.52.Final.jar
new file mode 100644
index 00000000..fbd2eb3f
Binary files /dev/null and b/ArtificialAutism/target/lib/netty-handler-proxy-4.1.52.Final.jar differ
diff --git a/ArtificialAutism/target/lib/netty-resolver-4.1.52.Final.jar b/ArtificialAutism/target/lib/netty-resolver-4.1.52.Final.jar
new file mode 100644
index 00000000..fa74856f
Binary files /dev/null and b/ArtificialAutism/target/lib/netty-resolver-4.1.52.Final.jar differ
diff --git a/ArtificialAutism/target/lib/netty-transport-4.1.52.Final.jar b/ArtificialAutism/target/lib/netty-transport-4.1.52.Final.jar
new file mode 100644
index 00000000..d0c4ee62
Binary files /dev/null and b/ArtificialAutism/target/lib/netty-transport-4.1.52.Final.jar differ
diff --git a/ArtificialAutism/target/lib/netty-transport-native-epoll-4.1.52.Final-linux-x86_64.jar b/ArtificialAutism/target/lib/netty-transport-native-epoll-4.1.52.Final-linux-x86_64.jar
new file mode 100644
index 00000000..fab71a52
Binary files /dev/null and b/ArtificialAutism/target/lib/netty-transport-native-epoll-4.1.52.Final-linux-x86_64.jar differ
diff --git a/ArtificialAutism/target/lib/netty-transport-native-unix-common-4.1.52.Final.jar b/ArtificialAutism/target/lib/netty-transport-native-unix-common-4.1.52.Final.jar
new file mode 100644
index 00000000..028cf995
Binary files /dev/null and b/ArtificialAutism/target/lib/netty-transport-native-unix-common-4.1.52.Final.jar differ
diff --git a/ArtificialAutism/target/lib/reactive-streams-1.0.3.jar b/ArtificialAutism/target/lib/reactive-streams-1.0.3.jar
new file mode 100644
index 00000000..b9b487ca
Binary files /dev/null and b/ArtificialAutism/target/lib/reactive-streams-1.0.3.jar differ
diff --git a/ArtificialAutism/target/lib/reactor-core-3.3.10.RELEASE.jar b/ArtificialAutism/target/lib/reactor-core-3.3.10.RELEASE.jar
new file mode 100644
index 00000000..b7194ff3
Binary files /dev/null and b/ArtificialAutism/target/lib/reactor-core-3.3.10.RELEASE.jar differ
diff --git a/ArtificialAutism/target/lib/reactor-extra-3.3.4.RELEASE.jar b/ArtificialAutism/target/lib/reactor-extra-3.3.4.RELEASE.jar
new file mode 100644
index 00000000..20377793
Binary files /dev/null and b/ArtificialAutism/target/lib/reactor-extra-3.3.4.RELEASE.jar differ
diff --git a/ArtificialAutism/target/lib/reactor-netty-0.9.12.RELEASE.jar b/ArtificialAutism/target/lib/reactor-netty-0.9.12.RELEASE.jar
new file mode 100644
index 00000000..b7c4db95
Binary files /dev/null and b/ArtificialAutism/target/lib/reactor-netty-0.9.12.RELEASE.jar differ
diff --git a/ArtificialAutism/target/lib/simple-fsm-1.0.1.jar b/ArtificialAutism/target/lib/simple-fsm-1.0.1.jar
new file mode 100644
index 00000000..04413080
Binary files /dev/null and b/ArtificialAutism/target/lib/simple-fsm-1.0.1.jar differ
diff --git a/ArtificialAutism/target/lib/stores-api-3.1.4.jar b/ArtificialAutism/target/lib/stores-api-3.1.4.jar
new file mode 100644
index 00000000..5c161e11
Binary files /dev/null and b/ArtificialAutism/target/lib/stores-api-3.1.4.jar differ
diff --git a/ArtificialAutism/target/lib/stores-jdk-3.1.4.jar b/ArtificialAutism/target/lib/stores-jdk-3.1.4.jar
new file mode 100644
index 00000000..e79aad25
Binary files /dev/null and b/ArtificialAutism/target/lib/stores-jdk-3.1.4.jar differ
diff --git a/ArtificialAutism/target/lib/ws4j-1.0.1.jar b/ArtificialAutism/target/lib/ws4j-1.0.1.jar
deleted file mode 100644
index 444d0b81..00000000
Binary files a/ArtificialAutism/target/lib/ws4j-1.0.1.jar and /dev/null differ
diff --git a/ArtificialAutism/target/maven-archiver/pom.properties b/ArtificialAutism/target/maven-archiver/pom.properties
index 6ecb0827..6eb8ac83 100644
--- a/ArtificialAutism/target/maven-archiver/pom.properties
+++ b/ArtificialAutism/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven
-#Sat Feb 02 20:31:02 CET 2019
+#Mon Nov 02 11:08:19 CET 2020
version=1.0
groupId=com.mycompany
artifactId=ArtificialAutism
diff --git a/ArtificialAutism/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/ArtificialAutism/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 00000000..480a1003
--- /dev/null
+++ b/ArtificialAutism/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,17 @@
+FunctionLayer\Datahandler.class
+FunctionLayer\Datahandler$AnnotationCollector.class
+FunctionLayer\SimilarityMatrix.class
+FunctionLayer\StanfordParser\SentimentValueCache.class
+DataLayer\DBCPDataSource.class
+DataLayer\settings.class
+FunctionLayer\LevenshteinDistance.class
+FunctionLayer\CustomError.class
+FunctionLayer\StanfordParser\SentimentAnalyzerTest.class
+DataLayer\DataMapper.class
+FunctionLayer\StopwordAnnotator.class
+DataLayer\DBCPDataSourceHLstats.class
+FunctionLayer\DoStuff.class
+FunctionLayer\PipelineJMWESingleton.class
+PresentationLayer\DiscordHandler.class
+FunctionLayer\Datahandler$1.class
+FunctionLayer\MessageResponseHandler.class
diff --git a/ArtificialAutism/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/ArtificialAutism/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 00000000..99e2efed
--- /dev/null
+++ b/ArtificialAutism/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,15 @@
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\FunctionLayer\DoStuff.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\PresentationLayer\DiscordHandler.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\DataLayer\DBCPDataSourceHLstats.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\DataLayer\settings.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\FunctionLayer\LevenshteinDistance.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\FunctionLayer\StopwordAnnotator.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\FunctionLayer\StanfordParser\SentimentAnalyzerTest.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\FunctionLayer\PipelineJMWESingleton.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\DataLayer\DataMapper.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\FunctionLayer\CustomError.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\FunctionLayer\SimilarityMatrix.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\DataLayer\DBCPDataSource.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\FunctionLayer\MessageResponseHandler.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\FunctionLayer\Datahandler.java
+E:\stationær backup filer\Projects\ArtificialAutism\src\main\java\FunctionLayer\StanfordParser\SentimentValueCache.java
diff --git a/ArtificialAutism/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/ArtificialAutism/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
new file mode 100644
index 00000000..e69de29b