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 18da6be3..2f19939b 100644
--- a/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.java
+++ b/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.java
@@ -318,8 +318,15 @@ 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();
+ int iteratecap = strCacheLocal.size() > prefix_size ? strCacheLocal.size() - prefix_size : strCollection.size() - 1;
int iterator = ThreadLocalRandom.current().nextInt(0, iteratecap);
+ if (strCacheLocal.size() < prefix_size)
+ {
+ for (String colStr : strCollection)
+ {
+ strCacheLocal.put(strCacheLocal.size(), colStr);
+ }
+ }
int iterated = 0;
for (String str1 : strCacheLocal.values()) {
if (iterated >= iterator && iterated < iterator + prefix_size) {
@@ -390,7 +397,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());
diff --git a/ArtificialAutism/target/ArtificialAutism-1.0.jar b/ArtificialAutism/target/ArtificialAutism-1.0.jar
index 4afdb438..fe7ab02f 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/FunctionLayer/Datahandler$AnnotationCollector.class b/ArtificialAutism/target/classes/FunctionLayer/Datahandler$AnnotationCollector.class
index b9a3e4b0..90f03d64 100644
Binary files a/ArtificialAutism/target/classes/FunctionLayer/Datahandler$AnnotationCollector.class 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
index 52ffbcf9..72d42e75 100644
Binary files a/ArtificialAutism/target/classes/FunctionLayer/Datahandler.class and b/ArtificialAutism/target/classes/FunctionLayer/Datahandler.class differ
diff --git a/ArtificialAutism/target/maven-archiver/pom.properties b/ArtificialAutism/target/maven-archiver/pom.properties
index 33174a5b..e474df4b 100644
--- a/ArtificialAutism/target/maven-archiver/pom.properties
+++ b/ArtificialAutism/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven
-#Sun Nov 01 17:40:51 CET 2020
+#Sun Nov 01 22:49:28 CET 2020
version=1.0
groupId=com.mycompany
artifactId=ArtificialAutism