update plot

Author: GiggleLiu

Project.toml

@@ -31,7 +31,7 @@ CUDA = "3"
 DocStringExtensions = "0.8, 0.9"
 FFTW = "1.4"
 Graphs = "1.7"
-LuxorGraphPlot = "0.1"
+LuxorGraphPlot = "0.2"
 Mods = "1.3"
 OMEinsum = "0.7"
 Polynomials = "2.0, 3"

src/arithematics.jl

@@ -138,10 +138,10 @@ end
             return TruncatedPoly(a.coeffs .+ b.coeffs, a.maxorder)
         elseif a.maxorder > b.maxorder
             offset = a.maxorder - b.maxorder
-            return TruncatedPoly((@ntuple $K i->i+offset <= $K ? a.coeffs[i] + b.coeffs[i+offset] : a.coeffs[i]), a.maxorder)
+            return TruncatedPoly((@ntuple $K i->i+offset <= $K ? a.coeffs[convert(Int, i)] + b.coeffs[convert(Int, i+offset)] : a.coeffs[convert(Int, i)]), a.maxorder)
         else
             offset = b.maxorder - a.maxorder
-            return TruncatedPoly((@ntuple $K i->i+offset <= $K ? b.coeffs[i] + a.coeffs[i+offset] : b.coeffs[i]), b.maxorder)
+            return TruncatedPoly((@ntuple $K i->i+offset <= $K ? b.coeffs[convert(Int, i)] + a.coeffs[convert(Int, i+offset)] : b.coeffs[convert(Int, i)]), b.maxorder)
         end
     end
 end
@@ -796,7 +796,7 @@ for F in [:set_type, :sampler_type, :treeset_type]
         function $F(::Type{T}, n::Int, nflavor::Int) where {TV, T<:CountingTropical{TV}}
             CountingTropical{TV, $F(n,nflavor)}
         end
-        function $F(::Type{Real}, n::Int, nflavor::Int) where {TV}
+        function $F(::Type{Real}, n::Int, nflavor::Int)
             $F(n, nflavor)
         end
     end

src/interfaces.jl

@@ -438,14 +438,18 @@ end
 for (PROP, ET) in [
         (:(PartitionFunction{T}), :(T)),
         (:(SizeMax{Single}), :(Tropical{T})), (:(SizeMin{Single}), :(Tropical{T})),
-        (:(SizeMax{K}), :(ExtendedTropical{K,Tropical{T}})), (:(SizeMin{K}), :(ExtendedTropical{K,Tropical{T}})),
         (:(CountingAll), :T), (:(CountingMax{Single}), :(CountingTropical{T,T})), (:(CountingMin{Single}), :(CountingTropical{T,T})),
-        (:(CountingMax{K}), :(TruncatedPoly{K,T,T})), (:(CountingMin{K}), :(TruncatedPoly{K,T,T})),
-        (:(GraphPolynomial{:finitefield}), :(Mod{N,Int32} where N)), (:(GraphPolynomial{:fft}), :(Complex{T})), 
         (:(GraphPolynomial{:polynomial}), :(Polynomial{T, :x})), (:(GraphPolynomial{:fitting}), :T),
-        (:(GraphPolynomial{:laurent}), :(LaurentPolynomial{T, :x}))
+        (:(GraphPolynomial{:laurent}), :(LaurentPolynomial{T, :x})), (:(GraphPolynomial{:fft}), :(Complex{T})), 
+        (:(GraphPolynomial{:finitefield}), :(Mod{N,Int32} where N))
+    ]
+    @eval tensor_element_type(::Type{T}, n::Int, nflavor::Int, ::$PROP) where {T} = $ET
+end
+for (PROP, ET) in [
+        (:(SizeMax{K}), :(ExtendedTropical{K,Tropical{T}})), (:(SizeMin{K}), :(ExtendedTropical{K,Tropical{T}})),
+        (:(CountingMax{K}), :(TruncatedPoly{K,T,T})), (:(CountingMin{K}), :(TruncatedPoly{K,T,T})),
     ]
-    @eval tensor_element_type(::Type{T}, n::Int, nflavor::Int, ::$PROP) where {T,K} = $ET
+    @eval tensor_element_type(::Type{T}, n::Int, nflavor::Int, ::$PROP) where {T, K} = $ET
 end
 
 function tensor_element_type(::Type{T}, n::Int, nflavor::Int, ::PROP) where {T, K, BOUNDED, PROP<:Union{SingleConfigMax{K,BOUNDED},SingleConfigMin{K,BOUNDED}}}
@@ -461,10 +465,17 @@ end
 
 for (PROP, ET) in [
         (:(ConfigsMax{Single}), :(CountingTropical{T,T})), (:(ConfigsMin{Single}), :(CountingTropical{T,T})),
-        (:(ConfigsMax{K}), :(TruncatedPoly{K,T,T})), (:(ConfigsMin{K}), :(TruncatedPoly{K,T,T})),
         (:(ConfigsAll), :(Real))
     ]
-    @eval function tensor_element_type(::Type{T}, n::Int, nflavor::Int, ::$PROP) where {T,K}
+    @eval function tensor_element_type(::Type{T}, n::Int, nflavor::Int, ::$PROP) where {T}
+        set_type($ET, n, nflavor)
+    end
+end
+
+for (PROP, ET) in [
+        (:(ConfigsMax{K}), :(TruncatedPoly{K,T,T})), (:(ConfigsMin{K}), :(TruncatedPoly{K,T,T})),
+    ]
+    @eval function tensor_element_type(::Type{T}, n::Int, nflavor::Int, ::$PROP) where {T, K}
         set_type($ET, n, nflavor)
     end
 end

src/visualize.jl

@@ -54,7 +54,7 @@ function show_einsum(ein::AbstractEinsum;
         annotate_tensors=false,
         tensor_locs=nothing,
         label_locs=nothing,  # dict
-        spring::Bool=true,
+        layout::Symbol=:auto,
         optimal_distance=1.0,
         kwargs...
         )
@@ -75,7 +75,7 @@ function show_einsum(ein::AbstractEinsum;
         end
     end
     if label_locs === nothing && tensor_locs === nothing
-        locs = LuxorGraphPlot.autolocs(graph, nothing, spring, optimal_distance, trues(nv(graph)))
+        locs = LuxorGraphPlot.autolocs(graph, nothing, layout, optimal_distance, trues(nv(graph)))
     elseif label_locs === nothing
         # infer label locs from tensor locs
         label_locs = [(lst = [iloc for (iloc,ix) in zip(tensor_locs, ixs) if l ∈ ix]; reduce((x,y)->x .+ y, lst) ./ length(lst)) for l in labels]