Mercurial > repos > public > sbplib_julia

changeset 232:a20bb4fac23d boundary_conditions

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve tests for LazyTensors
author Jonatan Werpers <jonatan@werpers.com>
date Wed, 26 Jun 2019 17:41:44 +0200
parents 3d94f60f6fae
children 7d2ad8a73b1f
files LazyTensors/src/lazy_operations.jl LazyTensors/test/runtests.jl
diffstat 2 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/LazyTensors/src/lazy_operations.jl	Wed Jun 26 15:06:28 2019 +0200
+++ b/LazyTensors/src/lazy_operations.jl	Wed Jun 26 17:41:44 2019 +0200
@@ -139,8 +139,8 @@
 apply(tm::LazyTensorMappingTranspose{T,R,D}, v::AbstractArray{T,R}, I::Vararg) where {T,R,D} = apply_transpose(tm.tm, v, I...)
 apply_transpose(tm::LazyTensorMappingTranspose{T,R,D}, v::AbstractArray{T,D}, I::Vararg) where {T,R,D} = apply(tm.tm, v, I...)
 
-range_size(tmt::LazyTensorMappingTranspose{T,R,D}, d_size::NTuple{R,Integer}) where {T,R,D} = domain_size(tmt.tm, domain_size)
-domain_size(tmt::LazyTensorMappingTranspose{T,R,D}, r_size::NTuple{D,Integer}) where {T,R,D} = range_size(tmt.tm, range_size)
+range_size(tmt::LazyTensorMappingTranspose{T,R,D}, d_size::NTuple{R,Integer}) where {T,R,D} = domain_size(tmt.tm, d_size)
+domain_size(tmt::LazyTensorMappingTranspose{T,R,D}, r_size::NTuple{D,Integer}) where {T,R,D} = range_size(tmt.tm, r_size)
 
 
 
--- a/LazyTensors/test/runtests.jl	Wed Jun 26 15:06:28 2019 +0200
+++ b/LazyTensors/test/runtests.jl	Wed Jun 26 17:41:44 2019 +0200
@@ -21,10 +21,11 @@
     LazyTensors.apply(m::DummyMapping{T,R,D}, v, i) where {T,R,D} = :apply
     LazyTensors.apply_transpose(m::DummyMapping{T,R,D}, v, i) where {T,R,D} = :apply_transpose
 
-    LazyTensors.range_size(m::DummyMapping{T,R,D}, domain_size) where {T,R,D} = :range_size
-    LazyTensors.domain_size(m::DummyMapping{T,R,D}, range_size) where {T,R,D} = :domain_size
+    LazyTensors.range_size(m::DummyMapping{T,R,D}, domain_size::NTuple{D,Integer}) where {T,R,D} = :range_size
+    LazyTensors.domain_size(m::DummyMapping{T,R,D}, range_size::NTuple{R,Integer}) where {T,R,D} = :domain_size
 
     m = DummyMapping{Float64,2,3}()
+    @test m' isa TensorMapping{Float64, 3,2}
     @test m'' == m
     @test apply(m',zeros(Float64,(0,0)),0) == :apply_transpose
     @test apply(m'',zeros(Float64,(0,0,0)),0) == :apply
@@ -40,8 +41,8 @@
     LazyTensors.apply(m::DummyMapping{T,R,D}, v, i) where {T,R,D} = (:apply,v,i)
     LazyTensors.apply_transpose(m::DummyMapping{T,R,D}, v, i) where {T,R,D} = :apply_transpose
 
-    LazyTensors.range_size(m::DummyMapping{T,R,D}, domain_size) where {T,R,D} = 2 .* domain_size
-    LazyTensors.domain_size(m::DummyMapping{T,R,D}, range_size) where {T,R,D} = range_size.÷2
+    LazyTensors.range_size(m::DummyMapping{T,R,D}, domain_size::NTuple{D,Integer}) where {T,R,D} = 2 .* domain_size
+    LazyTensors.domain_size(m::DummyMapping{T,R,D}, range_size::NTuple{R,Integer}) where {T,R,D} = range_size.÷2
 
 
     m = DummyMapping{Int, 1, 1}()