diff options
Diffstat (limited to 'src/uk/ac/ox/cs/pagoda/Pagoda.java')
| -rw-r--r-- | src/uk/ac/ox/cs/pagoda/Pagoda.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/uk/ac/ox/cs/pagoda/Pagoda.java b/src/uk/ac/ox/cs/pagoda/Pagoda.java index 7d2317d..08b2cba 100644 --- a/src/uk/ac/ox/cs/pagoda/Pagoda.java +++ b/src/uk/ac/ox/cs/pagoda/Pagoda.java | |||
| @@ -143,7 +143,9 @@ public class Pagoda implements Runnable { | |||
| 143 | String statisticsFilename = "statistics_" + | 143 | String statisticsFilename = "statistics_" + |
| 144 | FilenameUtils.removeExtension(FilenameUtils.getName(properties.getOntologyPath().replaceAll("_", "-"))); | 144 | FilenameUtils.removeExtension(FilenameUtils.getName(properties.getOntologyPath().replaceAll("_", "-"))); |
| 145 | statisticsFilename += "_" + FilenameUtils.removeExtension(FilenameUtils.getName(queryFile).replaceAll("_", "-")); | 145 | statisticsFilename += "_" + FilenameUtils.removeExtension(FilenameUtils.getName(queryFile).replaceAll("_", "-")); |
| 146 | statisticsFilename += "_" + ((properties.getUseSkolemUpperBound()) ? "skolem" : ""); | 146 | statisticsFilename += "_" + ((properties.getSkolemUpperBound() == PagodaProperties.SkolemUpperBoundOptions.DISABLED) |
| 147 | ? "" : (properties.getSkolemUpperBound() == PagodaProperties.SkolemUpperBoundOptions.BEFORE_SUMMARISATION) | ||
| 148 | ? "before" : "after"); | ||
| 147 | statisticsFilename += ".json"; | 149 | statisticsFilename += ".json"; |
| 148 | statisticsFilename = FilenameUtils.concat(properties.getStatisticsDir().toString(), | 150 | statisticsFilename = FilenameUtils.concat(properties.getStatisticsDir().toString(), |
| 149 | statisticsFilename); | 151 | statisticsFilename); |
| @@ -213,9 +215,15 @@ public class Pagoda implements Runnable { | |||
| 213 | return this; | 215 | return this; |
| 214 | } | 216 | } |
| 215 | 217 | ||
| 216 | public PagodaBuilder skolem(Boolean isEnabled) { | 218 | public PagodaBuilder skolem(PagodaProperties.SkolemUpperBoundOptions option) { |
| 217 | if(instance == null) return null; | 219 | if(instance == null) return null; |
| 218 | instance.properties.setUseSkolemUpperBound(isEnabled); | 220 | instance.properties.setSkolemUpperBound(option); |
| 221 | return this; | ||
| 222 | } | ||
| 223 | |||
| 224 | public PagodaBuilder skolemDepth(int depth) { | ||
| 225 | if(instance == null) return null; | ||
| 226 | instance.properties.setSkolemDepth(depth); | ||
| 219 | return this; | 227 | return this; |
| 220 | } | 228 | } |
| 221 | 229 | ||
