2 files changed, 14 insertions, 6 deletions

diff --git a/scripts/Violations_processor.py b/scripts/Violations_processor.py
index 62c1ade..2178d87 100644
--- a/scripts/Violations_processor.py
+++ b/scripts/Violations_processor.py
@@ -17,7 +17,7 @@ class Cleaner:
             self._used_words = 0
             self._cache = {}
 
-    def clean(self, violation, prefix):
+    def clean(self, violation, prefix, query_predicate=None):
         j = 0
         atoms = []
         for i in range(3):
@@ -25,8 +25,11 @@ class Cleaner:
             j = violation.find('>', i)
             atom = violation[i:j]
             if atom not in self._cache:
-                self._cache[atom] = str(prefix) + self._words[self._used_words]
-                self._used_words += 1
+                if atom == query_predicate:
+                    self._cache[atom] = 'Q'
+                else:
+                    self._cache[atom] = str(prefix) + self._words[self._used_words]
+                    self._used_words += 1
             atoms.append(self._cache[atom])
         return '%10s(X) -> %10s(X,Y), %10s(Y)' % (atoms[2], atoms[0], atoms[1])
 
@@ -34,6 +37,7 @@ class Cleaner:
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Transform violations (as output by PAGOdA) into a very readable form.')
     parser.add_argument('input', help='json file containing violations')
+    parser.add_argument('-q', help='query predicate')
     args = parser.parse_args()
 
     cleaner = Cleaner()
@@ -42,7 +46,7 @@ if __name__ == '__main__':
         clean_rules_list_list = []
         i = 0
         for violations_list in violations_list_list:
-            clean_rules_list_list.append(sorted(map(lambda x: cleaner.clean(x, i), violations_list)))
+            clean_rules_list_list.append(sorted(map(lambda x: cleaner.clean(x, i, args.q), violations_list)))
             i += 1
     print json.dumps(clean_rules_list_list, indent=2)
         
diff --git a/src/uk/ac/ox/cs/pagoda/util/PagodaProperties.java b/src/uk/ac/ox/cs/pagoda/util/PagodaProperties.java
index 2c53063..e501821 100644
--- a/src/uk/ac/ox/cs/pagoda/util/PagodaProperties.java
+++ b/src/uk/ac/ox/cs/pagoda/util/PagodaProperties.java
@@ -42,11 +42,15 @@ public class PagodaProperties {
                         if(config.containsKey("useAlwaysSimpleUpperBound")) {
                                 defaultUseAlwaysSimpleUpperBound =
                                                 Boolean.parseBoolean(config.getProperty("useAlwaysSimpleUpperBound"));
-                                logger.info("The simple upper bound is always used");
+                                if(defaultUseAlwaysSimpleUpperBound)
+                                        logger.info("By default the simple upper bound is always used");
                         }
                         if(config.containsKey("useSkolemUpperBound")) {
                                 defaultUseSkolemUpperBound = Boolean.parseBoolean(config.getProperty("useSkolemUpperBound"));
-                                logger.info("The Skolem upper bound is enabled");
+                                if(defaultUseSkolemUpperBound)
+                                        logger.info("By default the Skolem upper bound is enabled");
+                                else
+                                        logger.info("By default the Skolem upper bound is disabled");
                         }
 
                 } catch(IOException e) {