UNLOZE/projects-jenz
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed global variable entirely

Browse Source
This commit is contained in:
christian 2021-12-02 01:41:06 +01:00
parent 583324e4ca
commit 30bf0d059f
4 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArtificialAutism/src/main/java/DataLayer/DataMapper.java
View File

@ -27,7 +27,7 @@ public class DataMapper {
ArrayList<String> arrayListStr = new ArrayList(); ArrayList<String> arrayListStr = new ArrayList();
try { try {
l_cCon = DBCPDataSource.getConnection(); 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_pStatement = l_cCon.prepareStatement(l_sSQL);
l_rsSearch = l_pStatement.executeQuery(); l_rsSearch = l_pStatement.executeQuery();
while (l_rsSearch.next()) { while (l_rsSearch.next()) {

13
ArtificialAutism/src/main/java/FunctionLayer/Datahandler.kt
View File

@ -39,7 +39,6 @@ public class Datahandler {
private var pipelineSentimentAnnotationCache = HashMap<String, Annotation>() private var pipelineSentimentAnnotationCache = HashMap<String, Annotation>()
private var coreDocumentAnnotationCache: HashMap<String, CoreDocument> private var coreDocumentAnnotationCache: HashMap<String, CoreDocument>
private var jmweAnnotationCache = HashMap<String, Annotation>() private var jmweAnnotationCache = HashMap<String, Annotation>()
private var stringCache = ArrayList<String>()
//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.caseless.distsim.crf.ser.gz"
private val nerModel = "edu/stanford/nlp/models/ner/english.all.3class.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) return StanfordCoreNLP(propsSentiment)
} }
fun updateStringCache() {
stringCache = ArrayList<String>();
for (str: String in DataMapper.getAllStrings()) {
stringCache.add(str)
}
stringCache.sortWith(Comparator.comparingInt(String::length).reversed());
}
private fun trimString(str: String): String { private fun trimString(str: String): String {
var message = str.trim { it <= ' ' } var message = str.trim { it <= ' ' }
if (message.startsWith("<@")) { if (message.startsWith("<@")) {
@ -204,7 +195,7 @@ public class Datahandler {
stanfordCoreNLP.annotate(annotation) stanfordCoreNLP.annotate(annotation)
val coreDocument = CoreDocument(annotation) val coreDocument = CoreDocument(annotation)
val values_copy: List<String> = ArrayList(stringCache) val values_copy: List<String> = ArrayList(DataMapper.getAllStrings())
var preRelationUserCounters = -155000.0 var preRelationUserCounters = -155000.0
val concurrentRelations: MutableList<String> = arrayListOf() val concurrentRelations: MutableList<String> = arrayListOf()
val SB = StringBuilder() val SB = StringBuilder()
@ -541,8 +532,6 @@ public class Datahandler {
if (preRelationUserCounters > cacheRequirement && !values_copy.contains(strF) && filterContent(strF)) { if (preRelationUserCounters > cacheRequirement && !values_copy.contains(strF) && filterContent(strF)) {
DataMapper.InsertMYSQLStrings(strF) DataMapper.InsertMYSQLStrings(strF)
DataMapper.checkStringsToDelete(); 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)) val randomLenghtPermit = strF.length * (Math.random() * Math.random() * Math.random() * (Math.random() * 10))
Collections.reverse(concurrentRelations) Collections.reverse(concurrentRelations)

1
ArtificialAutism/src/main/java/FunctionLayer/DoStuff.java
View File

@ -72,7 +72,6 @@ public class DoStuff {
} }
if (mentionedBot || channelName.contains("general-autism")) { if (mentionedBot || channelName.contains("general-autism")) {
String ResponseStr; String ResponseStr;
System.out.println("reached datahandler.getResponseMsg");
ResponseStr = datahandler.getResponseMsg(content, username, stanfordCoreNLP, stanfordCoreNLPSentiment, ResponseStr = datahandler.getResponseMsg(content, username, stanfordCoreNLP, stanfordCoreNLPSentiment,
false); false);
if (!ResponseStr.isEmpty()) { if (!ResponseStr.isEmpty()) {

3
ArtificialAutism/src/main/java/PresentationLayer/DiscordHandler.java
View File

@ -80,14 +80,11 @@ public class DiscordHandler {
//variables until the tests pass //variables until the tests pass
public static void main(String[] args) throws IOException, SQLException { public static void main(String[] args) throws IOException, SQLException {
Datahandler datahandler = new Datahandler(); Datahandler datahandler = new Datahandler();
datahandler.updateStringCache();
System.out.println("post updateStringCache");
PipelineJMWESingleton.getINSTANCE(); PipelineJMWESingleton.getINSTANCE();
StanfordCoreNLP stanfordCoreNLP = datahandler.pipeLineSetUp(); StanfordCoreNLP stanfordCoreNLP = datahandler.pipeLineSetUp();
StanfordCoreNLP stanfordCoreNLPSentiment = datahandler.shiftReduceParserInitiate(); StanfordCoreNLP stanfordCoreNLPSentiment = datahandler.shiftReduceParserInitiate();
System.out.println("FINISHED ALL ANNOTATIONS"); System.out.println("FINISHED ALL ANNOTATIONS");
datahandler.updateStringCache();
System.out.println("updatedstring cache"); System.out.println("updatedstring cache");
String token = new settings().getDiscordToken(); String token = new settings().getDiscordToken();
final DiscordClient client = DiscordClient.create(token); final DiscordClient client = DiscordClient.create(token);