From 45616f650111c1d0236d22fcb5f3b4e5e8b68550 Mon Sep 17 00:00:00 2001
From: RncLsn <rnc.lsn@gmail.com>
Date: Sun, 13 Sep 2015 17:52:00 +0100
Subject: Bug fix for a NullPointerException.

---
 pom.xml                                              | 2 +-
 src/uk/ac/ox/cs/pagoda/Pagoda.java                   | 3 ++-
 src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java | 2 +-
 test/resources/MainTests.xml                         | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index bb5186b..ffe18ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>uk.ac.ox.cs.pagoda</groupId>
 	<artifactId>pagoda</artifactId>
-	<version>2.1.2-SNAPSHOT</version>
+	<version>2.1.2</version>
 	<packaging>jar</packaging>
 	<name>PAGOdA</name>
 	<build>
diff --git a/src/uk/ac/ox/cs/pagoda/Pagoda.java b/src/uk/ac/ox/cs/pagoda/Pagoda.java
index ace6851..6a1946e 100644
--- a/src/uk/ac/ox/cs/pagoda/Pagoda.java
+++ b/src/uk/ac/ox/cs/pagoda/Pagoda.java
@@ -160,7 +160,8 @@ public class Pagoda implements Runnable {
     private String getStatisticsFilename(PagodaProperties properties, String queryFile) {
         String statisticsFilename = "statistics";
         statisticsFilename += "_" + FilenameUtils.removeExtension(FilenameUtils.getName(properties.getOntologyPath().replaceAll("_", "-")));
-        statisticsFilename += "_" + FilenameUtils.removeExtension(FilenameUtils.getName(properties.getDataPath().replaceAll("_", "-")));
+        if(properties.getDataPath() != null)
+            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)
diff --git a/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java b/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
index 8cc9209..ae57670 100644
--- a/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
+++ b/src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
@@ -74,7 +74,7 @@ class MyQueryReasoner extends QueryReasoner {
         program = new DatalogProgram(ontology);
 //		program.getLower().save();
 //		program.getUpper().save();
-		program.getGeneral().save();
+//		program.getGeneral().save();
 
         if(!program.getGeneral().isHorn())
             lazyUpperStore = new MultiStageQueryEngine("lazy-upper-bound", true);
diff --git a/test/resources/MainTests.xml b/test/resources/MainTests.xml
index c0cac4f..ec299b5 100644
--- a/test/resources/MainTests.xml
+++ b/test/resources/MainTests.xml
@@ -14,10 +14,10 @@
         </groups>
         <classes>
             <!--<class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaReactome"/>-->
-            <class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaUOBM"/>
+            <!--<class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaUOBM"/>-->
             <!--<class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaLUBM"/>-->
             <!--Fly does not terminate: query-5 looks really hard-->
-            <!--<class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaFLY"/>-->
+            <class name="uk.ac.ox.cs.pagoda.global_tests.TestPagodaFLY"/>
             <!--<class name="uk.ac.ox.cs.pagoda.global_tests.SkolemisationTests"/>-->
             <!--<class name="uk.ac.ox.cs.pagoda.util.SimpleProgressBarTester" />-->
         </classes>
-- 
cgit v1.2.3