From 4fe35ae937455fef1f6166190e8dd5b5c4308c50 Mon Sep 17 00:00:00 2001 From: Joachim Klein Date: Mon, 28 Aug 2017 12:45:48 +0200 Subject: [PATCH] param.Region: Support splitting without a provided constraint Currently, constraint is not used anyways --- prism/src/param/BoxRegion.java | 8 +++++++- prism/src/param/Region.java | 12 +++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/prism/src/param/BoxRegion.java b/prism/src/param/BoxRegion.java index 84890049..40537b09 100644 --- a/prism/src/param/BoxRegion.java +++ b/prism/src/param/BoxRegion.java @@ -470,11 +470,17 @@ final class BoxRegion extends Region { } return result; } - + @Override ArrayList split(Function constraint) { // TODO could implement more clever splitting using constraints + return split(); + } + + @Override + ArrayList split() + { if (((BoxRegionFactory) factory).getSplitMethod() == SPLIT_LONGEST) { return splitLongest(); } else if (((BoxRegionFactory) factory).getSplitMethod() == SPLIT_ALL) { diff --git a/prism/src/param/Region.java b/prism/src/param/Region.java index fb703816..41b72f7c 100644 --- a/prism/src/param/Region.java +++ b/prism/src/param/Region.java @@ -97,13 +97,19 @@ abstract class Region { /** * Splits this region into several parts. * How this is done exactly depends on the implementation in derived - * classes. + * classes. Can take constraint into account. * * @param constraint - * @return */ abstract ArrayList split(Function constraint); - + + /** + * Splits this region into several parts. + * How this is done exactly depends on the implementation in derived + * classes. + */ + abstract ArrayList split(); + abstract ArrayList specialPoints(); abstract Point randomPoint();