Skip to content

Commit

Permalink
disambiguated visual methods
Browse files Browse the repository at this point in the history
  • Loading branch information
@chakravala
chakravala committed Sep 28, 2024
1 parent 0d4e03c commit 8e7a997
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 31 deletions.
82 changes: 55 additions & 27 deletions src/Cartan.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ TensorField(id::Int,dom,cod::Array,met::GlobalFiber) = TensorField(id,dom,cod,fi
TensorField(dom::AbstractFrameBundle,cod::AbstractFrameBundle) = TensorField(dom,points(cod))
TensorField(dom::AbstractArray{B,N} where B,cod::Array{F,N} where F,met::AbstractArray=Global{N}(InducedMetric())) where N = TensorField((global grid_id+=1),dom,cod,fiber(met))
TensorField(dom::ChainBundle,cod::Vector,met::AbstractVector=Global{1}(InducedMetric())) = TensorField((global grid_id+=1),dom,cod,met)
TensorField(a::TensorField,b::TensorField) = TensorField(fiber(a),fiber(b))

#const ParametricMesh{B,F,P<:AbstractVector{<:Chain}} = TensorField{B,F,1,P}
const ScalarMap{B,F<:AbstractReal,P<:SimplexFrameBundle} = TensorField{B,F,1,P}
Expand Down Expand Up @@ -465,16 +466,16 @@ function __init__()
#Makie.lines(t::TensorField{B,F,1};args...) where {B<:Coordinate{<:AbstractReal},F<:AbstractReal} = linegraph(t;args...)
#Makie.lines!(t::TensorField{B,F,1};args...) where {B<:Coordinate{<:AbstractReal},F<:AbstractReal} = linegraph(t;args...)
function linegraph(t::GradedField{G,B,F,1} where G;args...) where {B<:Coordinate{<:AbstractReal},F}
x,y = Real.(domain(t)),value.(codomain(t))
x,y = Real.(points(t)),value.(codomain(t))
display(Makie.lines(x,Real.(getindex.(y,1));args...))
for i ∈ 2:binomial(mdims(codomain(t)),G)
for i ∈ 2:binomial(mdims(codomain(t)),grade(t))
Makie.lines!(x,Real.(getindex.(y,i));args...)
end
end
function linegraph!(t::GradedField{G,B,F,1} where G;args...) where {B<:Coordinate{<:AbstractReal},F}
x,y = Real.(domain(t)),value.(codomain(t))
x,y = Real.(points(t)),value.(codomain(t))
display(Makie.lines!(x,Real.(getindex.(y,1));args...))
for i ∈ 2:binomial(mdims(codomain(t)),G)
for i ∈ 2:binomial(mdims(codomain(t)),grade(t))
Makie.lines!(x,Real.(getindex.(y,i));args...)
end
end
Expand All @@ -490,6 +491,12 @@ function __init__()
Makie.lines!(getindex.(t,i);args...)
end
end
function Makie.arrows(M::VectorField,t::TensorField{B,<:Endomorphism,N,<:GridFrameBundle} where B;args...) where N
Makie.arrows(TensorField(fiber(M),fiber(t));args...)
end
function Makie.arrows!(M::VectorField,t::TensorField{B,<:Endomorphism,N,<:GridFrameBundle} where B;args...) where N
Makie.arrows!(TensorField(fiber(M),fiber(t)))
end
function Makie.arrows(t::TensorField{<:Coordinate{<:Chain},<:Endomorphism,N,<:GridFrameBundle};args...) where N
display(Makie.arrows(getindex.(t,1);args...))
for i ∈ 2:mdims(eltype(codomain(t)))
Expand All @@ -514,9 +521,9 @@ function __init__()
Makie.arrows!(getindex.(t,i);args...)
end
end
Makie.volume(t::VolumeGrid;args...) = Makie.volume(domain(t).v...,Real.(codomain(t));args...)
Makie.volume!(t::VolumeGrid;args...) = Makie.volume!(domain(t).v...,Real.(codomain(t));args...)
Makie.volumeslices(t::VolumeGrid;args...) = Makie.volumeslices(domain(t).v...,Real.(codomain(t));args...)
Makie.volume(t::VolumeGrid;args...) = Makie.volume(points(t).v...,Real.(codomain(t));args...)
Makie.volume!(t::VolumeGrid;args...) = Makie.volume!(points(t).v...,Real.(codomain(t));args...)
Makie.volumeslices(t::VolumeGrid;args...) = Makie.volumeslices(points(t).v...,Real.(codomain(t));args...)
for fun ∈ (:surface,:surface!)
@eval begin
Makie.$fun(t::SurfaceGrid;args...) = Makie.$fun(points(t).v...,Real.(codomain(t));color=Real.(abs.(codomain(gradient_fast(Real(t))))),args...)
Expand All @@ -534,15 +541,15 @@ function __init__()
end
for fun ∈ (:contour,:contour!,:contourf,:contourf!,:contour3d,:contour3d!,:wireframe,:wireframe!)
@eval begin
Makie.$fun(t::ComplexMap{B,F,2,<:RealSpace{2}} where {B,F};args...) = Makie.$fun(domain(t).v...,Real.(radius.(codomain(t)));args...)
Makie.$fun(t::ComplexMap{B,F,2,<:RealSpace{2}} where {B,F};args...) = Makie.$fun(points(t).v...,Real.(radius.(codomain(t)));args...)
end
end
for fun ∈ (:heatmap,:heatmap!)
@eval begin
Makie.$fun(t::ComplexMap{B,F,2,<:RealSpace{2}} where {B,F};args...) = Makie.$fun(domain(t).v...,Real.(angle.(codomain(t)));colormap=:twilight,args...)
Makie.$fun(t::ComplexMap{B,F,2,<:RealSpace{2}} where {B,F};args...) = Makie.$fun(points(t).v...,Real.(angle.(codomain(t)));colormap=:twilight,args...)
end
end
for fun ∈ (:contour,:contour!,:contourf,:contourf!,:contour3d,:contour3d!,:heatmap,:heatmap!,:wireframe,:wireframe!)
for fun ∈ (:contour,:contour!,:contourf,:contourf!,:contour3d,:contour3d!,:heatmap,:heatmap!)
@eval begin
Makie.$fun(t::SurfaceGrid;args...) = Makie.$fun(points(t).v...,Real.(codomain(t));args...)
function Makie.$fun(t::GradedField{G,B,F,2,<:RealSpace{2}} where G;args...) where {B,F}
Expand All @@ -554,6 +561,8 @@ function __init__()
end
end
end
Makie.wireframe(t::SurfaceGrid;args...) = Makie.wireframe(graph(t);args...)
Makie.wireframe!(t::SurfaceGrid;args...) = Makie.wireframe!(graph(t);args...)
for fun ∈ (:streamplot,:streamplot!)
@eval begin
Makie.$fun(f::Function,t::Rectangle;args...) = Makie.$fun(f,t.v...;args...)
Expand All @@ -567,9 +576,10 @@ function __init__()
for fun ∈ (:arrows,:arrows!)
@eval begin
Makie.$fun(t::ScalarField{<:Coordinate{<:Chain},F,2,<:RealSpace{2}} where F;args...) = Makie.$fun(Makie.Point.(fiber(graph(Real(t))))[:],Makie.Point.(fiber(normal(Real(t))))[:];args...)
Makie.$fun(t::VectorField{<:Coordinate{<:Chain},<:Chain{V,G,T,2} where {V,G,T},2,<:AlignedRegion{2}};args...) = Makie.$fun(domain(t).v...,getindex.(codomain(t),1),getindex.(codomain(t),2);args...)
Makie.$fun(t::VectorField{<:Coordinate{<:Chain{W,L,F,2} where {W,L,F}},<:Chain{V,G,T,2} where {V,G,T},2,<:AlignedRegion{2}};args...) = Makie.$fun(domain(t).v...,getindex.(codomain(t),1),getindex.(codomain(t),2);args...)
Makie.$fun(t::VectorField{<:Coordinate{<:Chain},F,2,<:RealSpace{2}} where F;args...) = Makie.$fun(Makie.Point.(points(t))[:],Makie.Point.(codomain(t))[:];args...)
Makie.$fun(t::VectorField{<:Coordinate{<:Chain},F,N,<:GridFrameBundle} where {F,N};args...) = Makie.$fun(Makie.Point.(points(t))[:],Makie.Point.(codomain(t))[:];args...)
Makie.$fun(t::VectorField,f::VectorField;args...) = Makie.$fun(Makie.Point.(fiber(t))[:],Makie.Point.(fiber(t))[:];args...)
Makie.$fun(t::Rectangle,f::Function;args...) = Makie.$fun(t.v...,f;args...)
Makie.$fun(t::Hyperrectangle,f::Function;args...) = Makie.$fun(t.v...,f;args...)
Makie.$fun(t::ScalarMap;args...) = Makie.$fun(points(points(t)),Real.(codomain(t));args...)
Expand Down Expand Up @@ -602,16 +612,34 @@ function __init__()
for fun ∈ (:mesh,:mesh!,:wireframe,:wireframe!)
@eval Makie.$fun(M::GridFrameBundle;args...) = Makie.$fun(GeometryBasics.Mesh(M);args...)
end
function Makie.mesh(M::TensorField{B,F,2,<:GridFrameBundle} where {B,F};args...)
function linegraph(M::TensorField{B,<:Chain,2,<:GridFrameBundle} where B;args...)
variation(M,Makie.lines,Makie.lines!)
alteration(M,Makie.lines!,Makie.lines!)
#Makie.mesh(GeometryBasics.Mesh(base(M));color=fiber(M)[:],args...)
end
function Makie.mesh!(M::TensorField{B,F,2,<:GridFrameBundle} where {B,F};args...)
function linegraph!(M::TensorField{B,<:Chain,2,<:GridFrameBundle} where B;args...)
variation(M,Makie.lines!,Makie.lines!)
alteration(M,Makie.lines!,Makie.lines!)
#Makie.mesh!(GeometryBasics.Mesh(base(M));color=fiber(M)[:],args...)
end
function Makie.mesh(M::TensorField{B,<:Chain,2,<:GridFrameBundle} where B;args...)
Makie.mesh(GridFrameBundle(fiber(M));args...)
end
function Makie.mesh!(M::TensorField{B,<:Chain,2,<:GridFrameBundle} where B;args...)
Makie.mesh!(GridFrameBundle(fiber(M));args...)
end
function Makie.mesh(M::TensorField{B,<:AbstractReal,2,<:GridFrameBundle} where B;args...)
Makie.mesh(GeometryBasics.Mesh(base(M));color=fiber(M)[:],args...)
end
function Makie.mesh!(M::TensorField{B,<:AbstractReal,2,<:GridFrameBundle} where B;args...)
Makie.mesh!(GeometryBasics.Mesh(base(M));color=fiber(M)[:],args...)
end
function Makie.mesh(M::TensorField{B,<:Chain,2,<:GridFrameBundle} where B,f::TensorField;args...)
Makie.mesh(GridFrameBundle(fiber(M));color=fiber(f)[:],args...)
end
function Makie.mesh!(M::TensorField{B,<:Chain,2,<:GridFrameBundle} where B,f::TensorField;args...)
Makie.mesh!(GridFrameBundle(fiber(M));color=fiber(f)[:],args...)
end
Makie.wireframe(M::TensorField{B,<:Chain,2,<:GridFrameBundle} where B;args...) = Makie.wireframe(GridFrameBundle(fiber(M));args...)
Makie.wireframe!(M::TensorField{B,<:Chain,2,<:GridFrameBundle} where B;args...) = Makie.wireframe!(GridFrameBundle(fiber(M));args...)
function Makie.mesh(M::SimplexFrameBundle;args...)
if mdims(points(M)) == 2
sm = submesh(M)[:,1]
Expand All @@ -634,21 +662,21 @@ function __init__()
@require UnicodePlots="b8865327-cd53-5732-bb35-84acbb429228" begin
UnicodePlots.lineplot(t::ScalarMap;args...) = UnicodePlots.lineplot(getindex.(domain(t),2),codomain(t);args...)
UnicodePlots.lineplot(t::PlaneCurve;args...) = UnicodePlots.lineplot(getindex.(codomain(t),1),getindex.(codomain(t),2);args...)
UnicodePlots.lineplot(t::RealFunction;args...) = UnicodePlots.lineplot(Real.(domain(t)),Real.(codomain(t));args...)
UnicodePlots.lineplot(t::ComplexMap{B,F,1};args...) where {B<:AbstractReal,F} = UnicodePlots.lineplot(real.(Complex.(codomain(t))),imag.(Complex.(codomain(t)));args...)
UnicodePlots.lineplot(t::GradedField{G,B,F,1};args...) where {G,B<:Coordinate{<:AbstractReal},F} = UnicodePlots.lineplot(Real.(domain(t)),Grassmann.array(codomain(t));args...)
UnicodePlots.contourplot(t::ComplexMap{B,F,2,<:RealSpace{2}} where {B,F};args...) = UnicodePlots.contourplot(t.dom.v[1][2:end-1],t.dom.v[2][2:end-1],(x,y)->radius(t(Chain(x,y)));args...)
UnicodePlots.contourplot(t::SurfaceGrid;args...) = UnicodePlots.contourplot(t.dom.v[1][2:end-1],t.dom.v[2][2:end-1],(x,y)->t(Chain(x,y));args...)
UnicodePlots.surfaceplot(t::SurfaceGrid;args...) = UnicodePlots.surfaceplot(t.dom.v[1][2:end-1],t.dom.v[2][2:end-1],(x,y)->t(Chain(x,y));args...)
UnicodePlots.surfaceplot(t::ComplexMap{B,F,2,<:RealSpace{2}} where {B,F};args...) = UnicodePlots.surfaceplot(t.dom.v[1][2:end-1],t.dom.v[2][2:end-1],(x,y)->radius(t(Chain(x,y)));colormap=:twilight,args...)
UnicodePlots.lineplot(t::RealFunction;args...) = UnicodePlots.lineplot(Real.(points(t)),Real.(codomain(t));args...)
UnicodePlots.lineplot(t::ComplexMap{B,F,1};args...) where {B<:Coordinate{<:AbstractReal},F} = UnicodePlots.lineplot(real.(Complex.(codomain(t))),imag.(Complex.(codomain(t)));args...)
UnicodePlots.lineplot(t::GradedField{G,B,F,1} where {G,F};args...) where B<:Coordinate{<:AbstractReal} = UnicodePlots.lineplot(Real.(points(t)),Grassmann.array(codomain(t));args...)
UnicodePlots.contourplot(t::ComplexMap{B,F,2,<:RealSpace{2}} where {B,F};args...) = UnicodePlots.contourplot(points(t).v[1][2:end-1],points(t).v[2][2:end-1],(x,y)->radius(t(Chain(x,y)));args...)
UnicodePlots.contourplot(t::SurfaceGrid;args...) = UnicodePlots.contourplot(points(t).v[1][2:end-1],points(t).v[2][2:end-1],(x,y)->t(Chain(x,y));args...)
UnicodePlots.surfaceplot(t::SurfaceGrid;args...) = UnicodePlots.surfaceplot(points(t).v[1][2:end-1],points(t).v[2][2:end-1],(x,y)->t(Chain(x,y));args...)
UnicodePlots.surfaceplot(t::ComplexMap{B,F,2,<:RealSpace{2}} where {B,F};args...) = UnicodePlots.surfaceplot(points(t).v[1][2:end-1],points(t).v[2][2:end-1],(x,y)->radius(t(Chain(x,y)));colormap=:twilight,args...)
UnicodePlots.spy(t::SurfaceGrid;args...) = UnicodePlots.spy(Real.(codomain(t));args...)
UnicodePlots.heatmap(t::SurfaceGrid;args...) = UnicodePlots.heatmap(Real.(codomain(t));xfact=step(t.dom.v[1]),yfact=step(t.dom.v[2]),xoffset=t.dom.v[1][1],yoffset=t.dom.v[2][1],args...)
UnicodePlots.heatmap(t::ComplexMap{B,F,2,<:RealSpace{2}} where {B,F};args...) = UnicodePlots.heatmap(Real.(angle.(codomain(t)));xfact=step(t.dom.v[1]),yfact=step(t.dom.v[2]),xoffset=t.dom.v[1][1],yoffset=t.dom.v[2][1],colormap=:twilight,args...)
UnicodePlots.heatmap(t::SurfaceGrid;args...) = UnicodePlots.heatmap(Real.(codomain(t));xfact=step(points(t).v[1]),yfact=step(points(t).v[2]),xoffset=points(t).v[1][1],yoffset=points(t).v[2][1],args...)
UnicodePlots.heatmap(t::ComplexMap{B,F,2,<:RealSpace{2}} where {B,F};args...) = UnicodePlots.heatmap(Real.(angle.(codomain(t)));xfact=step(points(t).v[1]),yfact=step(points(t).v[2]),xoffset=points(t).v[1][1],yoffset=points(t).v[2][1],colormap=:twilight,args...)
Base.display(t::PlaneCurve) = (display(typeof(t)); display(UnicodePlots.lineplot(t)))
Base.display(t::RealFunction) = (display(typeof(t)); display(UnicodePlots.lineplot(t)))
Base.display(t::ComplexMap{B,F,1,<:Interval}) where {B,F} = (display(typeof(t)); display(UnicodePlots.lineplot(t)))
Base.display(t::ComplexMap{B,F,2,<:RealSpace{2}} where {B,F}) = (display(typeof(t)); display(UnicodePlots.heatmap(t)))
Base.display(t::GradedField{G,B,F,1,<:Interval}) where {G,B,F} = (display(typeof(t)); display(UnicodePlots.lineplot(t)))
Base.display(t::ComplexMap{B,<:AbstractComplex,1,<:Interval}) where B = (display(typeof(t)); display(UnicodePlots.lineplot(t)))
Base.display(t::ComplexMap{B,<:AbstractComplex,2,<:RealSpace{2}} where B) = (display(typeof(t)); display(UnicodePlots.heatmap(t)))
Base.display(t::GradedField{G,B,<:TensorGraded,1,<:Interval} where {G,B}) = (display(typeof(t)); display(UnicodePlots.lineplot(t)))
Base.display(t::SurfaceGrid) = (display(typeof(t)); display(UnicodePlots.heatmap(t)))
end
@require GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326" begin
Expand Down
28 changes: 24 additions & 4 deletions src/diffgeo.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ for fun ∈ (:_slow,:_fast)
:(Chain($([:($$cd(f,l[$n],Val($n),i...)) for n ∈ list(1,N)]...)))
end
$cd(f::RealRegion) = ProductSpace($cd.(f.v))
$cd(f::GridFrameBundle{Coordinate{P,G},N,<:PointArray{P,G,N,<:RealRegion,<:Global{N,<:InducedMetric}}}) where {P,G,N} = ProductSpace($cd.(base(f).v))
$cd(f::GridFrameBundle{Coordinate{P,G},N,<:PointArray{P,G,N,<:RealRegion}}) where {P,G,N} = applymetric.($cd(base(f)),fiber(f))
$cd(f::GridFrameBundle{Coordinate{P,G},N,<:PointArray{P,G,N,<:RealRegion,<:Global{N,<:InducedMetric}}}) where {P,G,N} = ProductSpace($cd.(base(base(f)).v))
$cd(f::GridFrameBundle{Coordinate{P,G},N,<:PointArray{P,G,N,<:RealRegion}}) where {P,G,N} = applymetric.($cd(base(base(f))),fiber(f))
function $cd(f::AbstractRange,l::Tuple=size(f))
d = Vector{eltype(f)}(undef,l[1])
@threads for i ∈ 1:l[1]
Expand Down Expand Up @@ -530,15 +530,30 @@ end

export arclength, arctime, trapz, cumtrapz, linecumtrapz, psum, pcumsum
export centraldiff, tangent, tangent_fast, unittangent, speed, normal, unitnormal
export curvenormal, unitcurvenormal
export curvenormal, unitcurvenormal, ribbon, tangentsurface, planecurve
export normalnorm, area, surfacearea, weingarten, gauss

# use graph for IntervalMap? or RealFunction!
tangent(f::IntervalMap) = gradient(f)
tangent(f::ScalarField) = det(gradient(graph(f)))
tangent(f::ScalarField) = tangent(graph(f))
tangent(f::VectorField) = det(gradient(f))
normal(f::ScalarField) = ⋆tangent(f)
normal(f::VectorField) = ⋆tangent(f)
unittangent(f::ScalarField,n=tangent(f)) = TensorField(domain(f), codomain(n)./abs.(.⋆codomain(n)))
unittangent(f::VectorField,n=tangent(f)) = TensorField(domain(f), codomain(n)./abs.(.⋆codomain(n)))
unittangent(f::IntervalMap) = unitgradient(f)
unitnormal(f) = ⋆unittangent(f)
normalnorm(f) = Real(abs(normal(f)))

ribbon(f::AbstractCurve,g::Vector{<:AbstractCurve}) = TensorField(points(f)⊕LinRange(0,1,length(g)+1),hcat(fiber(f),fiber.(g)...))
ribbon(f::AbstractCurve,g::AbstractCurve,n::Int=100) = tangentsurface(f,g-f,n)
tangentsurface(f::AbstractCurve,g::AbstractCurve,n::Int=100) = ribbon(f,Ref(f).+(LinRange(inv(n),1,n).*Ref(g)))
tangentsurface(f::AbstractCurve,v::Real=1,n::Int=100) = tangentsurface(f,v*tangent(f),n)

area(f::VectorField) = integral(normalnorm(f))
surfacearea(f::VectorField) = integrate(normalnorm(f))
weingarten(f::VectorField) = gradient(unitnormal(f))
gauss(f::VectorField) = Real(abs(det(weingarten(f))))

function speed(f::IntervalMap,d=centraldiff(points(f)),t=centraldiff(codomain(f),d))
TensorField(domain(f), abs.(t))
Expand Down Expand Up @@ -656,6 +671,11 @@ end
#bishoppolar(f::TensorField) = TensorField(domain(f), Chain.(value.(codomain(curvature(f))),getindex.(codomain(cumtrapz(torsion(f))),1)))
#bishop(f::TensorField,κ=value.(codomain(curvature(f))),θ=getindex.(codomain(cumtrapz(torsion(f))),1)) = TensorField(domain(f), Chain.(κ.*cos.(θ),κ.*sin.(θ)))

function planecurve(κ::RealFunction,φ::Real=0.0)
int = iszero(φ) ? integral(κ) : integral(κ)+φ
integral(Chain.(cos(int),sin(int)))
end

export surfacemetric, surfaceframe

surfacemetric(dom::ScalarField,f::Function) = surfacemetric(TensorField(dom,f))
Expand Down

2 comments on commit 8e7a997

@chakravala
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register()

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/116219

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.3.2 -m "<description of version>" 8e7a997f7ca0e2b2dba5ef85d8d3002b47badb88
git push origin v0.3.2

Please sign in to comment.