Skip to content

Commit 0dc143d

Browse files
Merge pull request #85 from rafaqz/remove_sliced
Remove sliced
2 parents 0998b0b + ef135ab commit 0dc143d

File tree

7 files changed

+7
-404
lines changed

7 files changed

+7
-404
lines changed

README.md

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -160,40 +160,7 @@ The labels of LArray and SLArray can be accessed
160160
by function `symbols`, which returns a tuple of symbols.
161161

162162

163-
## Labelled slices
164163

165-
For a labelled array where the row and column slices are labeled, use `@SLSlice`
166-
and `@LSlice`, similar to `@SLArray` and `@LArray` but passing a _tuple_ of label
167-
tuples.
168-
169-
For static arrays with labeled rows and columns:
170-
171-
```
172-
ABC = @SLSliced (3,2) (:a,:b,:c), (:x, :y)
173-
A = ABC([1 2; 3 4; 5 6])
174-
A.a.x == 1
175-
A[:c, :y] == 6
176-
```
177-
178-
For regular arrays with labeled rows and columns:
179-
180-
```
181-
A = @LSliced [1 2; 3 4; 5 6] (:a,:b,:c), (:x, :y)
182-
A.a.x == 1
183-
A[:c, :y] == 6
184-
```
185-
186-
The labels of LSliced and SLScliced can be accessed
187-
by function `symbols`.
188-
For a two-dimensional LSliced or SLSliced, it returns a tuple
189-
with first entry a tuple of row symbols and second entry a tuple of column symbols.
190-
For higher-dimensional slices, it returns a Tuple-Type object with
191-
parameters referring to the names of the dimensions.
192-
193-
```
194-
A = @LSliced [1 2; 3 4; 5 6] (:a,:b,:c), (:x, :y)
195-
symbols(A)[1] == (:a, :b, :c)
196-
```
197164

198165
## Example: Nice DiffEq Syntax Without A DSL
199166

@@ -289,3 +256,10 @@ As a result `SLArray` has less element type information, which
289256
improves compilation speed while giving more vector functionality
290257
than a NamedTuple. `LArray` also only has a single element type and,
291258
unlike a named tuple, is mutable.
259+
260+
261+
## Note: Labelled slices
262+
263+
This functionality has been removed from LabelledArrays.jl, but can
264+
replicated with the same compile-time performance and indexing syntax
265+
using [DimensionalData.jl](https://github.com/rafaqz/DimensionalData.jl).

src/LabelledArrays.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ using LinearAlgebra, StaticArrays, ArrayInterface
44

55
include("slarray.jl")
66
include("larray.jl")
7-
include("slsliced.jl")
8-
include("lsliced.jl")
97

108
# Common
119
@generated function __getindex(x::Union{LArray,SLArray},::Val{s}) where s

src/lsliced.jl

Lines changed: 0 additions & 153 deletions
This file was deleted.

src/slsliced.jl

Lines changed: 0 additions & 69 deletions
This file was deleted.

test/lsliced.jl

Lines changed: 0 additions & 101 deletions
This file was deleted.

test/runtests.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ using InteractiveUtils
77
@time @testset "SLArrays" begin include("slarrays.jl") end
88
@time @testset "LArrays" begin include("larrays.jl") end
99
@time @testset "DiffEq" begin include("diffeq.jl") end
10-
#@time @testset "LSliced" begin include("lsliced.jl") end
11-
#@time @testset "SLSliced" begin include("slsliced.jl") end
1210
end

0 commit comments

Comments
 (0)