Improved the statistics that are generated for evaluating the system; configuration file: now default and user-specified.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/uk/ac/ox/cs/pagoda/Pagoda.java b/src/uk/ac/ox/cs/pagoda/Pagoda.java
index da876b5..ace6851 100644
--- a/src/uk/ac/ox/cs/pagoda/Pagoda.java
+++ b/src/uk/ac/ox/cs/pagoda/Pagoda.java
@@ -158,13 +158,15 @@ public class Pagoda implements Runnable {
     }
 
     private String getStatisticsFilename(PagodaProperties properties, String queryFile) {
-        String statisticsFilename = "statistics_" +
-                FilenameUtils.removeExtension(FilenameUtils.getName(properties.getOntologyPath().replaceAll("_", "-")));
+        String statisticsFilename = "statistics";
+        statisticsFilename += "_" + FilenameUtils.removeExtension(FilenameUtils.getName(properties.getOntologyPath().replaceAll("_", "-")));
+        statisticsFilename += "_" + FilenameUtils.removeExtension(FilenameUtils.getName(properties.getDataPath().replaceAll("_", "-")));
         statisticsFilename += "_" + FilenameUtils.removeExtension(FilenameUtils.getName(queryFile).replaceAll("_", "-"));
         statisticsFilename += "_" + ((properties.getSkolemUpperBound() == PagodaProperties.SkolemUpperBoundOptions.DISABLED)
                 ? "" : (properties.getSkolemUpperBound() == PagodaProperties.SkolemUpperBoundOptions.BEFORE_SUMMARISATION)
                 ? "before" : "after");
-        statisticsFilename += "_" + properties.getSkolemDepth();
+        statisticsFilename += "_skd" + properties.getSkolemDepth();
+        statisticsFilename += "_maxtrpl" + properties.getMaxTriplesInSkolemStore();
         statisticsFilename += ".json";
         statisticsFilename = FilenameUtils.concat(properties.getStatisticsDir().toString(),
                                                   statisticsFilename);