Mercurial > repos > public > sbplib_julia

annotate TensorMappings.jl @ 157:63b495d5dbc7 boundary_conditions

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add *-operator for tensor application
author Jonatan Werpers <jonatan@werpers.com>
date Mon, 29 Apr 2019 11:47:26 +0200
parents ef3e6c70b6f9
children a3fac8298e3c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
1 module TensorMappings
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
2 # Needs a better name ImplicitTensorMappings? Get rid of "Tensor" in the name_
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
3
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
4 abstract type TensorMapping{T,R,D} end
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
5 abstract type TensorOperator{T,D} <: TensorMapping{T,D,D} end # Does this help?
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
6
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
7 range_dim(::TensorMapping{T,R,D}) where {T,R,D} = R
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
8 domain_dim(::TensorMapping{T,R,D}) where {T,R,D} = D
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
9
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
10 range_size(::TensorOperator{T,D}, domain_size::NTuple{D,Integer}) where {T,D} = domain_size
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
11 # More prciese domain_size type?
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
12
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
13 # Should be implemented by a TensorMapping
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
14 # ========================================
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
15 # apply(t::TensorMapping{T,R,D}, v::AbstractArray{T,D}, I::Vararg) where {R,D,T} =
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
16 # apply_transpose(t::TensorMapping{T,R,D}, v::AbstractArray{T,D}, I::Vararg) where {R,D,T} =
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
17 # Does it make sense that apply should work for any size of v? And the application adapts?
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
18 # Think about boundschecking!
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
19
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
20 # range_size(::TensorMapping{T,R,D}, domain_size::NTuple{D,Integer}) where {T,R,D} =
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
21 # More prciese domain_size type?
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
22 # range_size_of_transpose()???
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
23
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
24
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
25
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
26 # Allow using the ' operator:
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
27 struct TensorMappingTranspose{T,R,D} <: TensorMapping{T,D,R}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
28 tm::TensorMapping{T,R,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
29 end
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
30
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
31 Base.adjoint(t::TensorMapping) = TensorMappingTranspose(t) # Maybe this should be implemented on a type by type basis or through a trait to provide earlier errors.
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
32 Base.adjoint(t::TensorMappingTranspose) = t.tm
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
33
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
34 apply(tm::TensorMappingTranspose{T,R,D}, v::AbstractArray{T,R}, I::Vararg) where {T,R,D} = apply_transpose(tm.tm, v, I...)
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
35 apply_transpose(tm::TensorMappingTranspose{T,R,D}, v::AbstractArray{T,D}, I::Vararg) where {T,R,D} = apply(tm.tm, v, I...)
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
36
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
37 # range_size(::TensorMappingTranspose{T,R,D}, domain_size::NTuple{}) = range_size_of_transpose???
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
38
157
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
39
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
40
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
41 struct TensorApplication{T,R,D} <: AbstractArray{T,R}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
42 t::TensorMapping{R,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
43 o::AbstractArray{T,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
44 end
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
45
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
46 Base.size(ta::TensorApplication) = range_size(ta.t,size(ta.o))
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
47 ## What else is needed so that we have a proper AbstractArray?
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
48
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
49 Base.getindex(tm::TensorApplication, I::Vararg) = apply(tm.t, tm.o, I...)
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
50
156
ef3e6c70b6f9 Add missing type parameter to application operator
Jonatan Werpers <jonatan@werpers.com>
parents: 155
diff changeset
51 →(t::TensorMapping{T,R,D}, o::AbstractArray{T,D}) where {T,R,D} = TensorApplication(t,o)
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
52 # Should we overload some other infix binary operator?
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
53 # * has the wrong parsing properties... a*b*c is parsed to (a*b)*c (through a*b*c = *(a,b,c))
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
54 # while a→b→c is parsed as a→(b→c)
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
55 # The associativity of the operators might be fixed somehow... (rfold/lfold?)
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
56 # ∘ also is an option but that has the same problem as * (but is not n-ary) (or is this best used for composition of Mappings?)
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
57
157
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
58 # If we want to use * it would be something like this:
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
59 import Base.*
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
60 *(args::Union{TensorMapping{T}, AbstractArray{T}}...) where T = foldr(*,args)
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
61 *(t::TensorMapping{T,R,D}, o::AbstractArray{T,D}) where {T,R,D} = TensorApplication(t,o)
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
62 # We need to be really careful about good error messages.
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
63 # For example what happens if you try to multiply TensorApplication with a TensorMapping(wrong order)?
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
64
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
65
63b495d5dbc7 Add *-operator for tensor application
Jonatan Werpers <jonatan@werpers.com>
parents: 156
diff changeset
66
155
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
67 struct TensorMappingComposition{T,R,K,D} <: TensorMapping{T,R,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
68 t1::TensorMapping{T,R,K}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
69 t2::TensorMapping{T,K,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
70 end
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
71
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
72 import Base.∘
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
73 ∘(s::TensorMapping{T,R,K}, t::TensorMapping{T,K,D}) where {T,R,K,D} = TensorMappingComposition(s,t)
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
74
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
75 function apply(c::TensorMappingComposition{T,R,K,D}, v::AbstractArray{T,D}, I::Vararg) where {T,R,K,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
76 apply(c.t1, TensorApplication(c.t2,v), I...)
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
77 end
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
78
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
79 function apply_transpose(c::TensorMappingComposition{T,R,K,D}, v::AbstractArray{T,D}, I::Vararg) where {T,R,K,D}
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
80 apply_transpose(c.t2, TensorApplication(c.t1',v), I...)
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
81 end
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
82
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
83 # Have i gone too crazy with the type parameters? Maybe they aren't all needed?
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
84
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
85
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
86 export apply
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
87 export apply_transpose
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
88 export range_dim
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
89 export domain_dim
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
90 export range_size
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
91 export →
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
92
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
93
9fdbae11dd77 Add sketch of how Implicitly definied tensor mappings might work
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
94 end #module