fix the calculation of the penalized metrics

dice-group · Oct 24, 2023 · 6071968 · 6071968
1 parent 169ae33
commit 6071968
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/AvgQPSMetric.java b/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/AvgQPSMetric.java
@@ -48,14 +48,15 @@ protected void qpsClose(){
             for(Object queryID : value.keySet()){
                 Object[] resArr = (Object[]) value.get(queryID);
                 Double qps = (long)resArr[1]*1.0/((double)resArr[0]/1000.0);
-                Double penalizedQPS = (long)resArr[1]*1.0/((double)resArr[7]/1000.0);
-                map.putIfAbsent(queryID, new Number[]{Double.valueOf(0), Long.valueOf(0), Double.valueOf(0)});
+                Double penalizedQPS = ((long)resArr[1] + (long)resArr[2]) *1.0/((double)resArr[7]/1000.0);
+                map.putIfAbsent(queryID, new Number[]{Double.valueOf(0), Long.valueOf(0), Long.valueOf(0), Double.valueOf(0)});
 
                 Number[] current =map.get(queryID);
                 Long succ = (long)resArr[1]+(Long)current[1];
+                Long fail = (long)resArr[2]+(Long)current[2];
                 Double time = (double)resArr[0]+(Double)current[0];
-                Double penTime = (double)resArr[7]+(Double)current[2];
-                map.put(queryID, new Number[]{time, succ, penTime});
+                Double penTime = (double)resArr[7]+(Double)current[3];
+                map.put(queryID, new Number[]{time, succ, fail, penTime});
                 avgQps+=qps;
                 penalizedAvgQps+=penalizedQPS;
             }
@@ -71,7 +72,7 @@ protected void qpsClose(){
         Double penalizedAvgQps=0.0;
         for(Object queryID : map.keySet()) {
             Double qps = (Long)map.get(queryID)[1]*1.0/((Double)map.get(queryID)[0]/1000.0);
-            Double penalizedQPS = (long)map.get(queryID)[1]*1.0/((double)map.get(queryID)[2]/1000.0);
+            Double penalizedQPS = ((long)map.get(queryID)[1] + (long)map.get(queryID)[2]) *1.0/((double)map.get(queryID)[3]/1000.0);
             avgQps+=qps;
             penalizedAvgQps+=penalizedQPS;
         }

diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/QPSMetric.java b/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/QPSMetric.java
@@ -176,7 +176,7 @@ private void addToModel(Map<Object, Object> value, Resource subjectParent, Model
 			if(map!=null)
 				mergeResults(map, queryID, resArr);
 			Double qps = (long)resArr[1]*1.0/((double)resArr[0]/1000.0);
-			Double pqps = (long)resArr[1]*1.0/((double)resArr[7]/1000.0);
+			Double pqps = ((long)resArr[1] + (long)resArr[2]) * 1.0 / ((double)resArr[7]/1000.0);
 
 			Resource query = ResourceFactory.createResource(subjectParent.getURI()+"/"+queryID);
 			m.add(subjectParent, queryProperty, query);