Fix analysis report

Author: Tobias Hafner

src/main/java/org/polypheny/simpleclient/scenario/scalingBench/ErrorHandlingEvaluationThread.java

@@ -65,6 +65,7 @@ protected void executeAndMeasure( QueryListEntry queryListEntry ) {
             executor.executeQuery( queryListEntry.query );
 
             long measuredTime = System.nanoTime() - startTime;
+
             measuredTimes.add( measuredTime );
             measuredTimePerQueryType.get( queryListEntry.templateId ).add( measuredTime );
             for ( Integer id : queryListEntry.templateIds ) {

src/main/java/org/polypheny/simpleclient/scenario/scalingBench/ErrorHandlingPolyphenyScenario.java

@@ -114,18 +114,23 @@ protected long commonExecuteWithExpectedErrors( List<QueryListEntry> queries, Pr
     @Override
     public void analyze( Properties properties, File outputDirectory ) {
         properties.put( "executeRuntime [s]", executeRuntime / 1000000000.0 );
-        properties.put( "measuredTime [ns]", calculateMean( measuredTimes ) );
+        properties.put( "measuredTime [ms]", calculateMean( measuredTimes ) );
 
-        properties.put( "numberOfQueries", measuredTimes.size() + failedQueries );
-        properties.put( "numberOfSuccessfulQueries", measuredTimes.size() );
+        properties.put( "numberOfQueries", measuredTimes.size());
+        properties.put( "numberOfSuccessfulQueries", measuredTimes.size() - failedQueries);
         properties.put( "numberOfFailedQueries", failedQueries );
+        properties.put("successRatio", calculateSuccessRatio() );
 
         properties.put( "throughput [succ.q/s]", measuredTimes.size() / (executeRuntime / 1000000000.0) );
-        properties.put( "querySuccessRatio", measuredTimes.size() / (measuredTimes.size() + failedQueries));
 
         measuredTimePerQueryType.forEach( ( templateId, time ) -> calculateResults( queryTypes, properties, templateId, time ) );
         properties.put( "queryTypes_maxId", queryTypes.size() );
     }
 
+    private double calculateSuccessRatio() {
+        double unroundedRatio = (1.0 * measuredTimes.size() - failedQueries) / measuredTimes.size();
+        return Math.round( unroundedRatio * 100.0 ) / 100.0;
+    }
+
 
 }

src/main/java/org/polypheny/simpleclient/scenario/scalingBench/LockingBench.java

@@ -183,11 +183,10 @@ public synchronized void store( OutputStream out, String comments) throws IOExce
         File analysisFile = new File(outputDirectory, fileName);
         analyze(analysis, analysisFile);
 
-        analysis.put( "number_of_sessions", config.sessionCount );
-        analysis.put( "number_of_namespaces", config.namespaceCount );
-        analysis.put("number_of_entities_per_namespace", config.entityCount );
-        analysis.put( "number_of_queries", config.numberOfQueries );
-        analysis.put( "read_write_ratio", config.readWriteRatio );
+        analysis.put( "numberOfSessions", config.sessionCount );
+        analysis.put( "numberOfNamespaces", config.namespaceCount );
+        analysis.put("numberOfEntitiesPerNamespace", config.entityCount );
+        analysis.put( "readWriteRatio", config.readWriteRatio );
 
         try (FileOutputStream out = new FileOutputStream(analysisFile)) {
             analysis.store(out, "Analysis results");