Skip to content

Commit

Permalink
Merge pull request #54 from JuliaConstraints/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Azzaare authored Oct 8, 2024
2 parents 38cecf6 + 29a6c46 commit 67c8ebd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
4 changes: 2 additions & 2 deletions src/constraints/extension.jl
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ Global constraint ensuring that `x` matches a configuration listed within the su
const description_conflicts = """
Global constraint ensuring that `x` does not match any configuration listed within the conflict set `pair_vars`. This constraint, originating from the extension model, stipulates that `x` must avoid all configurations defined as conflicts: `x ∉ pair_vars`. It is useful for specifying configurations that are explicitly forbidden and should be excluded from the solution space.
"""

xcsp_extension(list, ::Nothing, ::Nothing) = false
xcsp_extension(list, ::Nothing, conflicts) = list conflicts
xcsp_extension(list, supports, _) = list supports
xcsp_extension(list, supports, ::Nothing) = list supports

"""
xcsp_extension(; list, supports=nothing, conflicts=nothing)
Expand Down
17 changes: 1 addition & 16 deletions src/constraints/intention.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,7 @@ concept(:dist_different)(x)
```
# Examples
````@example debug2
2 + 2
````
```@example debug1
2 + 2
```
```@example intention1
using Constraints # hide
c = concept(:dist_different)
c([1, 2, 3, 3]) && !c([1, 2, 3, 4])
```
````@example intention2
````julia
using Constraints # hide
c = concept(:dist_different)
c([1, 2, 3, 3]) && !c([1, 2, 3, 4])
Expand Down

0 comments on commit 67c8ebd

Please sign in to comment.