Merge pull request #989 from gridap/remove-subvector

Deprecate `SubVector` in favor of Julia's `view`.
gridap · Mar 29, 2024 · 1a51138 · 1a51138
2 parents 3707376 + 1824d46
commit 1a51138
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 37 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - ODE module extensive refactor. Breaking changes! See docs and PR for details. Since PR[965](https://github.com/gridap/Gridap.jl/pull/965).
 - Fixed name clash with `Statistics.mean`. Since PR[#988](https://github.com/gridap/Gridap.jl/pull/988).
+- Deprecated `SubVector` in favor of Julia's `view`. Since PR[#989](https://github.com/gridap/Gridap.jl/pull/989).
 
 ### Added
 

diff --git a/src/Arrays/Arrays.jl b/src/Arrays/Arrays.jl
@@ -105,7 +105,6 @@ export find_local_index
 
 export IdentityVector
 
-export SubVector
 export pair_arrays
 export unpair_arrays
 
@@ -162,7 +161,7 @@ include("KeyToValMaps.jl")
 
 include("FilteredArrays.jl")
 
-include("SubVectors.jl")
+include("SubVectors.jl") # Deprecated
 
 include("ArrayPairs.jl")
 

diff --git a/src/Arrays/PrintOpTrees.jl b/src/Arrays/PrintOpTrees.jl
@@ -53,10 +53,6 @@ function get_children(n::TreeNode, a::LazyArray)
   (similar_tree_node(n,a.maps),map(i->similar_tree_node(n,i),a.args)...)
 end
 
-function get_children(n::TreeNode, a::SubVector)
-  (similar_tree_node(n,a.vector),)
-end
-
 function get_children(n::TreeNode, a::Reindex)
   (similar_tree_node(n,a.values),)
 end

diff --git a/src/Arrays/SubVectors.jl b/src/Arrays/SubVectors.jl
@@ -5,6 +5,8 @@
       pini::Int
       pend::Int
     end
+  
+  `SubVector` is deprecated, use `view` instead.
 """
 struct SubVector{T,A<:AbstractVector{T}} <: AbstractVector{T}
   vector::A

diff --git a/src/MultiField/MultiFieldFESpaces.jl b/src/MultiField/MultiFieldFESpaces.jl
@@ -301,7 +301,7 @@ function  _restrict_to_field(f,
   offsets = _compute_field_offsets(U)
   pini = offsets[field] + 1
   pend = offsets[field] + num_free_dofs(U[field])
-  SubVector(free_values,pini,pend)
+  view(free_values,pini:pend)
 end
 
 function  _restrict_to_field(f,
@@ -320,7 +320,7 @@ function  _restrict_to_field(f,
   offsets = compute_field_offsets(f,mfs)
   pini = offsets[field] + 1
   pend = offsets[field] + num_free_dofs(U[field])
-  return SubVector(block_free_values,pini,pend)
+  return view(block_free_values,pini:pend)
 end
 
 """

diff --git a/test/ArraysTests/SubVectorsTests.jl b/test/ArraysTests/SubVectorsTests.jl
diff --git a/test/ArraysTests/runtests.jl b/test/ArraysTests/runtests.jl
@@ -26,8 +26,6 @@ using Test
 
 @testset "IdentityVectors" begin include("IdentityVectorsTests.jl") end
 
-@testset "SubVectors" begin include("SubVectorsTests.jl") end
-
 @testset "ArrayPairs" begin include("ArrayPairsTests.jl") end
 
 @testset "AppendedArrays" begin include("AppendedArraysTests.jl") end