Merge pull request #59 from JuliaConstraints/fix_types

Fix types

Author: Azzaare

Project.toml

@@ -1,7 +1,7 @@
 name = "Constraints"
 uuid = "30f324ab-b02d-43f0-b619-e131c61659f7"
 authors = ["Jean-François Baffier"]
-version = "0.5.9"
+version = "0.5.10"
 
 [deps]
 CompositionalNetworks = "4b67e4b5-442d-4ef5-b760-3f5df3a57537"

src/constraints/all_equal.jl

@@ -36,7 +36,8 @@ c([1, 2, 3, 4]; op=*, val=1, pair_vars=[1, 2, 3, 4])
 """
 xcsp_all_equal(; list) = concept_all_equal(list; val = first(list))
 
-@usual function concept_all_equal(x; val = nothing, pair_vars = zero(x), op = +)
+@usual function concept_all_equal(
+        x; val = nothing, pair_vars = zeros(eltype(x), length(x)), op = +)
     if iszero(pair_vars)
         return concept_all_equal(x, val)
     else

src/constraints/channel.jl

@@ -57,11 +57,13 @@ end
 function xcsp_channel(; list)
     xcsp_channel(values(list))
 end
-function concept_channel(x, ::Val{2})
+function concept_channel(x::AbstractVector, ::Val{2})
     mid = length(x) ÷ 2
     return xcsp_channel(list = (@view(x[1:mid]), @view(x[(mid + 1):end])))
 end
 
+concept_channel(x, ::Val{2}) = concept_channel(collect(x), Val(2))
+
 concept_channel(x, ::Val) = xcsp_channel(list = x)
 
 concept_channel(x, id) = count(!iszero, x) == 1 == x[id]

src/constraints/no_overlap.jl

@@ -87,7 +87,7 @@ end
 function concept_no_overlap(x, pair_vars, dim, bool, _)
     l = Int(length(x) ÷ dim)
     # @info l x dim
-    origins = reinterpret(reshape, NTuple{dim, eltype(x)}, reshape(x, (dim, l)))
+    origins = reinterpret(reshape, NTuple{dim, eltype(x)}, reshape(collect(x), (dim, l)))
     lengths = reinterpret(
         reshape, NTuple{dim, eltype(x)}, reshape(pair_vars[:, 1], (dim, l)))
     return xcsp_no_overlap(; origins, lengths, zero_ignored = bool)