improved Type{<:Manifold} dispatch

Author: chakravala

Project.toml

@@ -1,7 +1,7 @@
 name = "DirectSum"
 uuid = "22fd7b30-a8c0-5bf2-aabe-97783860d07c"
 authors = ["Michael Reed"]
-version = "0.5.10"
+version = "0.5.11"
 
 [deps]
 ComputedFieldTypes = "459fdd68-db75-56b8-8c15-d717a790f88e"

src/DirectSum.jl

@@ -58,8 +58,8 @@ end
 @pure Signature{N,M}(b::BitArray{1},f=0,d=0) where {N,M} = Signature{N,M,bit2int(b[1:N]),f,d}()
 @pure Signature{N,M}(b::Array{Bool,1},f=0,d=0) where {N,M} = Signature{N,M}(convert(BitArray{1},b),f,d)
 @pure Signature{N,M}(s::String) where {N,M} = Signature{N,M}([k=='-' for k∈s])
-@pure Signature(n::Int,d::Int=0,o::Int=0,s::Bits=zero(Bits)) = Signature{n,doc2m(d,o),s}()
 @pure Signature(str::String) = Signature{length(str)}(str)
+@pure Signature(n::Int,d::Int=0,o::Int=0,s::Bits=zero(Bits)) = Signature{n,doc2m(d,o),s}()
 
 @pure function Signature{N}(s::String) where N
     ms = match(r"[0-9]+",s)
@@ -169,8 +169,10 @@ end
 @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::SVector{N}) where {M,N} = SubManifold{M,N}(bit2int(indexbits(ndims(M),b)))
+SubManifold{M}(b::UnitRange) where M = SubManifold{M,length(b)}(SVector(b...))
 SubManifold{M}(b::Vector) where M = SubManifold{M,length(b)}(SVector(b...))
 SubManifold{M}(b::Tuple) where M = SubManifold{M,length(b)}(SVector(b...))
+SubManifold{M}(b::SVector) where M = SubManifold{M,length(b)}(b)
 SubManifold{M}(b...) where M = SubManifold{M}(b)
 
 for t ∈ ((:V,),(:V,:G))
@@ -243,8 +245,14 @@ end
 # ==(a::SubManifold{V,G},b::SubManifold{W,G}) where {V,W,G} = interop(==,a,b)
 
 for A ∈ (Signature,DiagonalForm,SubManifold)
+    @eval @pure Manifold(::Type{T}) where T<:$A = T()
     for B ∈ (Signature,DiagonalForm,SubManifold)
-        @eval @pure ==(a::$A,b::$B) = (a⊆b) && (a⊇b)
+        @eval begin
+            @pure ==(a::$A,b::$B) = (a⊆b) && (a⊇b)
+            @pure ==(::Type{A},b::$B) where A<:$A = A() == b
+            @pure ==(a::$A,::Type{B}) where B<:$B = a == B()
+            @pure ==(::Type{A},::Type{B}) where {A<:$A,B<:$B} = A() == B()
+        end
     end
 end
 

src/generic.jl

@@ -8,6 +8,12 @@ export valuetype, value, hasinf, hasorigin, isorigin, norm, indices, tangent, is
 (M::Signature)(b::Int...) = SubManifold{M}(b)
 (M::DiagonalForm)(b::Int...) = SubManifold{M}(b)
 (M::SubManifold)(b::Int...) = SubManifold{supermanifold(M)}(b)
+(M::Signature)(b::T) where T<:AbstractVector{Int} = SubManifold{M}(b)
+(M::DiagonalForm)(b::T) where T<:AbstractVector{Int} = SubManifold{M}(b)
+(M::SubManifold)(b::T) where T<:AbstractVector{Int} = SubManifold{supermanifold(M)}(b)
+(M::Signature)(b::T) where T<:AbstractRange{Int} = SubManifold{M}(b)
+(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) ? ndims(M) : G
 @pure grade(V::M) where M<:Manifold{N} where N = N-(isdyadic(V) ? 2 : 1)*diffvars(V)
@@ -50,15 +56,21 @@ const mixedmode = dyadmode
 @inline value(::SubManifold,T=Int) = T==Any ? 1 : one(T)
 @inline value(m::Simplex,T::DataType=valuetype(m)) = T∉(valuetype(m),Any) ? convert(T,m.v) : m.v
 @inline value_diff(m::T) where T<:TensorTerm = (v=value(m);istensor(v) ? v : m)
-@pure isbasis(::SubManifold{V}) where V = typeof(V)<:SubManifold
-@pure isbasis(::T) where T<: TensorBundle = false
-@pure isbasis(::Simplex) = false
+
+for T ∈ (:T,:(Type{T}))
+    @eval begin
+        @pure isbasis(::$T) where T<:SubManifold{V} where V = typeof(V)<:SubManifold
+        @pure isbasis(::$T) where T<:TensorAlgebra = false
+        @pure isbasis(::$T) where T<:TensorBundle = false
+        @pure isbasis(::$T) where T<:Simplex = false
+        @pure bits(b::$T) where T<:SubManifold{V,G,B} where {V,G} where B = B::UInt
+        @pure UInt(b::$T) where T<:SubManifold{V,G,B} where {V,G} where B = B::UInt
+    end
+end
+@pure UInt(m::T) where T<:TensorTerm = UInt(basis(m))
+@pure bits(m::T) where T<:TensorTerm = bits(basis(m))
 @pure basis(m::SubManifold) = isbasis(m) ? m : SubManifold(m)
 @pure basis(m::Simplex{V,G,B} where {V,G}) where B = B
-@pure UInt(m::T) where T<:TensorTerm = bits(basis(m))
-@pure bits(m::T) where T<:TensorTerm = bits(basis(m))
-@pure bits(b::SubManifold{V,G,B} where {V,G}) where B = B::UInt
-@pure bits(::Type{SubManifold{V,G,B}} where {V,G}) where B = B
 @pure det(s::Signature) = isodd(count_ones(metric(s))) ? -1 : 1
 @pure det(s::DiagonalForm) = PROD(diagonalform(s))
 @pure Base.abs(s::SubManifold) = isbasis(s) ? Base.sqrt(Base.abs2(s)) : sqrt(abs(det(s)))