diff --git a/ArtificialAutism/src/main/java/DataLayer/DataMapper.java b/ArtificialAutism/src/main/java/DataLayer/DataMapper.java index 45b8bdd9..1103b037 100644 --- a/ArtificialAutism/src/main/java/DataLayer/DataMapper.java +++ b/ArtificialAutism/src/main/java/DataLayer/DataMapper.java @@ -27,7 +27,7 @@ public class DataMapper { ArrayList arrayListStr = new ArrayList(); try { l_cCon = DBCPDataSource.getConnection(); - String l_sSQL = "SELECT * FROM `Sentences`"; + String l_sSQL = "SELECT * FROM `Sentences` order by LENGTH(Strings) desc"; l_pStatement = l_cCon.prepareStatement(l_sSQL); l_rsSearch = l_pStatement.executeQuery(); while (l_rsSearch.next()) { diff --git a/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.kt b/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.kt index 813b82df..6d4f07af 100644 --- a/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.kt +++ b/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.kt @@ -39,7 +39,6 @@ public class Datahandler { private var pipelineSentimentAnnotationCache = HashMap() private var coreDocumentAnnotationCache: HashMap private var jmweAnnotationCache = HashMap() - private var stringCache = ArrayList() //private val nerModel = "edu/stanford/nlp/models/ner/english.all.3class.caseless.distsim.crf.ser.gz" private val nerModel = "edu/stanford/nlp/models/ner/english.all.3class.distsim.crf.ser.gz" @@ -154,14 +153,6 @@ public class Datahandler { return StanfordCoreNLP(propsSentiment) } - fun updateStringCache() { - stringCache = ArrayList(); - for (str: String in DataMapper.getAllStrings()) { - stringCache.add(str) - } - stringCache.sortWith(Comparator.comparingInt(String::length).reversed()); - } - private fun trimString(str: String): String { var message = str.trim { it <= ' ' } if (message.startsWith("<@")) { @@ -204,7 +195,7 @@ public class Datahandler { stanfordCoreNLP.annotate(annotation) val coreDocument = CoreDocument(annotation) - val values_copy: List = ArrayList(stringCache) + val values_copy: List = ArrayList(DataMapper.getAllStrings()) var preRelationUserCounters = -155000.0 val concurrentRelations: MutableList = arrayListOf() val SB = StringBuilder() @@ -541,8 +532,6 @@ public class Datahandler { if (preRelationUserCounters > cacheRequirement && !values_copy.contains(strF) && filterContent(strF)) { DataMapper.InsertMYSQLStrings(strF) DataMapper.checkStringsToDelete(); - stringCache.add(strF) - stringCache.sortWith(Comparator.comparingInt(String::length).reversed()); } val randomLenghtPermit = strF.length * (Math.random() * Math.random() * Math.random() * (Math.random() * 10)) Collections.reverse(concurrentRelations) diff --git a/ArtificialAutism/src/main/java/FunctionLayer/DoStuff.java b/ArtificialAutism/src/main/java/FunctionLayer/DoStuff.java index 367c12c6..611dd23f 100644 --- a/ArtificialAutism/src/main/java/FunctionLayer/DoStuff.java +++ b/ArtificialAutism/src/main/java/FunctionLayer/DoStuff.java @@ -72,7 +72,6 @@ public class DoStuff { } if (mentionedBot || channelName.contains("general-autism")) { String ResponseStr; - System.out.println("reached datahandler.getResponseMsg"); ResponseStr = datahandler.getResponseMsg(content, username, stanfordCoreNLP, stanfordCoreNLPSentiment, false); if (!ResponseStr.isEmpty()) { diff --git a/ArtificialAutism/src/main/java/PresentationLayer/DiscordHandler.java b/ArtificialAutism/src/main/java/PresentationLayer/DiscordHandler.java index 061a8f45..4637668d 100644 --- a/ArtificialAutism/src/main/java/PresentationLayer/DiscordHandler.java +++ b/ArtificialAutism/src/main/java/PresentationLayer/DiscordHandler.java @@ -80,14 +80,11 @@ public class DiscordHandler { //variables until the tests pass public static void main(String[] args) throws IOException, SQLException { Datahandler datahandler = new Datahandler(); - datahandler.updateStringCache(); - System.out.println("post updateStringCache"); PipelineJMWESingleton.getINSTANCE(); StanfordCoreNLP stanfordCoreNLP = datahandler.pipeLineSetUp(); StanfordCoreNLP stanfordCoreNLPSentiment = datahandler.shiftReduceParserInitiate(); System.out.println("FINISHED ALL ANNOTATIONS"); - datahandler.updateStringCache(); System.out.println("updatedstring cache"); String token = new settings().getDiscordToken(); final DiscordClient client = DiscordClient.create(token);