Merge pull request #761 from gridap/issue_760

Bugfix for issue #760

Author: fverdugo

src/Arrays/PosNegReindex.jl

@@ -62,15 +62,23 @@ function lazy_map(::typeof(evaluate),::Type{T},a::LazyArray{<:Fill{<:PosNegReind
 end
 
 function lazy_map(::typeof(evaluate),::Type{T},a::LazyArray{<:Fill{<:PosNegReindex}},x::AbstractArray) where T
+  i_to_iposneg = a.args[1]
+  _lazy_map_evaluate_posneg(i_to_iposneg,T,a,x)
+end
+
+function _lazy_map_evaluate_posneg(i_to_iposneg,::Type{T},a,x) where T
   apos = a.maps.value.values_pos
   aneg = a.maps.value.values_neg
-  i_to_iposneg = a.args[1]
-  ipos_to_i, ineg_to_i = pos_and_neg_indices(i_to_iposneg)
-  xpos = lazy_map(Reindex(x),ipos_to_i)
-  xneg = lazy_map(Reindex(x),ineg_to_i)
-  cpos = lazy_map(evaluate,apos,xpos)
-  cneg = lazy_map(evaluate,aneg,xneg)
-  lazy_map(PosNegReindex(cpos,cneg),T,i_to_iposneg)
+  if is_exhaustive(i_to_iposneg)
+    ipos_to_i, ineg_to_i = pos_and_neg_indices(i_to_iposneg)
+    xpos = lazy_map(Reindex(x),ipos_to_i)
+    xneg = lazy_map(Reindex(x),ineg_to_i)
+    cpos = lazy_map(evaluate,apos,xpos)
+    cneg = lazy_map(evaluate,aneg,xneg)
+    lazy_map(PosNegReindex(cpos,cneg),T,i_to_iposneg)
+  else
+    LazyArray(T,a,x)
+  end
 end
 
 function lazy_map(::typeof(evaluate),::Type{T},b::Fill,a::LazyArray{<:Fill{<:PosNegReindex}}...) where T

src/Arrays/Reindex.jl

@@ -69,6 +69,34 @@ function lazy_map(k::Reindex{<:LazyArray{<:Fill{<:PosNegReindex}}},::Type{T},j_t
   end
 end
 
+function _lazy_map_evaluate_posneg(
+  i_to_jposneg::LazyArray{<:Fill{<:Reindex}},::Type{T},i_a,i_x::Fill) where T
+  i_y = CompressedArray([i_x.value],Fill(Int32(1),length(i_x)))
+  _lazy_map_evaluate_posneg(i_to_jposneg,T,i_a,i_y)
+end
+
+function _lazy_map_evaluate_posneg(i_to_jposneg::LazyArray{<:Fill{<:Reindex}},::Type{T},i_a,i_x::CompressedArray) where T
+  jpos_a = i_a.maps.value.values_pos
+  jneg_a = i_a.maps.value.values_neg
+  j_jposneg = i_to_jposneg.maps.value.values
+  jpos_j, jneg_j = pos_and_neg_indices(j_jposneg)
+  k_x = deepcopy(i_x.values)
+  i_k = i_x.ptrs
+  push!(k_x,testitem(i_x))
+  i_j = i_to_jposneg.args[1]
+  j_k = fill(Int32(length(k_x)),length(j_jposneg))
+  j_k[i_j] .= i_k
+  jpos_k = j_k[jpos_j]
+  jneg_k = j_k[jneg_j]
+  jpos_x = CompressedArray(k_x,jpos_k)
+  jneg_x = CompressedArray(k_x,jneg_k)
+  jpos_b = lazy_map(evaluate,jpos_a,jpos_x)
+  jneg_b = lazy_map(evaluate,jneg_a,jneg_x)
+  j_b = lazy_map(PosNegReindex(jpos_b,jneg_b),j_jposneg)
+  i_b = lazy_map(Reindex(j_b),i_j)
+  i_b
+end
+
 function lazy_map(k::Reindex{<:LazyArray{<:Fill{<:PosNegReindex}}},::Type{T},indices::IdentityVector) where T
   @check length(k.values) == length(indices)
   k.values

test/GridapTests/issue_760.jl

@@ -0,0 +1,23 @@
+module Issue760
+
+using Gridap
+using Test
+
+cells = (2,2)
+domain = (0,1,0,1)
+model = CartesianDiscreteModel(domain,cells)
+
+Ω = Interior(model)
+Ω1 = Interior(model,[1,2])
+Ω2 = Interior(model,[2,4])
+
+f = CellField(1,Ω1)
+x = get_cell_points(Ω2)
+arr = f(x)
+
+#print_op_tree(arr)
+
+@test arr.maps.value.values_pos.values[1] == [1,1,1,1]
+@test arr.maps.value.values_neg.values[1] == [0,0,0,0]
+
+end # module

test/GridapTests/runtests.jl

@@ -38,4 +38,6 @@ using Test
 
 @time @testset "Issue743" begin include("issue_743.jl") end
 
+@time @testset "Issue760" begin include("issue_760.jl") end
+
 end # module