IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

addressing PR comments

Browse Source
This commit is contained in:
Mark Wolters 2024-01-22 17:11:59 -04:00
parent 97cd55aa60
commit 9a54f9d7dc
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctions.java
View File

@ -18,8 +18,6 @@ package io.nosqlbench.engine.extensions.computefunctions;
import io.nosqlbench.nb.api.components.core.NBBaseComponent; import io.nosqlbench.nb.api.components.core.NBBaseComponent;
import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.components.core.NBComponent;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.Arrays; import java.util.Arrays;
import java.util.DoubleSummaryStatistics; import java.util.DoubleSummaryStatistics;
@ -45,8 +43,6 @@ import java.util.HashSet;
* elide duplicates internally. * elide duplicates internally.
*/ */
public class ComputeFunctions extends NBBaseComponent { public class ComputeFunctions extends NBBaseComponent {
private final static Logger logger = LogManager.getLogger("RUNTIME");
public ComputeFunctions(NBComponent parentComponent) { public ComputeFunctions(NBComponent parentComponent) {
super(parentComponent); super(parentComponent);
} }
@ -68,13 +64,14 @@ public class ComputeFunctions extends NBBaseComponent {
} }
public static double recall(long[] relevant, long[] actual, int k) { public static double recall(long[] relevant, long[] actual, int k) {
if (actual.length < k) {
logger.warn("Returned indices fewer than limit in recall calculation: index count=" + actual.length + ", limit=" + k); if (relevant.length < actual.length) {
throw new RuntimeException("Result indices greater than ground truth size, invalid precision computation: " +
"index count=" + actual.length + ", ground truth=" + relevant.length + ", limit=" + k);
} }
long divisor = Math.min(relevant.length, k); long divisor = Math.min(relevant.length, k);
int arrayLength = Math.max(relevant.length, actual.length); relevant = Arrays.copyOfRange(relevant,0,relevant.length);
relevant = Arrays.copyOfRange(relevant,0,arrayLength); actual = Arrays.copyOfRange(actual, 0, relevant.length);
actual = Arrays.copyOfRange(actual, 0, arrayLength);
Arrays.sort(relevant); Arrays.sort(relevant);
Arrays.sort(actual); Arrays.sort(actual);
long[] intersection = Intersections.find(relevant, actual); long[] intersection = Intersections.find(relevant, actual);
@ -89,12 +86,12 @@ public class ComputeFunctions extends NBBaseComponent {
} }
public static double precision(long[] relevant, long[] actual, int k) { public static double precision(long[] relevant, long[] actual, int k) {
if (actual.length < k) { if (relevant.length < actual.length) {
logger.warn("Returned indices fewer than limit in recall calculation: index count=" + actual.length + ", limit=" + k); throw new RuntimeException("Result indices greater than ground truth size, invalid precision computation: " +
"index count=" + actual.length + ", ground truth=" + relevant.length + ", limit=" + k);
} }
int arrayLength = Math.max(relevant.length, actual.length); relevant = Arrays.copyOfRange(relevant,0,relevant.length);
relevant = Arrays.copyOfRange(relevant,0,arrayLength); actual = Arrays.copyOfRange(actual, 0, relevant.length);
actual = Arrays.copyOfRange(actual, 0, arrayLength);
Arrays.sort(relevant); Arrays.sort(relevant);
Arrays.sort(actual); Arrays.sort(actual);
long[] intersection = Intersections.find(relevant, actual); long[] intersection = Intersections.find(relevant, actual);
@ -118,13 +115,13 @@ public class ComputeFunctions extends NBBaseComponent {
} }
public static double recall(int[] relevant, int[] actual, int k) { public static double recall(int[] relevant, int[] actual, int k) {
if (actual.length < k) { if (relevant.length < actual.length) {
logger.warn("Returned indices fewer than limit in recall calculation: index count=" + actual.length + ", limit=" + k); throw new RuntimeException("Result indices greater than ground truth size, invalid precision computation: " +
"index count=" + actual.length + ", ground truth=" + relevant.length + ", limit=" + k);
} }
long divisor = Math.min(relevant.length, k); long divisor = Math.min(relevant.length, k);
int arrayLength = Math.max(relevant.length, actual.length); relevant = Arrays.copyOfRange(relevant,0,relevant.length);
relevant = Arrays.copyOfRange(relevant,0,arrayLength); actual = Arrays.copyOfRange(actual, 0, relevant.length);
actual = Arrays.copyOfRange(actual, 0, arrayLength);
Arrays.sort(relevant); Arrays.sort(relevant);
Arrays.sort(actual); Arrays.sort(actual);
int intersection = Intersections.count(relevant, actual); int intersection = Intersections.count(relevant, actual);
@ -139,12 +136,12 @@ public class ComputeFunctions extends NBBaseComponent {
} }
public static double precision(int[] relevant, int[] actual, int k) { public static double precision(int[] relevant, int[] actual, int k) {
if (actual.length < k) { if (relevant.length < actual.length) {
logger.warn("Returned indices fewer than limit in recall calculation: index count=" + actual.length + ", limit=" + k); throw new RuntimeException("Result indices greater than ground truth size, invalid precision computation: " +
"index count=" + actual.length + ", ground truth=" + relevant.length + ", limit=" + k);
} }
int arrayLength = Math.max(relevant.length, actual.length); relevant = Arrays.copyOfRange(relevant,0,relevant.length);
relevant = Arrays.copyOfRange(relevant,0,arrayLength); actual = Arrays.copyOfRange(actual, 0, relevant.length);
actual = Arrays.copyOfRange(actual, 0, arrayLength);
Arrays.sort(relevant); Arrays.sort(relevant);
Arrays.sort(actual); Arrays.sort(actual);
int intersection = Intersections.count(relevant, actual); int intersection = Intersections.count(relevant, actual);