changeset 1579:14d79b13b54f feature/grids/manifolds

Add tests, fix bugs, add exports, for Simplex and friends
author Jonatan Werpers <jonatan@werpers.com>
date Thu, 25 Apr 2024 22:14:46 +0200
parents 56da785ab576
children fdee60ab8c4e
files src/Grids/Grids.jl src/Grids/manifolds.jl test/Grids/manifolds_test.jl
diffstat 3 files changed, 24 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/Grids/Grids.jl	Thu Apr 25 21:55:01 2024 +0200
+++ b/src/Grids/Grids.jl	Thu Apr 25 22:14:46 2024 +0200
@@ -20,6 +20,11 @@
 export unitcube
 export unithyperbox
 
+export verticies
+export unittriangle
+export unittetrahedron
+export unitsimplex
+
 export Chart
 export ConcreteChart
 export parameterspace
--- a/src/Grids/manifolds.jl	Thu Apr 25 21:55:01 2024 +0200
+++ b/src/Grids/manifolds.jl	Thu Apr 25 22:14:46 2024 +0200
@@ -43,24 +43,26 @@
 unithyperbox(D) = unithyperbox(Float64,D)
 
 
-struct Simplex{T,D} <: ParameterSpace{D}
-    verticies::NTuple{D,SVector{D,T}}
+struct Simplex{T,D,NV} <: ParameterSpace{D}
+    verticies::NTuple{NV,SVector{D,T}}
 end
 
 Simplex(verticies::Vararg{AbstractArray}) = Simplex(Tuple(SVector(v...) for v ∈ verticies))
 
+verticies(s::Simplex) = s.verticies
+
 Triangle{T} = Simplex{T,2}
 Tetrahedron{T} = Simplex{T,3}
 
-unittriangle(T) = unitsimplex(T,2)
-unittetrahedron(T) = unitsimplex(T,3)
+unittriangle(T=Float64) = unitsimplex(T,2)
+unittetrahedron(T=Float64) = unitsimplex(T,3)
 function unitsimplex(T,D)
     z = @SVector zeros(T,D)
     unitelement = one(eltype(z))
-    verticies = ntuple(i->setindex(z, unitelement, i), 4)
-    return Simplex(verticies)
+    verticies = ntuple(i->setindex(z, unitelement, i), D)
+    return Simplex((z,verticies...))
 end
-
+unitsimplex(D) = unitsimplex(Float64, D)
 
 """
 
--- a/test/Grids/manifolds_test.jl	Thu Apr 25 21:55:01 2024 +0200
+++ b/test/Grids/manifolds_test.jl	Thu Apr 25 22:14:46 2024 +0200
@@ -32,6 +32,16 @@
 @testset "Simplex" begin
     @test Simplex([1,2], [3,4]) isa Simplex{Int, 2}
     @test Simplex([1,2,3], [4,5,6],[1,1,1]) isa Simplex{Int, 3}
+
+    @test verticies(Simplex([1,2], [3,4])) == ([1,2], [3,4])
+
+    @test unittriangle() isa Simplex{Float64,2}
+    @test verticies(unittriangle()) == ([0,0], [1,0], [0,1])
+
+    @test unittetrahedron() isa  Simplex{Float64,3}
+    @test verticies(unittetrahedron()) == ([0,0,0], [1,0,0], [0,1,0],[0,0,1])
+
+    @test unitsimplex(4) isa Simplex{Float64,4}
 end
 
 @testset "Chart" begin