upgraded to AbstractTensors v0.6

Author: chakravala

Project.toml

@@ -1,7 +1,7 @@
 name = "DirectSum"
 uuid = "22fd7b30-a8c0-5bf2-aabe-97783860d07c"
 authors = ["Michael Reed"]
-version = "0.7.2"
+version = "0.7.3"
 
 [deps]
 ComputedFieldTypes = "459fdd68-db75-56b8-8c15-d717a790f88e"
@@ -13,7 +13,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 [compat]
 julia = "1"
 Leibniz = "0.1"
-AbstractTensors = "0.5.2"
+AbstractTensors = "0.6"
 ComputedFieldTypes = "0.1"
 
 [extras]

README.md

@@ -23,7 +23,7 @@ Sponsor this at [liberapay](https://liberapay.com/chakravala), [GitHub Sponsors]
 
 ## DirectSum yields `TensorBundle` parametric type polymorphism ⨁
 
-Let `n` be the rank of a `Manifold{n}`.
+Let `n` be the rank of a `Manifold`.
 The type `TensorBundle{n,ℙ,g,ν,μ}` uses *byte-encoded* data available at pre-compilation, where
 `ℙ` specifies the basis for up and down projection,
 `g` is a bilinear form that specifies the metric of the space,

src/DirectSum.jl

@@ -3,7 +3,7 @@ module DirectSum
 #   This file is part of DirectSum.jl. It is licensed under the AGPL license
 #   Grassmann Copyright (C) 2019 Michael Reed
 
-export TensorBundle, Signature, DiagonalForm, Manifold, SubManifold, ℝ, ⊕
+export TensorBundle, Signature, DiagonalForm, Manifold, SubManifold, ℝ, ⊕, mdims
 import Base: getindex, convert, @pure, +, *, ∪, ∩, ⊆, ⊇, ==
 import LinearAlgebra, AbstractTensors
 import LinearAlgebra: det, rank
@@ -45,6 +45,8 @@ and `μ` is an integer specifying the order of the tangent bundle (i.e. multipli
 Lastly, `ν` is the number of tangent variables.
 """
 abstract type TensorBundle{n,Options,Metrics,Vars,Diff,Name} <: Manifold{n} end
+rank(::TensorBundle{n}) where n = n
+mdims(M::TensorBundle) = rank(M)
 
 @pure doc2m(d,o,c=0,C=0) = (1<<(d-1))|(1<<(2*o-1))|(c<0 ? 8 : (1<<(3*c-1)))|(1<<(5*C-1))
 
@@ -192,8 +194,8 @@ struct SubManifold{V,n,Indices} <: TensorTerm{V,n}
 end
 
 @pure SubManifold(V::Int) where N = SubManifold{V,V}()
-@pure SubManifold(V::M) where M<:Manifold{N} where N = SubManifold{V,N}()
-@pure SubManifold{M}() where M<:Manifold{N} where N = SubManifold{V,N}()
+@pure SubManifold(V::M) where M<:Manifold = SubManifold{V,rank(V)}()
+#@pure SubManifold{M}() where M = SubManifold{M isa Int ? SubManifold(M) : M,rank(M)}()
 @pure SubManifold{V,N}() where {V,N} = SubManifold{V,N}(UInt(1)<<N-1)
 @pure SubManifold{M,N}(b::UInt) where {M,N} = SubManifold{M,N,b}()
 SubManifold{M,N}(b::Values{N}) where {M,N} = SubManifold{M,N}(bit2int(indexbits(mdims(M),b)))
@@ -203,6 +205,9 @@ SubManifold{M}(b::Tuple) where M = SubManifold{M,length(b)}(Values(b...))
 SubManifold{M}(b::Values) where M = SubManifold{M,length(b)}(b)
 SubManifold{M}(b...) where M = SubManifold{M}(b)
 
+@pure issubmanifold(V::SubManifold) = true
+@pure issubmanifold(V) = false
+
 for t ∈ ((:V,),(:V,:G))
     @eval begin
         function SubManifold{$(t...)}(b::VTI) where {$(t...)}

src/basis.jl

@@ -24,7 +24,7 @@ end
 #@pure labels(V::T) where T<:Manifold = labels(V,pre[1],pre[2],pre[3],pre[4])
 
 generate(V::Int) = generate(SubManifold(V),V)
-generate(V::Manifold{N}) where N = generate(V,N)
+generate(V::Manifold) = generate(V,rank(V))
 function generate(V,N)
     exp = SubManifold{V}[SubManifold{V,0}(g_zero(UInt))]
     for i ∈ 1:N
@@ -44,18 +44,17 @@ export @basis, @basis_str, @dualbasis, @dualbasis_str, @mixedbasis, @mixedbasis_
 Generates `Basis` declaration having `Manifold` specified by `V`.
 The first argument provides pseudoscalar specifications, the second argument is the variable name for the `Manifold`, and the third and fourth argument are variable prefixes of the `SubManifold` vector names (and covector basis names).
 """
-function basis(V,sig=vsn[1],vec=pre[1],cov=pre[2],duo=pre[3],dif=pre[4])
+function alloc(V,sig=vsn[1],vec=pre[1],cov=pre[2],duo=pre[3],dif=pre[4])
     N = mdims(V)
     if N > algebra_limit
-        Λ(V) # fill cache
+        G = Λ(V) # fill cache
         basis = generate(V)
         sym = labels(V,string.([vec,cov,duo,dif])...)
     else
         basis = Λ(V).b
         sym = labels(V,string.([vec,cov,duo,dif])...)
     end
-    T = typeof(V)
-    @inbounds exp = Expr[Expr(:(=),esc(sig),T<:SubManifold ? V : SubManifold(V)),
+    @inbounds exp = Expr[Expr(:(=),esc(sig),convert(SubManifold,V)),
         Expr(:(=),esc(Symbol(vec)),basis[1])]
     for i ∈ 2:1<<N
         @inbounds push!(exp,Expr(:(=),esc(Symbol("$(basis[i])")),basis[i]))
@@ -64,6 +63,7 @@ function basis(V,sig=vsn[1],vec=pre[1],cov=pre[2],duo=pre[3],dif=pre[4])
     push!(exp,Expr(:(=),esc(Symbol(vec,'⃖')) ,esc(vec)))
     return Expr(:block,exp...,Expr(:tuple,esc(sig),esc.(sym)...))
 end
+alloc(V::TensorBundle,args...) = alloc(SubManifold(V),args...)
 
 """
     @basis
@@ -76,11 +76,11 @@ Default for `@basis M` is `@basis M V v w ∂ ϵ`.
 macro basis(q,sig=vsn[1],vec=pre[1],cov=pre[2],duo=pre[3],dif=pre[4])
     T = typeof(q)
     V = T∈(Symbol,Expr) ? (@eval(__module__,$q)) : T<:Int ? q : Manifold(q)
-    basis(V,sig,string.([vec,cov,duo,dif])...)
+    alloc(V,sig,string.([vec,cov,duo,dif])...)
 end
 
 macro basis_str(str)
-    basis(Manifold(str))
+    alloc(Manifold(str))
 end
 
 """
@@ -92,11 +92,11 @@ The first argument provides pseudoscalar specifications, the second argument is
 Default for `@dualbasis M` is `@dualbasis M VV w ϵ`.
 """
 macro dualbasis(q,sig=vsn[2],cov=pre[2],dif=pre[4])
-    basis((typeof(q)∈(Symbol,Expr) ? (@eval(__module__,$q)) : Manifold(q))',sig,string.([pre[1],cov,pre[3],dif])...)
+    alloc((typeof(q)∈(Symbol,Expr) ? (@eval(__module__,$q)) : Manifold(q))',sig,string.([pre[1],cov,pre[3],dif])...)
 end
 
 macro dualbasis_str(str)
-    basis(Manifold(str)',vsn[2])
+    alloc(Manifold(str)',vsn[2])
 end
 
 """
@@ -109,14 +109,14 @@ Default for `@mixedbasis M` is `@mixedbasis M V v w ∂ ϵ`.
 """
 macro mixedbasis(q,sig=vsn[3],vec=pre[1],cov=pre[2],duo=pre[3],dif=pre[4])
     V = typeof(q)∈(Symbol,Expr) ? (@eval(__module__,$q)) : Manifold(q)
-    bases = basis(V⊕V',sig,string.([vec,cov,duo,dif])...)
-    Expr(:block,bases,basis(V',vsn[2]),basis(V),bases.args[end])
+    bases = alloc(V⊕V',sig,string.([vec,cov,duo,dif])...)
+    Expr(:block,bases,alloc(V',vsn[2]),alloc(V),bases.args[end])
 end
 
 macro mixedbasis_str(str)
     V = Manifold(str)
-    bases = basis(V⊕V',vsn[3])
-    Expr(:block,bases,basis(V',vsn[2]),basis(V),bases.args[end])
+    bases = alloc(V⊕V',vsn[3])
+    Expr(:block,bases,alloc(V',vsn[2]),alloc(V),bases.args[end])
 end
 
 @inline function lookup_basis(V,v::Symbol)::Union{Simplex,SubManifold}
@@ -144,7 +144,7 @@ Base.length(a::T) where T<:SubAlgebra{V} where V = 1<<mdims(V)
 ## Algebra{N}
 
 @computed struct Basis{V} <: SubAlgebra{V}
-    b::Values{1<<(typeof(V)<:Int ? V : mdims(V)),SubManifold{V}}
+    b::Values{1<<mdims(V),SubManifold{V}}
     g::Dict{Symbol,Int}
 end
 

src/generic.jl

@@ -15,17 +15,20 @@ export valuetype, value, hasinf, hasorigin, isorigin, norm, indices, tangent, is
 (M::DiagonalForm)(b::T) where T<:AbstractRange{Int} = SubManifold{M}(b)
 (M::SubManifold)(b::T) where T<:AbstractRange{Int} = SubManifold{supermanifold(M)}(b)
 
-@pure Base.ndims(S::SubManifold{M,G}) where {G,M} = isbasis(S) ? mdims(M) : G
+@pure _polymode(M::Int) = iszero(M&16)
+@pure _dyadmode(M::Int) = M%16 ∈ 8:11 ? -1 : Int(M%16 ∈ (4,5,6,7))
+@pure _hasinf(M::Int) = M%16 ∈ (1,3,5,7,9,11)
+@pure _hasorigin(M::Int) = M%16 ∈ (2,3,6,7,10,11)
+
+#@pure Base.ndims(S::SubManifold{M,G}) where {G,M} = isbasis(S) ? mdims(M) : G
 @pure AbstractTensors.mdims(S::SubManifold{M,G}) where {G,M} = isbasis(S) ? mdims(M) : G
 @pure order(m::SubManifold{V,G,B} where G) where {V,B} = count_ones(symmetricmask(V,B,B)[4])
 @pure order(m::Simplex) = order(basis(m))+order(value(m))
 @pure options(::T) where T<:TensorBundle{N,M} where N where M = M
 @pure options_list(V::M) where M<:Manifold = hasinf(V),hasorigin(V),dyadmode(V),polymode(V)
 @pure metric(::T) where T<:TensorBundle{N,M,S} where {N,M} where S = S
 @pure metric(V::Signature,b::UInt) = isodd(count_ones(metric(V)&b)) ? -1 : 1
-@pure _polymode(M::Int) = iszero(M&16)
 @pure polymode(::T) where T<:TensorBundle{N,M} where N where M = _polymode(M)
-@pure _dyadmode(M::Int) = M%16 ∈ 8:11 ? -1 : Int(M%16 ∈ (4,5,6,7))
 @pure dyadmode(::T) where T<:TensorBundle{N,M} where N where M = _dyadmode(M)
 @pure diffmode(::T) where T<:TensorBundle{N,M,S,F,D} where {N,M,S,F} where D = D
 @pure diffvars(::T) where T<:TensorBundle{N,M,S,F} where {N,M,S} where F = F
@@ -53,6 +56,7 @@ for T ∈ (:T,:(Type{T}))
         @pure basis(m::$T) where T<:SubManifold = isbasis(m) ? m : SubManifold(m)
         @pure basis(m::$T) where T<:Simplex{V,G,B} where {V,G} where B = B
         @pure UInt(b::$T) where T<:SubManifold{V,G,B} where {V,G} where B = B::UInt
+        @pure UInt(b::$T) where T<:Simplex = UInt(basis(b))
     end
 end
 @pure det(s::Signature) = isodd(count_ones(metric(s))) ? -1 : 1
@@ -76,11 +80,9 @@ for T ∈ (Expr,Symbol)
     @eval @inline Base.iszero(t::Simplex{V,G,B,$T} where {V,G,B}) = false
 end
 
-@pure _hasinf(M::Int) = M%16 ∈ (1,3,5,7,9,11)
 @pure hasinf(::T) where T<:TensorBundle{N,M} where N where M = _hasinf(M)
 @pure hasinf(::SubManifold{M,N,S} where N) where {M,S} = hasinf(M) && isodd(S)
 @pure hasinf(t::Simplex) = hasinf(basis(t))
-@pure _hasorigin(M::Int) = M%16 ∈ (2,3,6,7,10,11)
 @pure hasorigin(::T) where T<:TensorBundle{N,M} where N where M = _hasorigin(M)
 @pure hasorigin(V::SubManifold{M,N,S} where N) where {M,S} = hasorigin(M) && (hasinf(M) ? (d=UInt(2);(d&S)==d) : isodd(S))
 @pure hasorigin(t::Simplex) = hasorigin(basis(t))
@@ -100,13 +102,14 @@ for M ∈ (:Signature,:DiagonalForm)
     @eval @pure loworder(V::$M{N,M,S,D,O}) where {N,M,S,D,O} = O≠0 ? $M{N,M,S,D,O-1}() : V
 end
 @pure loworder(::SubManifold{M,N,S}) where {N,M,S} = SubManifold{loworder(M),N,S}()
+@pure loworder(::Type{T}) where T = loworder(T())
 
 # dual involution
 
 @pure flip_sig(N,S::UInt) = UInt(2^N-1) & (~S)
 
 @pure dual(V::T) where T<:Manifold = isdyadic(V) ? V : V'
-@pure dual(V::T,B,M=Int(N/2)) where T<:Manifold{N} where N = ((B<<M)&((1<<N)-1))|(B>>M)
+@pure dual(V::T,B,M=Int(rank(V)/2)) where T<:Manifold = ((B<<M)&((1<<rank(V))-1))|(B>>M)
 
 @pure function Base.adjoint(V::Signature{N,M,S,F,D}) where {N,M,S,F,D}
     C = dyadmode(V)