Reorganize code

Author: mtfishman

src/ITensorNetworksNext.jl

@@ -1,6 +1,5 @@
 module ITensorNetworksNext
 
-include("symbolicarrays.jl")
 include("lazynameddimsarrays.jl")
 include("abstracttensornetwork.jl")
 include("tensornetwork.jl")

src/lazynameddimsarrays.jl

@@ -10,32 +10,8 @@ using NamedDimsArrays:
     dename,
     dimnames,
     inds
-using ..SymbolicArrays: SymbolicArrays, SymbolicArray
 using TermInterface: TermInterface, arguments, iscall, maketerm, operation, sorted_arguments
 
-const SymbolicNamedDimsArray{T, N, Parent <: SymbolicArray{T, N}, DimNames} =
-    NamedDimsArray{T, N, Parent, DimNames}
-function symnameddims(name)
-    return lazy(NamedDimsArray(SymbolicArray(name), ()))
-end
-function printnode(io::IO, a::SymbolicNamedDimsArray)
-    print(io, SymbolicArrays.name(dename(a)))
-    print(io, "[", join(dimnames(a), ","), "]")
-    return nothing
-end
-function Base.:(==)(a::SymbolicNamedDimsArray, b::SymbolicNamedDimsArray)
-    return issetequal(inds(a), inds(b)) && dename(a) == dename(b)
-end
-function Base.:*(a::SymbolicNamedDimsArray, b::SymbolicNamedDimsArray)
-    return lazy(a) * lazy(b)
-end
-function Base.:*(a::SymbolicNamedDimsArray, b::LazyNamedDimsArray)
-    return lazy(a) * b
-end
-function Base.:*(a::LazyNamedDimsArray, b::SymbolicNamedDimsArray)
-    return a * lazy(b)
-end
-
 # Custom version of `AbstractTrees.printnode` to
 # avoid type piracy when overloading on `AbstractNamedDimsArray`.
 printnode(io::IO, x) = AbstractTrees.printnode(io, x)
@@ -281,4 +257,67 @@ function Broadcast.broadcasted(::LazyNamedDimsArrayStyle, ::typeof(-), a)
     return -a
 end
 
+struct SymbolicArray{T, N, Name, Axes <: NTuple{N, AbstractUnitRange{<:Integer}}} <: AbstractArray{T, N}
+    name::Name
+    axes::Axes
+    function SymbolicArray{T}(name, ax::Tuple{Vararg{AbstractUnitRange{<:Integer}}}) where {T}
+        N = length(ax)
+        return new{T, N, typeof(name), typeof(ax)}(name, ax)
+    end
+end
+function SymbolicArray(name, ax::Tuple{Vararg{AbstractUnitRange{<:Integer}}})
+    return SymbolicArray{Any}(name, ax)
+end
+function SymbolicArray{T}(name, ax::AbstractUnitRange...) where {T}
+    return SymbolicArray{T}(name, ax)
+end
+function SymbolicArray(name, ax::AbstractUnitRange...)
+    return SymbolicArray{Any}(name, ax)
+end
+symname(a::SymbolicArray) = getfield(a, :name)
+Base.axes(a::SymbolicArray) = getfield(a, :axes)
+Base.size(a::SymbolicArray) = length.(axes(a))
+function Base.:(==)(a::SymbolicArray, b::SymbolicArray)
+    return symname(a) == symname(b) && axes(a) == axes(b)
+end
+function Base.show(io::IO, mime::MIME"text/plain", a::SymbolicArray)
+    Base.summary(io, a)
+    println(io, ":")
+    print(io, repr(symname(a)))
+    return nothing
+end
+function Base.show(io::IO, a::SymbolicArray)
+    print(io, "SymbolicArray(", symname(a), ", ", size(a), ")")
+    return nothing
+end
+using AbstractTrees: AbstractTrees
+function AbstractTrees.printnode(io::IO, a::SymbolicArray)
+    print(io, repr(symname(a)))
+    return nothing
+end
+const SymbolicNamedDimsArray{T, N, Parent <: SymbolicArray{T, N}, DimNames} =
+    NamedDimsArray{T, N, Parent, DimNames}
+function symnameddims(name)
+    return lazy(NamedDimsArray(SymbolicArray(name), ()))
+end
+function printnode(io::IO, a::SymbolicNamedDimsArray)
+    print(io, symname(dename(a)))
+    if ndims(a) > 0
+        print(io, "[", join(dimnames(a), ","), "]")
+    end
+    return nothing
+end
+function Base.:(==)(a::SymbolicNamedDimsArray, b::SymbolicNamedDimsArray)
+    return issetequal(inds(a), inds(b)) && dename(a) == dename(b)
+end
+function Base.:*(a::SymbolicNamedDimsArray, b::SymbolicNamedDimsArray)
+    return lazy(a) * lazy(b)
+end
+function Base.:*(a::SymbolicNamedDimsArray, b::LazyNamedDimsArray)
+    return lazy(a) * b
+end
+function Base.:*(a::LazyNamedDimsArray, b::SymbolicNamedDimsArray)
+    return a * lazy(b)
+end
+
 end

src/symbolicarrays.jl

@@ -14,6 +14,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 WrappedUnions = "325db55a-9c6c-5b90-b1a2-ec87e7a38c44"
 
 [compat]
+AbstractTrees = "0.4.5"
 Aqua = "0.8.14"
 Dictionaries = "0.4.5"
 Graphs = "1.13.1"

test/Project.toml

@@ -1,8 +1,7 @@
 using AbstractTrees: AbstractTrees, print_tree, printnode
 using Base.Broadcast: materialize
 using ITensorNetworksNext.LazyNamedDimsArrays:
-    LazyNamedDimsArray, Mul, ismul, lazy, symnameddims
-using ITensorNetworksNext.SymbolicArrays: SymbolicArray
+    LazyNamedDimsArray, Mul, SymbolicArray, ismul, lazy, symnameddims
 using NamedDimsArrays: NamedDimsArray, dename, dimnames, inds, nameddims
 using TermInterface:
     arguments,
@@ -104,7 +103,7 @@ using WrappedUnions: unwrap
         @test copy(ex) == ex
         @test arguments(ex) == [a * b, c]
         @test operation(ex) ≡ *
-        @test sprint(show, ex) == "((a[] * b[]) * c[])"
-        @test sprint(show, MIME"text/plain"(), ex) == "((a[] * b[]) * c[])"
+        @test sprint(show, ex) == "((a * b) * c)"
+        @test sprint(show, MIME"text/plain"(), ex) == "((a * b) * c)"
     end
 end