Mercurial > repos > public > sbplib_julia

annotate src/LazyTensors/lazy_tensor_operations.jl @ 530:7f969ea03a01 feature/inflated_tensormapping_transpose

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove todo
author Jonatan Werpers <jonatan@werpers.com>
date Wed, 25 Nov 2020 21:00:31 +0100
parents f9bc746f37da
children 36dfc57e8e0b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
196
b3c252280a19 Move LazyArray and make LazyTensorMappingApplication and LazyElementwiseOperation subtypes of it
Jonatan Werpers <jonatan@werpers.com>
parents: 195
diff changeset
1 """
b3c252280a19 Move LazyArray and make LazyTensorMappingApplication and LazyElementwiseOperation subtypes of it
Jonatan Werpers <jonatan@werpers.com>
parents: 195
diff changeset
2 LazyTensorMappingApplication{T,R,D} <: LazyArray{T,R}
190
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
3
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
4 Struct for lazy application of a TensorMapping. Created using `*`.
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
5
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
6 Allows the result of a `TensorMapping` applied to a vector to be treated as an `AbstractArray`.
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
7 With a mapping `m` and a vector `v` the LazyTensorMappingApplication object can be created by `m*v`.
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
8 The actual result will be calcualted when indexing into `m*v`.
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
9 """
378
946516954c85 Use concrete types in LazyTensorApplication
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
10 struct LazyTensorMappingApplication{T,R,D, TM<:TensorMapping{T,R,D}, AA<:AbstractArray{T,D}} <: LazyArray{T,R}
946516954c85 Use concrete types in LazyTensorApplication
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
11 t::TM
946516954c85 Use concrete types in LazyTensorApplication
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
12 o::AA
190
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
13 end
348
7fe43d902a27 Start trying to change LazyTensors
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
14 # TODO: Do boundschecking on creation!
190
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
15 export LazyTensorMappingApplication
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
16
379
de4746d6d126 Add some notes and todos
Jonatan Werpers <jonatan@werpers.com>
parents: 378
diff changeset
17 # TODO: Go through and remove unneccerary type parameters on functions
de4746d6d126 Add some notes and todos
Jonatan Werpers <jonatan@werpers.com>
parents: 378
diff changeset
18
310
ece3f6f8a1d4 Change all applys to dispatch on Vararg
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 279
diff changeset
19 Base.getindex(ta::LazyTensorMappingApplication{T,R,D}, I::Vararg{Index,R}) where {T,R,D} = apply(ta.t, ta.o, I...)
ece3f6f8a1d4 Change all applys to dispatch on Vararg
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 279
diff changeset
20 Base.getindex(ta::LazyTensorMappingApplication{T,R,D}, I::Vararg{Int,R}) where {T,R,D} = apply(ta.t, ta.o, Index{Unknown}.(I)...)
359
ba46a952a450 Remove unnecessary type parameters
Jonatan Werpers <jonatan@werpers.com>
parents: 348
diff changeset
21 Base.size(ta::LazyTensorMappingApplication) = range_size(ta.t)
190
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
22 # TODO: What else is needed to implement the AbstractArray interface?
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
23
421
2808c41f5efa Change defs of * for TensorApplication to fix bug
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
24 Base.:*(a::TensorMapping, v::AbstractArray) = LazyTensorMappingApplication(a,v)
2808c41f5efa Change defs of * for TensorApplication to fix bug
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
25 Base.:*(a::TensorMapping, b::TensorMapping) = throw(MethodError(Base.:*,(a,b)))
2808c41f5efa Change defs of * for TensorApplication to fix bug
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
26 Base.:*(a::TensorMapping, args::Union{TensorMapping, AbstractArray}...) = foldr(*,(a,args...))
2808c41f5efa Change defs of * for TensorApplication to fix bug
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
27
190
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
28 # # We need the associativity to be a→b→c = a→(b→c), which is the case for '→'
274
11010bb74260 Dispatch getindex for TensorMappingApplication on region indices. Dispatch apply
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 267
diff changeset
29 # # Should we overload some other infix binary opesrator?
190
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
30 # →(tm::TensorMapping{T,R,D}, o::AbstractArray{T,D}) where {T,R,D} = LazyTensorMappingApplication(tm,o)
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
31 # TODO: We need to be really careful about good error messages.
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
32 # For example what happens if you try to multiply LazyTensorMappingApplication with a TensorMapping(wrong order)?
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
33
194
d30d42a11566 Move all Lazy operation into the same module
Jonatan Werpers <jonatan@werpers.com>
parents: 190
diff changeset
34 """
197
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
35 LazyTensorMappingTranspose{T,R,D} <: TensorMapping{T,D,R}
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
36
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
37 Struct for lazy transpose of a TensorMapping.
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
38
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
39 If a mapping implements the the `apply_transpose` method this allows working with
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
40 the transpose of mapping `m` by using `m'`. `m'` will work as a regular TensorMapping lazily calling
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
41 the appropriate methods of `m`.
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
42 """
438
907b0510699f Change LazyTensorTranspose to have concrete fields
Jonatan Werpers <jonatan@werpers.com>
parents: 436
diff changeset
43 struct LazyTensorMappingTranspose{T,R,D, TM<:TensorMapping{T,R,D}} <: TensorMapping{T,D,R}
907b0510699f Change LazyTensorTranspose to have concrete fields
Jonatan Werpers <jonatan@werpers.com>
parents: 436
diff changeset
44 tm::TM
197
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
45 end
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
46 export LazyTensorMappingTranspose
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
47
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
48 # # TBD: Should this be implemented on a type by type basis or through a trait to provide earlier errors?
348
7fe43d902a27 Start trying to change LazyTensors
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
49 # Jonatan 2020-09-25: Is the problem that you can take the transpose of any TensorMapping even if it doesn't implement `apply_transpose`?
274
11010bb74260 Dispatch getindex for TensorMappingApplication on region indices. Dispatch apply
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 267
diff changeset
50 Base.adjoint(tm::TensorMapping) = LazyTensorMappingTranspose(tm)
11010bb74260 Dispatch getindex for TensorMappingApplication on region indices. Dispatch apply
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 267
diff changeset
51 Base.adjoint(tmt::LazyTensorMappingTranspose) = tmt.tm
197
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
52
310
ece3f6f8a1d4 Change all applys to dispatch on Vararg
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 279
diff changeset
53 apply(tmt::LazyTensorMappingTranspose{T,R,D}, v::AbstractArray{T,R}, I::Vararg{Index,D}) where {T,R,D} = apply_transpose(tmt.tm, v, I...)
ece3f6f8a1d4 Change all applys to dispatch on Vararg
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 279
diff changeset
54 apply_transpose(tmt::LazyTensorMappingTranspose{T,R,D}, v::AbstractArray{T,D}, I::Vararg{Index,R}) where {T,R,D} = apply(tmt.tm, v, I...)
197
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
55
359
ba46a952a450 Remove unnecessary type parameters
Jonatan Werpers <jonatan@werpers.com>
parents: 348
diff changeset
56 range_size(tmt::LazyTensorMappingTranspose) = domain_size(tmt.tm)
ba46a952a450 Remove unnecessary type parameters
Jonatan Werpers <jonatan@werpers.com>
parents: 348
diff changeset
57 domain_size(tmt::LazyTensorMappingTranspose) = range_size(tmt.tm)
197
a340fa91b1fc Move transpose def to the bottom of the file
Jonatan Werpers <jonatan@werpers.com>
parents: 196
diff changeset
58
210
2aa33d0eef90 Add ability to add and subtract TensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 209
diff changeset
59
2aa33d0eef90 Add ability to add and subtract TensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 209
diff changeset
60 struct LazyTensorMappingBinaryOperation{Op,T,R,D,T1<:TensorMapping{T,R,D},T2<:TensorMapping{T,R,D}} <: TensorMapping{T,D,R}
274
11010bb74260 Dispatch getindex for TensorMappingApplication on region indices. Dispatch apply
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 267
diff changeset
61 tm1::T1
11010bb74260 Dispatch getindex for TensorMappingApplication on region indices. Dispatch apply
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 267
diff changeset
62 tm2::T2
210
2aa33d0eef90 Add ability to add and subtract TensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 209
diff changeset
63
274
11010bb74260 Dispatch getindex for TensorMappingApplication on region indices. Dispatch apply
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 267
diff changeset
64 @inline function LazyTensorMappingBinaryOperation{Op,T,R,D}(tm1::T1,tm2::T2) where {Op,T,R,D, T1<:TensorMapping{T,R,D},T2<:TensorMapping{T,R,D}}
11010bb74260 Dispatch getindex for TensorMappingApplication on region indices. Dispatch apply
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 267
diff changeset
65 return new{Op,T,R,D,T1,T2}(tm1,tm2)
210
2aa33d0eef90 Add ability to add and subtract TensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 209
diff changeset
66 end
2aa33d0eef90 Add ability to add and subtract TensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 209
diff changeset
67 end
348
7fe43d902a27 Start trying to change LazyTensors
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
68 # TODO: Boundschecking in constructor.
210
2aa33d0eef90 Add ability to add and subtract TensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 209
diff changeset
69
310
ece3f6f8a1d4 Change all applys to dispatch on Vararg
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 279
diff changeset
70 apply(tmBinOp::LazyTensorMappingBinaryOperation{:+,T,R,D}, v::AbstractArray{T,D}, I::Vararg{Index,R}) where {T,R,D} = apply(tmBinOp.tm1, v, I...) + apply(tmBinOp.tm2, v, I...)
ece3f6f8a1d4 Change all applys to dispatch on Vararg
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 279
diff changeset
71 apply(tmBinOp::LazyTensorMappingBinaryOperation{:-,T,R,D}, v::AbstractArray{T,D}, I::Vararg{Index,R}) where {T,R,D} = apply(tmBinOp.tm1, v, I...) - apply(tmBinOp.tm2, v, I...)
210
2aa33d0eef90 Add ability to add and subtract TensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 209
diff changeset
72
348
7fe43d902a27 Start trying to change LazyTensors
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
73 range_size(tmBinOp::LazyTensorMappingBinaryOperation{Op,T,R,D}) where {Op,T,R,D} = range_size(tmBinOp.tm1)
7fe43d902a27 Start trying to change LazyTensors
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
74 domain_size(tmBinOp::LazyTensorMappingBinaryOperation{Op,T,R,D}) where {Op,T,R,D} = domain_size(tmBinOp.tm1)
210
2aa33d0eef90 Add ability to add and subtract TensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 209
diff changeset
75
274
11010bb74260 Dispatch getindex for TensorMappingApplication on region indices. Dispatch apply
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 267
diff changeset
76 Base.:+(tm1::TensorMapping{T,R,D}, tm2::TensorMapping{T,R,D}) where {T,R,D} = LazyTensorMappingBinaryOperation{:+,T,R,D}(tm1,tm2)
11010bb74260 Dispatch getindex for TensorMappingApplication on region indices. Dispatch apply
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 267
diff changeset
77 Base.:-(tm1::TensorMapping{T,R,D}, tm2::TensorMapping{T,R,D}) where {T,R,D} = LazyTensorMappingBinaryOperation{:-,T,R,D}(tm1,tm2)
210
2aa33d0eef90 Add ability to add and subtract TensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 209
diff changeset
78
412
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
79 """
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
80 TensorMappingComposition{T,R,K,D}
210
2aa33d0eef90 Add ability to add and subtract TensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 209
diff changeset
81
412
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
82 Lazily compose two TensorMappings, so that they can be handled as a single TensorMapping.
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
83 """
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
84 struct TensorMappingComposition{T,R,K,D, TM1<:TensorMapping{T,R,K}, TM2<:TensorMapping{T,K,D}} <: TensorMapping{T,R,D}
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
85 t1::TM1
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
86 t2::TM2
190
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
87
417
4c6604b7d990 Add dimension checking in the constructor
Jonatan Werpers <jonatan@werpers.com>
parents: 415
diff changeset
88 @inline function TensorMappingComposition(t1::TensorMapping{T,R,K}, t2::TensorMapping{T,K,D}) where {T,R,K,D}
485
4b49f03bdb98 Switch from DimensionMismatch to SizeMismatch for boundschecks on compositions
Jonatan Werpers <jonatan@werpers.com>
parents: 484
diff changeset
89 @boundscheck check_domain_size(t1, range_size(t2))
417
4c6604b7d990 Add dimension checking in the constructor
Jonatan Werpers <jonatan@werpers.com>
parents: 415
diff changeset
90 return new{T,R,K,D, typeof(t1), typeof(t2)}(t1,t2)
4c6604b7d990 Add dimension checking in the constructor
Jonatan Werpers <jonatan@werpers.com>
parents: 415
diff changeset
91 end
412
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
92 end
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
93 export TensorMappingComposition
190
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
94
412
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
95 range_size(tm::TensorMappingComposition) = range_size(tm.t1)
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
96 domain_size(tm::TensorMappingComposition) = domain_size(tm.t2)
190
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
97
412
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
98 function apply(c::TensorMappingComposition{T,R,K,D}, v::AbstractArray{T,D}, I::Vararg{S,R} where S) where {T,R,K,D}
418
264af2bb646f Switch to using * instead of calling the constructor
Jonatan Werpers <jonatan@werpers.com>
parents: 417
diff changeset
99 apply(c.t1, c.t2*v, I...)
412
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
100 end
190
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
101
412
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
102 function apply_transpose(c::TensorMappingComposition{T,R,K,D}, v::AbstractArray{T,R}, I::Vararg{S,D} where S) where {T,R,K,D}
418
264af2bb646f Switch to using * instead of calling the constructor
Jonatan Werpers <jonatan@werpers.com>
parents: 417
diff changeset
103 apply_transpose(c.t2, c.t1'*v, I...)
412
d94891b8dfca Start implementing TensorComposition
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
104 end
190
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
105
417
4c6604b7d990 Add dimension checking in the constructor
Jonatan Werpers <jonatan@werpers.com>
parents: 415
diff changeset
106 Base.@propagate_inbounds Base.:∘(s::TensorMapping, t::TensorMapping) = TensorMappingComposition(s,t)
190
8964b3165097 Break LazyTensors.jl into several files
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
107
377
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
108 """
393
b14eacf823b6 Test applying LazyLinearMap to random vectors and matrices. Fix indentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 392
diff changeset
109 LazyLinearMap{T,R,D,...}(A, range_indicies, domain_indicies)
377
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
110
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
111 TensorMapping defined by the AbstractArray A. `range_indicies` and `domain_indicies` define which indicies of A should
400
c640f37d1c74 Update documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 399
diff changeset
112 be considerd the range and domain of the TensorMapping. Each set of indices must be ordered in ascending order.
394
7ad644d112de Expand tests for LazyLinearMap and update its documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 393
diff changeset
113
400
c640f37d1c74 Update documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 399
diff changeset
114 For instance, if A is a m x n matrix, and range_size = (1,), domain_size = (2,), then the LazyLinearMap performs the
c640f37d1c74 Update documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 399
diff changeset
115 standard matrix-vector product on vectors of size n.
377
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
116 """
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
117 struct LazyLinearMap{T,R,D, RD, AA<:AbstractArray{T,RD}} <: TensorMapping{T,R,D}
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
118 A::AA
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
119 range_indicies::NTuple{R,Int}
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
120 domain_indicies::NTuple{D,Int}
399
3b4b1758a8ad Add a check for permuted indecies.
Jonatan Werpers <jonatan@werpers.com>
parents: 394
diff changeset
121
3b4b1758a8ad Add a check for permuted indecies.
Jonatan Werpers <jonatan@werpers.com>
parents: 394
diff changeset
122 function LazyLinearMap(A::AA, range_indicies::NTuple{R,Int}, domain_indicies::NTuple{D,Int}) where {T,R,D, RD, AA<:AbstractArray{T,RD}}
3b4b1758a8ad Add a check for permuted indecies.
Jonatan Werpers <jonatan@werpers.com>
parents: 394
diff changeset
123 if !issorted(range_indicies) || !issorted(domain_indicies)
3b4b1758a8ad Add a check for permuted indecies.
Jonatan Werpers <jonatan@werpers.com>
parents: 394
diff changeset
124 throw(DomainError("range_indicies and domain_indicies must be sorted in ascending order"))
3b4b1758a8ad Add a check for permuted indecies.
Jonatan Werpers <jonatan@werpers.com>
parents: 394
diff changeset
125 end
3b4b1758a8ad Add a check for permuted indecies.
Jonatan Werpers <jonatan@werpers.com>
parents: 394
diff changeset
126
3b4b1758a8ad Add a check for permuted indecies.
Jonatan Werpers <jonatan@werpers.com>
parents: 394
diff changeset
127 return new{T,R,D,RD,AA}(A,range_indicies,domain_indicies)
3b4b1758a8ad Add a check for permuted indecies.
Jonatan Werpers <jonatan@werpers.com>
parents: 394
diff changeset
128 end
377
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
129 end
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
130 export LazyLinearMap
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
131
392
418cfd945715 Fix bug in range_size and domain_size for LazyLinearMap and expand the test
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 377
diff changeset
132 range_size(llm::LazyLinearMap) = size(llm.A)[[llm.range_indicies...]]
418cfd945715 Fix bug in range_size and domain_size for LazyLinearMap and expand the test
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 377
diff changeset
133 domain_size(llm::LazyLinearMap) = size(llm.A)[[llm.domain_indicies...]]
377
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
134
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
135 function apply(llm::LazyLinearMap{T,R,D}, v::AbstractArray{T,D}, I::Vararg{Index,R}) where {T,R,D}
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
136 view_index = ntuple(i->:,ndims(llm.A))
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
137 for i ∈ 1:R
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
138 view_index = Base.setindex(view_index, Int(I[i]), llm.range_indicies[i])
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
139 end
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
140 A_view = @view llm.A[view_index...]
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
141 return sum(A_view.*v)
8414c2334393 Start implementing LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 359
diff changeset
142 end
411
4aa59af074ef Add implementation of apply_transpose for LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
143
4aa59af074ef Add implementation of apply_transpose for LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
144 function apply_transpose(llm::LazyLinearMap{T,R,D}, v::AbstractArray{T,R}, I::Vararg{Index,D}) where {T,R,D}
4aa59af074ef Add implementation of apply_transpose for LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
145 apply(LazyLinearMap(llm.A, llm.domain_indicies, llm.range_indicies), v, I...)
4aa59af074ef Add implementation of apply_transpose for LazyLinearMap
Jonatan Werpers <jonatan@werpers.com>
parents: 402
diff changeset
146 end
429
46acb2560451 Start implementing LazyIdentity
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
147
46acb2560451 Start implementing LazyIdentity
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
148
46acb2560451 Start implementing LazyIdentity
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
149 """
434
648a36ebac99 Change name from LazyIdentity to IdentityMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 433
diff changeset
150 IdentityMapping{T,D} <: TensorMapping{T,D,D}
429
46acb2560451 Start implementing LazyIdentity
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
151
46acb2560451 Start implementing LazyIdentity
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
152 The lazy identity TensorMapping for a given size. Usefull for building up higher dimensional tensor mappings from lower
46acb2560451 Start implementing LazyIdentity
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
153 dimensional ones through outer products. Also used in the Implementation for InflatedTensorMapping.
46acb2560451 Start implementing LazyIdentity
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
154 """
434
648a36ebac99 Change name from LazyIdentity to IdentityMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 433
diff changeset
155 struct IdentityMapping{T,D} <: TensorMapping{T,D,D}
429
46acb2560451 Start implementing LazyIdentity
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
156 size::NTuple{D,Int}
46acb2560451 Start implementing LazyIdentity
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
157 end
434
648a36ebac99 Change name from LazyIdentity to IdentityMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 433
diff changeset
158 export IdentityMapping
429
46acb2560451 Start implementing LazyIdentity
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
159
434
648a36ebac99 Change name from LazyIdentity to IdentityMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 433
diff changeset
160 IdentityMapping{T}(size::NTuple{D,Int}) where {T,D} = IdentityMapping{T,D}(size)
441
552189707fbe Add convenience constructor
Jonatan Werpers <jonatan@werpers.com>
parents: 439
diff changeset
161 IdentityMapping{T}(size::Vararg{Int,D}) where {T,D} = IdentityMapping{T,D}(size)
442
e70e47fbfa7c Add another convenience constructor
Jonatan Werpers <jonatan@werpers.com>
parents: 441
diff changeset
162 IdentityMapping(size::Vararg{Int,D}) where D = IdentityMapping{Float64,D}(size)
429
46acb2560451 Start implementing LazyIdentity
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
163
434
648a36ebac99 Change name from LazyIdentity to IdentityMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 433
diff changeset
164 range_size(tmi::IdentityMapping) = tmi.size
648a36ebac99 Change name from LazyIdentity to IdentityMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 433
diff changeset
165 domain_size(tmi::IdentityMapping) = tmi.size
429
46acb2560451 Start implementing LazyIdentity
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
166
434
648a36ebac99 Change name from LazyIdentity to IdentityMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 433
diff changeset
167 apply(tmi::IdentityMapping{T,D}, v::AbstractArray{T,D}, I::Vararg{Any,D}) where {T,D} = v[I...]
648a36ebac99 Change name from LazyIdentity to IdentityMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 433
diff changeset
168 apply_transpose(tmi::IdentityMapping{T,D}, v::AbstractArray{T,D}, I::Vararg{Any,D}) where {T,D} = v[I...]
429
46acb2560451 Start implementing LazyIdentity
Jonatan Werpers <jonatan@werpers.com>
parents: 411
diff changeset
169
479
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
170 """
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
171 Base.:∘(tm, tmi)
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
172 Base.:∘(tmi, tm)
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
173
480
c1a366331e75 Fix typo in docs
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 479
diff changeset
174 Composes a `Tensormapping` `tm` with an `IdentityMapping` `tmi`, by returning `tm`
479
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
175 """
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
176 @inline function Base.:∘(tm::TensorMapping{T,R,D}, tmi::IdentityMapping{T,D}) where {T,R,D}
485
4b49f03bdb98 Switch from DimensionMismatch to SizeMismatch for boundschecks on compositions
Jonatan Werpers <jonatan@werpers.com>
parents: 484
diff changeset
177 @boundscheck check_domain_size(tm, range_size(tmi))
479
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
178 return tm
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
179 end
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
180
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
181 @inline function Base.:∘(tmi::IdentityMapping{T,R}, tm::TensorMapping{T,R,D}) where {T,R,D}
485
4b49f03bdb98 Switch from DimensionMismatch to SizeMismatch for boundschecks on compositions
Jonatan Werpers <jonatan@werpers.com>
parents: 484
diff changeset
182 @boundscheck check_domain_size(tmi, range_size(tm))
479
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
183 return tm
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
184 end
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
185 # Specialization for the case where tm is an IdentityMapping. Required to resolve ambiguity.
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
186 @inline function Base.:∘(tm::IdentityMapping{T,D}, tmi::IdentityMapping{T,D}) where {T,D}
485
4b49f03bdb98 Switch from DimensionMismatch to SizeMismatch for boundschecks on compositions
Jonatan Werpers <jonatan@werpers.com>
parents: 484
diff changeset
187 @boundscheck check_domain_size(tm, range_size(tmi))
479
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
188 return tmi
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
189 end
95f3b9036801 Specialize composition operator for composing a tensormapping with an identitymapping.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 465
diff changeset
190
460
acffa3a1395d Move part of the documentation to the constructor
Jonatan Werpers <jonatan@werpers.com>
parents: 459
diff changeset
191
459
11e58c49fb46 Add some documentation
Jonatan Werpers <jonatan@werpers.com>
parents: 458
diff changeset
192 """
11e58c49fb46 Add some documentation
Jonatan Werpers <jonatan@werpers.com>
parents: 458
diff changeset
193 InflatedTensorMapping{T,R,D} <: TensorMapping{T,R,D}
11e58c49fb46 Add some documentation
Jonatan Werpers <jonatan@werpers.com>
parents: 458
diff changeset
194
11e58c49fb46 Add some documentation
Jonatan Werpers <jonatan@werpers.com>
parents: 458
diff changeset
195 An inflated `TensorMapping` with dimensions added before and afer its actual dimensions.
11e58c49fb46 Add some documentation
Jonatan Werpers <jonatan@werpers.com>
parents: 458
diff changeset
196 """
449
14d60de71b72 Change to concrete fields in the type
Jonatan Werpers <jonatan@werpers.com>
parents: 448
diff changeset
197 struct InflatedTensorMapping{T,R,D,D_before,R_middle,D_middle,D_after, TM<:TensorMapping{T,R_middle,D_middle}} <: TensorMapping{T,R,D}
448
912ae510dec9 Use new name of IdentityMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 447
diff changeset
198 before::IdentityMapping{T,D_before}
449
14d60de71b72 Change to concrete fields in the type
Jonatan Werpers <jonatan@werpers.com>
parents: 448
diff changeset
199 tm::TM
448
912ae510dec9 Use new name of IdentityMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 447
diff changeset
200 after::IdentityMapping{T,D_after}
446
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
201
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
202 function InflatedTensorMapping(before, tm::TensorMapping{T}, after) where T
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
203 R_before = range_dim(before)
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
204 R_middle = range_dim(tm)
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
205 R_after = range_dim(after)
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
206 R = R_before+R_middle+R_after
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
207
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
208 D_before = domain_dim(before)
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
209 D_middle = domain_dim(tm)
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
210 D_after = domain_dim(after)
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
211 D = D_before+D_middle+D_after
449
14d60de71b72 Change to concrete fields in the type
Jonatan Werpers <jonatan@werpers.com>
parents: 448
diff changeset
212 return new{T,R,D,D_before,R_middle,D_middle,D_after, typeof(tm)}(before, tm, after)
448
912ae510dec9 Use new name of IdentityMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 447
diff changeset
213 end
446
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
214 end
451
6cf234eef780 Add tests for constructors and size calculations
Jonatan Werpers <jonatan@werpers.com>
parents: 450
diff changeset
215 export InflatedTensorMapping
461
a0e40d16ba0e Better documentation
Jonatan Werpers <jonatan@werpers.com>
parents: 460
diff changeset
216 """
464
73882867c121 Align documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 463
diff changeset
217 InflatedTensorMapping(before, tm, after)
465
f270d82fc9ad Change documention in an attempt to follow the guidelines
Jonatan Werpers <jonatan@werpers.com>
parents: 464
diff changeset
218 InflatedTensorMapping(before,tm)
f270d82fc9ad Change documention in an attempt to follow the guidelines
Jonatan Werpers <jonatan@werpers.com>
parents: 464
diff changeset
219 InflatedTensorMapping(tm,after)
461
a0e40d16ba0e Better documentation
Jonatan Werpers <jonatan@werpers.com>
parents: 460
diff changeset
220
a0e40d16ba0e Better documentation
Jonatan Werpers <jonatan@werpers.com>
parents: 460
diff changeset
221 The outer product of `before`, `tm` and `after`, where `before` and `after` are `IdentityMapping`s.
465
f270d82fc9ad Change documention in an attempt to follow the guidelines
Jonatan Werpers <jonatan@werpers.com>
parents: 464
diff changeset
222
f270d82fc9ad Change documention in an attempt to follow the guidelines
Jonatan Werpers <jonatan@werpers.com>
parents: 464
diff changeset
223 If one of `before` or `after` is left out, a 0-dimensional `IdentityMapping` is used as the default value.
493
df566372bb4f Implement constructors to avoid creating nested InflatedTensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 487
diff changeset
224
df566372bb4f Implement constructors to avoid creating nested InflatedTensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 487
diff changeset
225 If `tm` already is an `InflatedTensorMapping`, `before` and `after` will be extended instead of
df566372bb4f Implement constructors to avoid creating nested InflatedTensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 487
diff changeset
226 creating a nested `InflatedTensorMapping`.
461
a0e40d16ba0e Better documentation
Jonatan Werpers <jonatan@werpers.com>
parents: 460
diff changeset
227 """
464
73882867c121 Align documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 463
diff changeset
228 InflatedTensorMapping(::IdentityMapping, ::TensorMapping, ::IdentityMapping)
493
df566372bb4f Implement constructors to avoid creating nested InflatedTensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 487
diff changeset
229
df566372bb4f Implement constructors to avoid creating nested InflatedTensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 487
diff changeset
230 function InflatedTensorMapping(before, itm::InflatedTensorMapping, after)
df566372bb4f Implement constructors to avoid creating nested InflatedTensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 487
diff changeset
231 return InflatedTensorMapping(
df566372bb4f Implement constructors to avoid creating nested InflatedTensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 487
diff changeset
232 IdentityMapping(before.size..., itm.before.size...),
df566372bb4f Implement constructors to avoid creating nested InflatedTensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 487
diff changeset
233 itm.tm,
df566372bb4f Implement constructors to avoid creating nested InflatedTensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 487
diff changeset
234 IdentityMapping(itm.after.size..., after.size...),
df566372bb4f Implement constructors to avoid creating nested InflatedTensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 487
diff changeset
235 )
df566372bb4f Implement constructors to avoid creating nested InflatedTensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 487
diff changeset
236 end
df566372bb4f Implement constructors to avoid creating nested InflatedTensorMappings
Jonatan Werpers <jonatan@werpers.com>
parents: 487
diff changeset
237
462
c364e2908c6e Implement InflatedTensorMapping where one of before and after are missing.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 458
diff changeset
238 InflatedTensorMapping(before::IdentityMapping, tm::TensorMapping{T}) where T = InflatedTensorMapping(before,tm,IdentityMapping{T}())
c364e2908c6e Implement InflatedTensorMapping where one of before and after are missing.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 458
diff changeset
239 InflatedTensorMapping(tm::TensorMapping{T}, after::IdentityMapping) where T = InflatedTensorMapping(IdentityMapping{T}(),tm,after)
465
f270d82fc9ad Change documention in an attempt to follow the guidelines
Jonatan Werpers <jonatan@werpers.com>
parents: 464
diff changeset
240 # Resolve ambiguity between the two previous methods
462
c364e2908c6e Implement InflatedTensorMapping where one of before and after are missing.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 458
diff changeset
241 InflatedTensorMapping(I1::IdentityMapping{T}, I2::IdentityMapping{T}) where T = InflatedTensorMapping(I1,I2,IdentityMapping{T}())
446
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
242
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
243 # TODO: Implement some pretty printing in terms of ⊗. E.g InflatedTensorMapping(I(3),B,I(2)) -> I(3)⊗B⊗I(2)
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
244
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
245 function range_size(itm::InflatedTensorMapping)
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
246 return flatten_tuple(
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
247 range_size(itm.before),
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
248 range_size(itm.tm),
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
249 range_size(itm.after),
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
250 )
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
251 end
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
252
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
253 function domain_size(itm::InflatedTensorMapping)
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
254 return flatten_tuple(
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
255 domain_size(itm.before),
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
256 domain_size(itm.tm),
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
257 domain_size(itm.after),
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
258 )
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
259 end
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
260
452
aeda2698166d Add tullio as a test dependency and add a test for apply
Jonatan Werpers <jonatan@werpers.com>
parents: 451
diff changeset
261 function apply(itm::InflatedTensorMapping{T,R,D}, v::AbstractArray{T,D}, I::Vararg{Any,R}) where {T,R,D}
520
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
262 A = range_dim(itm.before)
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
263 B_domain = domain_dim(itm.tm)
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
264 B_range = range_dim(itm.tm)
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
265 C = range_dim(itm.after)
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
266
525
7e6250c51eb2 Fix bug in apply
Jonatan Werpers <jonatan@werpers.com>
parents: 520
diff changeset
267 view_index, inner_index = split_index(Val(A), Val(B_domain), Val(B_range), Val(C), I...)
446
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
268
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
269 v_inner = view(v, view_index...)
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
270 return apply(itm.tm, v_inner, inner_index...)
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
271 end
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
272
526
be152486d136 Implement apply_transpose with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 525
diff changeset
273 function apply_transpose(itm::InflatedTensorMapping{T,R,D}, v::AbstractArray{T,R}, I::Vararg{Any,D}) where {T,R,D}
be152486d136 Implement apply_transpose with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 525
diff changeset
274 A = range_dim(itm.before)
be152486d136 Implement apply_transpose with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 525
diff changeset
275 B_domain = domain_dim(itm.tm)
be152486d136 Implement apply_transpose with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 525
diff changeset
276 B_range = range_dim(itm.tm)
be152486d136 Implement apply_transpose with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 525
diff changeset
277 C = range_dim(itm.after)
be152486d136 Implement apply_transpose with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 525
diff changeset
278
be152486d136 Implement apply_transpose with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 525
diff changeset
279 view_index, inner_index = split_index(Val(A), Val(B_range), Val(B_domain), Val(C), I...)
be152486d136 Implement apply_transpose with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 525
diff changeset
280
be152486d136 Implement apply_transpose with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 525
diff changeset
281 v_inner = view(v, view_index...)
be152486d136 Implement apply_transpose with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 525
diff changeset
282 return apply_transpose(itm.tm, v_inner, inner_index...)
be152486d136 Implement apply_transpose with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 525
diff changeset
283 end
be152486d136 Implement apply_transpose with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 525
diff changeset
284
446
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
285
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
286 """
520
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
287 split_index(:Val{A}, ::Val{B_view}, ::Val{B_middle}, ::Val{C}, I...)
446
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
288
520
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
289 Splits the multi-index `I` into two parts. One part which is expected to be used as a view, which is expected to be used as an index.
446
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
290 Eg.
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
291 ```
520
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
292 (1,2,3,4) -> (1,:,:,:,4), (2,3)
446
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
293 ```
520
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
294
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
295 `B_view` controls how many colons are in the view, and `B_middle` controls how many elements are extracted from the middle.
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
296 `A` and `C` decides the length of the parts before and after the colons in the view index.
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
297 length(I) == A+B_domain+C
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
298 length(I_middle) == B_domain
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
299 length(I_view) == A + B_range + C
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
300
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
301 TODO: Finish documentation.
446
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
302 """
520
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
303 function split_index(::Val{A}, ::Val{B_view}, ::Val{B_middle}, ::Val{C}, I...) where {A,B_view, B_middle,C}
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
304 I_before = slice_tuple(I, Val(1), Val(A))
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
305 I_middle = slice_tuple(I, Val(A+1), Val(A+B_middle))
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
306 I_after = slice_tuple(I, Val(A+B_middle+1), Val(A+B_middle+C))
446
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
307
520
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
308 view_index = (I_before..., ntuple((i)->:, B_view)..., I_after...)
446
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
309
520
fe86ac896377 Start refactoring split index and apply to accomodate future addition of apply_transpose
Jonatan Werpers <jonatan@werpers.com>
parents: 501
diff changeset
310 return view_index, I_middle
446
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
311 end
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
312
456
8f4c31e06689 Add docs and tests for slice_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 455
diff changeset
313 # TODO: Can this be replaced by something more elegant while still being type stable? 2020-10-21
8f4c31e06689 Add docs and tests for slice_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 455
diff changeset
314 # See:
8f4c31e06689 Add docs and tests for slice_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 455
diff changeset
315 # https://github.com/JuliaLang/julia/issues/34884
8f4c31e06689 Add docs and tests for slice_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 455
diff changeset
316 # https://github.com/JuliaLang/julia/issues/30386
8f4c31e06689 Add docs and tests for slice_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 455
diff changeset
317 """
8f4c31e06689 Add docs and tests for slice_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 455
diff changeset
318 slice_tuple(t, Val(l), Val(u))
8f4c31e06689 Add docs and tests for slice_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 455
diff changeset
319
8f4c31e06689 Add docs and tests for slice_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 455
diff changeset
320 Get a slice of a tuple in a type stable way.
8f4c31e06689 Add docs and tests for slice_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 455
diff changeset
321 Equivalent to t[l:u] but type stable.
8f4c31e06689 Add docs and tests for slice_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 455
diff changeset
322 """
455
b86312d14873 Make split_index type stable
Jonatan Werpers <jonatan@werpers.com>
parents: 452
diff changeset
323 function slice_tuple(t,::Val{L},::Val{U}) where {L,U}
b86312d14873 Make split_index type stable
Jonatan Werpers <jonatan@werpers.com>
parents: 452
diff changeset
324 return ntuple(i->t[i+L-1], U-L+1)
b86312d14873 Make split_index type stable
Jonatan Werpers <jonatan@werpers.com>
parents: 452
diff changeset
325 end
b86312d14873 Make split_index type stable
Jonatan Werpers <jonatan@werpers.com>
parents: 452
diff changeset
326
457
8fb6a5611c7a Add tests and docs for flatten_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 456
diff changeset
327 """
8fb6a5611c7a Add tests and docs for flatten_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 456
diff changeset
328 flatten_tuple(t)
8fb6a5611c7a Add tests and docs for flatten_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 456
diff changeset
329
8fb6a5611c7a Add tests and docs for flatten_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 456
diff changeset
330 Takes a nested tuple and flattens the whole structure
8fb6a5611c7a Add tests and docs for flatten_tuple
Jonatan Werpers <jonatan@werpers.com>
parents: 456
diff changeset
331 """
446
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
332 flatten_tuple(t::NTuple{N, Number} where N) = t
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
333 flatten_tuple(t::Tuple) = ((flatten_tuple.(t)...)...,) # simplify?
904aae1899df Start implementing InflatedTensorMapping
Jonatan Werpers <jonatan@werpers.com>
parents: 429
diff changeset
334 flatten_tuple(ts::Vararg) = flatten_tuple(ts)
487
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
335
468
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
336 """
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
337 LazyOuterProduct(tms...)
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
338
501
4b9d124fe984 Fix typo in documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 499
diff changeset
339 Creates a `TensorMappingComposition` for the outerproduct of `tms...`.
468
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
340 This is done by separating the outer product into regular products of outer products involving only identity mappings and one non-identity mapping.
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
341
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
342 First let
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
343 ```math
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
344 A = A_{I,J}
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
345 B = B_{M,N}
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
346 C = C_{P,Q}
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
347 ```
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
348
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
349 where ``I``, ``M``, ``P`` are multi-indexes for the ranges of ``A``, ``B``, ``C``, and ``J``, ``N``, ``Q`` are multi-indexes of the domains.
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
350
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
351 We use ``⊗`` to denote the outer product
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
352 ```math
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
353 (A⊗B)_{IM,JN} = A_{I,J}B_{M,N}
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
354 ```
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
355
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
356 We note that
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
357 ```math
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
358 A⊗B⊗C = (A⊗B⊗C)_{IMP,JNQ} = A_{I,J}B_{M,N}C_{P,Q}
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
359 ```
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
360 And that
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
361 ```math
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
362 A⊗B⊗C = (A⊗I_{|M|}⊗I_{|P|})(I_{|J|}⊗B⊗I_{|P|})(I_{|J|}⊗I_{|N|}⊗C)
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
363 ```
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
364 where |.| of a multi-index is a vector of sizes for each dimension. ``I_v`` denotes the identity tensor of size ``v[i]`` in each direction
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
365 To apply ``A⊗B⊗C`` we evaluate
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
366
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
367 (A⊗B⊗C)v = [(A⊗I_{|M|}⊗I_{|P|}) [(I_{|J|}⊗B⊗I_{|P|}) [(I_{|J|}⊗I_{|N|}⊗C)v]]]
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
368 """
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
369 function LazyOuterProduct end
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
370 export LazyOuterProduct
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
371
470
0c3decc04649 Add some tests and fix some bugs
Jonatan Werpers <jonatan@werpers.com>
parents: 469
diff changeset
372 function LazyOuterProduct(tm1::TensorMapping{T}, tm2::TensorMapping{T}) where T
0c3decc04649 Add some tests and fix some bugs
Jonatan Werpers <jonatan@werpers.com>
parents: 469
diff changeset
373 itm1 = InflatedTensorMapping(tm1, IdentityMapping{T}(range_size(tm2)))
0c3decc04649 Add some tests and fix some bugs
Jonatan Werpers <jonatan@werpers.com>
parents: 469
diff changeset
374 itm2 = InflatedTensorMapping(IdentityMapping{T}(domain_size(tm1)),tm2)
468
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
375
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
376 return itm1∘itm2
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
377 end
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
378
491
2dc2eac27f75 Add special methods for Identity mappings
Jonatan Werpers <jonatan@werpers.com>
parents: 475
diff changeset
379 LazyOuterProduct(t1::IdentityMapping{T}, t2::IdentityMapping{T}) where T = IdentityMapping{T}(t1.size...,t2.size...)
2dc2eac27f75 Add special methods for Identity mappings
Jonatan Werpers <jonatan@werpers.com>
parents: 475
diff changeset
380 LazyOuterProduct(t1::TensorMapping, t2::IdentityMapping) = InflatedTensorMapping(t1, t2)
2dc2eac27f75 Add special methods for Identity mappings
Jonatan Werpers <jonatan@werpers.com>
parents: 475
diff changeset
381 LazyOuterProduct(t1::IdentityMapping, t2::TensorMapping) = InflatedTensorMapping(t1, t2)
2dc2eac27f75 Add special methods for Identity mappings
Jonatan Werpers <jonatan@werpers.com>
parents: 475
diff changeset
382
470
0c3decc04649 Add some tests and fix some bugs
Jonatan Werpers <jonatan@werpers.com>
parents: 469
diff changeset
383 LazyOuterProduct(tms::Vararg{TensorMapping}) = foldl(LazyOuterProduct, tms)
468
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
384
474
3ad327378b2d Simplify implementation of \otimes
Jonatan Werpers <jonatan@werpers.com>
parents: 470
diff changeset
385 ⊗(a::TensorMapping, b::TensorMapping) = LazyOuterProduct(a,b)
470
0c3decc04649 Add some tests and fix some bugs
Jonatan Werpers <jonatan@werpers.com>
parents: 469
diff changeset
386 export ⊗
468
a52f38e72258 Start implementing function for outer products
Jonatan Werpers <jonatan@werpers.com>
parents: 461
diff changeset
387
498
5a600ec40ccc Merge in default
Jonatan Werpers <jonatan@werpers.com>
parents: 491 493
diff changeset
388
487
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
389 function check_domain_size(tm::TensorMapping, sz)
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
390 if domain_size(tm) != sz
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
391 throw(SizeMismatch(tm,sz))
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
392 end
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
393 end
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
394
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
395 struct SizeMismatch <: Exception
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
396 tm::TensorMapping
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
397 sz
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
398 end
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
399 export SizeMismatch
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
400
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
401 function Base.showerror(io::IO, err::SizeMismatch)
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
402 print(io, "SizeMismatch: ")
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
403 print(io, "domain size $(domain_size(err.tm)) of TensorMapping not matching size $(err.sz)")
6a6b7eaf9edf Move exception handling to end of file and update error message.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 485
diff changeset
404 end