diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-07-04 08:39:52 -0700 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-07-04 08:39:52 -0700 |
commit | 5492ad488db1c460a08fa92890205c37c1456db6 (patch) | |
tree | f956ef67434eca3dd093d2f430e17df7b4d3bb8e /model-integration | |
parent | 3be34404a96cd782a7f259f29491581272b00c11 (diff) |
Simplify
Diffstat (limited to 'model-integration')
-rw-r--r-- | model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java index f4cf1b5fabc..22fabe3ada7 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java @@ -68,17 +68,14 @@ public class DimensionRenamer { } private Map<String, Integer> solve(int maxIterations) { - Map<String, Integer> solution = solveWithOrWithoutSoftConstraints(maxIterations); int renamesTried = 0; - while (solution == null && renamesTried++ < dimensions.size()) { - boolean inserted = insertRenameOperation(); - if ( ! inserted ) break; - solution = solveWithOrWithoutSoftConstraints(maxIterations); + while (renamesTried++ <= dimensions.size()) { + Map<String, Integer> solution = solveWithOrWithoutSoftConstraints(maxIterations); + if (solution != null) return solution; + if ( ! insertRenameOperation()) return null; } - if ( solution == null) - throw new IllegalArgumentException("Could not find a dimension naming solution " + - "given constraints\n" + constraintsToString(constraints)); - return solution; + throw new IllegalArgumentException("Could not find a dimension naming solution " + + "given constraints\n" + constraintsToString(constraints)); } private boolean insertRenameOperation() { |