From ea6f79222b5c0d9b850ffd45b1545c675825c416 Mon Sep 17 00:00:00 2001 From: christian Date: Thu, 22 Apr 2021 20:46:17 +0200 Subject: [PATCH] added some small requirements again --- .../main/java/FunctionLayer/Datahandler.java | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.java b/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.java index 40a7bae3..4a2c0ed5 100644 --- a/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.java +++ b/ArtificialAutism/src/main/java/FunctionLayer/Datahandler.java @@ -317,7 +317,6 @@ public class Datahandler { int prefix_size = 150; SentimentValueCache sentimentCacheStr = sentimentCachingMap.getOrDefault(strCollection, null); List smxReturnList = new ArrayList(); - List randomIterationComparision = new ArrayList(); if (strCacheLocal.size() < prefix_size) { for (String colStr : strCollection) @@ -325,20 +324,10 @@ public class Datahandler { 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) { - randomIterationComparision.add(str1); - } - if (iterated > iterator + prefix_size) { - break; - } - iterated++; - } - for (String str1 : randomIterationComparision) { + + for (String str1 : strCollection) { for (String str : strCollection) { if (!str.equals(str1)) { SimilarityMatrix SMXInit = new SimilarityMatrix(str, str1); @@ -379,7 +368,8 @@ public class Datahandler { try { Future take = ecs.take(); SimilarityMatrix smx = take.get(); - if (smx != null) { + double distance_requirement = 1500.0; + if (smx != null && smx.getDistance() > distance_requirement) { smxReturnList.add(smx); } } catch (InterruptedException | ExecutionException ex) {