From ee61b2376e46b36e230cc7333009bba95b617abb Mon Sep 17 00:00:00 2001 From: cprudhom Date: Thu, 12 Oct 2023 15:50:38 +0200 Subject: [PATCH] `isNeq` instead of `neqView` --- .../expression/discrete/relational/UnCReExpression.java | 2 +- .../java/org/chocosolver/solver/variables/IViewFactory.java | 6 +++--- .../java/org/chocosolver/solver/variables/ViewsTest.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/solver/src/main/java/org/chocosolver/solver/expression/discrete/relational/UnCReExpression.java b/solver/src/main/java/org/chocosolver/solver/expression/discrete/relational/UnCReExpression.java index 9f03d63c70..993f6ff0e9 100644 --- a/solver/src/main/java/org/chocosolver/solver/expression/discrete/relational/UnCReExpression.java +++ b/solver/src/main/java/org/chocosolver/solver/expression/discrete/relational/UnCReExpression.java @@ -99,7 +99,7 @@ public BoolVar boolVar() { me = model.isGeq(v1, e2 + 1); break; case NE: - me = model.neqView(v1, e2); + me = model.isNeq(v1, e2); break; case EQ: me = model.isEq(v1, e2); diff --git a/solver/src/main/java/org/chocosolver/solver/variables/IViewFactory.java b/solver/src/main/java/org/chocosolver/solver/variables/IViewFactory.java index 17e395d0f2..2e48fd278f 100644 --- a/solver/src/main/java/org/chocosolver/solver/variables/IViewFactory.java +++ b/solver/src/main/java/org/chocosolver/solver/variables/IViewFactory.java @@ -303,7 +303,7 @@ default IntVar mul(IntVar var, int a) { * @param v a constant * @return a boolean view */ - default BoolVar neqView(IntVar var, int v) { + default BoolVar isNeq(IntVar var, int v) { if (var.isInstantiatedTo(v)) { return ref().boolVar(false); } else if (!var.contains(v)) { @@ -414,11 +414,11 @@ default BoolVar intEqView(IntVar x, int c) { * @param c a constant * @return a BoolVar that reifies x != c * @deprecated - * @see #neqView(IntVar, int) + * @see #isNeq(IntVar, int) */ @Deprecated default BoolVar intNeView(IntVar x, int c) { - return neqView(x, c); + return isNeq(x, c); } /** diff --git a/solver/src/test/java/org/chocosolver/solver/variables/ViewsTest.java b/solver/src/test/java/org/chocosolver/solver/variables/ViewsTest.java index 730557cfdb..d14874c420 100644 --- a/solver/src/test/java/org/chocosolver/solver/variables/ViewsTest.java +++ b/solver/src/test/java/org/chocosolver/solver/variables/ViewsTest.java @@ -920,7 +920,7 @@ public void testMagnusR4() { final IntVar[] vars = model.intVarArray(n, 0, n); model.allDifferent(vars).post(); final IntVar[] ges = Stream.of(vars).map( - v -> model.neqView(v, n / 2) + v -> model.isNeq(v, n / 2) ) .toArray(IntVar[]::new);