Return rather precise seconds instead of milliseconds in benchmarks
diff --git a/src/main/java/de/ids_mannheim/korap/KorapResult.java b/src/main/java/de/ids_mannheim/korap/KorapResult.java
index 4c22cd7..7f4cf54 100644
--- a/src/main/java/de/ids_mannheim/korap/KorapResult.java
+++ b/src/main/java/de/ids_mannheim/korap/KorapResult.java
@@ -140,7 +140,7 @@
};
public void setBenchmarkSearchResults (long t1, long t2) {
- this.benchmarkSearchResults = (t2 - t1) * 1e-6 + " ms";
+ this.benchmarkSearchResults = ((double)(t2 - t1) / 1000000000.0) + " s";
};
public String getBenchmarkSearchResults () {
@@ -148,7 +148,7 @@
};
public void setBenchmarkHitCounter (long t1, long t2) {
- this.benchmarkHitCounter = (t2 - t1) * 1e-6 + " ms";
+ this.benchmarkHitCounter = ((double)(t2 - t1) / 1000000000.0) + " s";
};
public String getBenchmarkHitCounter () {
diff --git a/src/test/java/de/ids_mannheim/korap/benchmark/TestBenchmarkElementSpans.java b/src/test/java/de/ids_mannheim/korap/benchmark/TestBenchmarkElementSpans.java
index e7d11a3..39c3c2a 100644
--- a/src/test/java/de/ids_mannheim/korap/benchmark/TestBenchmarkElementSpans.java
+++ b/src/test/java/de/ids_mannheim/korap/benchmark/TestBenchmarkElementSpans.java
@@ -79,9 +79,11 @@
};
t2 = System.nanoTime();
-
- System.out.println("It took " + ((t2 - t1) / rounds) * 1e-6 + " ms per query");
+ // long seconds = (long) (t2 - t1 / 1000) % 60 ;
+ double seconds = (double)(t2-t1) / 1000000000.0;
+
+ System.out.println("It took " + seconds + " seconds");
// kc = new KorapCollection("{\"meta\":[{\"@type\":\"korap:meta-filter\",\"@value\":{\"@type\":\"korap:term\",\"@field\":\"korap:field#corpusID\",\"@value\":\"A00\"}},{\"@type\":\"korap:meta-extend\",\"@value\":{\"@type\":\"korap:term\",\"@field\":\"korap:field#corpusID\",\"@value\":\"A01\"}}]}");
diff --git a/src/test/resources/queries/bsp19.jsonld b/src/test/resources/queries/bsp19.jsonld
index 5710602..5145e9f 100644
--- a/src/test/resources/queries/bsp19.jsonld
+++ b/src/test/resources/queries/bsp19.jsonld
@@ -4,43 +4,46 @@
"@type" : "korap:group",
"operation" : "operation:sequence",
"inOrder" : true,
- "distances" : [ {
- "@type" : "korap:distance",
- "key" : "w",
- "min" : 1,
- "max" : 3
- }, {
- "@type" : "korap:distance",
- "key" : "s",
- "min" : 0,
- "max" : 1
- } ],
- "operands" : [ {
- "@type" : "korap:token",
- "wrap" : {
- "@type" : "korap:term",
- "key" : "das",
- "layer" : "orth",
- "match" : "match:eq"
+ "distances" : [
+ {
+ "@type" : "korap:distance",
+ "key" : "w",
+ "min" : 1,
+ "max" : 3
+ }, {
+ "@type" : "korap:distance",
+ "key" : "s",
+ "min" : 0,
+ "max" : 1
}
- }, {
- "@type" : "korap:token",
- "wrap" : {
- "@type" : "korap:term",
- "key" : "Buch",
- "layer" : "orth",
- "match" : "match:eq"
+ ],
+ "operands" : [
+ {
+ "@type" : "korap:token",
+ "wrap" : {
+ "@type" : "korap:term",
+ "key" : "das",
+ "layer" : "orth",
+ "match" : "match:eq"
+ }
+ }, {
+ "@type" : "korap:token",
+ "wrap" : {
+ "@type" : "korap:term",
+ "key" : "Buch",
+ "layer" : "orth",
+ "match" : "match:eq"
+ }
}
- }
- ]
+ ]
},
"meta" : {
- "count":25,
- "cutOff":true,
+ "count": 25,
+ "cutOff": true,
"context":{
- "left":["char",110],
- "right":["char",110]
+ "left": [ "char", 110 ],
+ "right": [ "char", 110 ]
},
- "startPage":1
+ "startPage": 1
}
}