Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 7 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,40 +160,7 @@ The labels of LArray and SLArray can be accessed
by function `symbols`, which returns a tuple of symbols.


## Labelled slices

For a labelled array where the row and column slices are labeled, use `@SLSlice`
and `@LSlice`, similar to `@SLArray` and `@LArray` but passing a _tuple_ of label
tuples.

For static arrays with labeled rows and columns:

```
ABC = @SLSliced (3,2) (:a,:b,:c), (:x, :y)
A = ABC([1 2; 3 4; 5 6])
A.a.x == 1
A[:c, :y] == 6
```

For regular arrays with labeled rows and columns:

```
A = @LSliced [1 2; 3 4; 5 6] (:a,:b,:c), (:x, :y)
A.a.x == 1
A[:c, :y] == 6
```

The labels of LSliced and SLScliced can be accessed
by function `symbols`.
For a two-dimensional LSliced or SLSliced, it returns a tuple
with first entry a tuple of row symbols and second entry a tuple of column symbols.
For higher-dimensional slices, it returns a Tuple-Type object with
parameters referring to the names of the dimensions.

```
A = @LSliced [1 2; 3 4; 5 6] (:a,:b,:c), (:x, :y)
symbols(A)[1] == (:a, :b, :c)
```

## Example: Nice DiffEq Syntax Without A DSL

Expand Down Expand Up @@ -289,3 +256,10 @@ As a result `SLArray` has less element type information, which
improves compilation speed while giving more vector functionality
than a NamedTuple. `LArray` also only has a single element type and,
unlike a named tuple, is mutable.


## Note: Labelled slices

This functionality has been removed from LabelledArrays.jl, but can
replicated with the same compile-time performance and indexing syntax
using [DimensionalData.jl](https://github.com/rafaqz/DimensionalData.jl).
2 changes: 0 additions & 2 deletions src/LabelledArrays.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ using LinearAlgebra, StaticArrays, ArrayInterface

include("slarray.jl")
include("larray.jl")
include("slsliced.jl")
include("lsliced.jl")

# Common
@generated function __getindex(x::Union{LArray,SLArray},::Val{s}) where s
Expand Down
153 changes: 0 additions & 153 deletions src/lsliced.jl

This file was deleted.

69 changes: 0 additions & 69 deletions src/slsliced.jl

This file was deleted.

101 changes: 0 additions & 101 deletions test/lsliced.jl

This file was deleted.

2 changes: 0 additions & 2 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ using InteractiveUtils
@time @testset "SLArrays" begin include("slarrays.jl") end
@time @testset "LArrays" begin include("larrays.jl") end
@time @testset "DiffEq" begin include("diffeq.jl") end
#@time @testset "LSliced" begin include("lsliced.jl") end
#@time @testset "SLSliced" begin include("slsliced.jl") end
end
Loading