minor modifications

Author: jeffwack

combined.jl

@@ -6,6 +6,6 @@ fig = Figure()
 ax1 = Axis(fig[1,1],aspect = 1)
 ax2 = Axis(fig[1,2], aspect = 1)
 
-colors = colorax(ax1)
+colors = colorax(ax1,8)
 juliaframe!(ax2,-1.0+0.0im,colors)
 fig

interactive.jl

@@ -1,7 +1,7 @@
 using GLMakie
 using Colors
 
-function colorax(ax)
+function colorax(ax,n_colors)
 
     activebox = Observable{Int}(1)
     hidedecorations!(ax)
@@ -65,9 +65,8 @@ function colorax(ax)
     return colorobservables
 end
 
-n_colors = 8
 
 fig = Figure()
 ax = Axis(fig[1,1],aspect = 1)
-colorax(ax)
+colorax(ax,9)
 fig

sequences/Phonebook.jl

@@ -24,7 +24,7 @@ function drawwedges!(ax,AIA)
     N = AIA.addr[end]
     n = 20
     for ii in N+1:N+n 
-        k = denominator(AIA,ii)
+        k = newdenominator(AIA,ii)
         angles = []
         wedges = []
         angletext = []
@@ -40,7 +40,7 @@ function drawwedges!(ax,AIA)
         for wedge in wedges
             wedge!(ax,wedge...)
         end
-        text!(ax,centers,text = angletext, align = (:center,:center))
+        #text!(ax,centers,text = angletext, align = (:center,:center))
     end
 end
 
@@ -61,7 +61,7 @@ function phonebook!(gl,AIA)
             rad = sqrt(sum([x*x for x in event.data]))
             idx = -1*Int(floor(log2(rad)))
             if idx > 0
-                k = denominator(AIA[],idx)
+                k = newdenominator(AIA[],idx)
                 num = Int(mod1(ceil(ang*(k-1)/(2*pi)),k-1))
                 println("$idx and $num / $k")
                 if gcd(num,k) == 1
@@ -89,4 +89,7 @@ AIA = Observable(AngledInternalAddress([1],[]))
 
 phonebook!(ga,AIA)
 
-fig
+di = DataInspector(fig)
+fig
+
+#TODO custom tooltip https://docs.makie.org/stable/explanations/inspector

trees/OrientTrees.jl

@@ -6,6 +6,11 @@ struct OrientedHubbardTree <: AbstractHubbardTree
     boundary::Vector{Sequence}
 end
 
+function Base.show(io::IO,H::OrientedHubbardTree)
+    println(io,"Oriented Hubbard tree with adjacency dictionary")
+    return display(H.adj)
+end
+
 function forwardimages(htree::Dict)
     return Dict([Pair(key,[shift(key)]) for key in keys(htree)])
 end 
@@ -100,23 +105,21 @@ function characteristicorbits(H)
 end
 
 function OrientedHubbardTree(AIA::AngledInternalAddress)
+    #Construct the unoriented Hubbard tree from the internal address ignoring the angles
     H = HubbardTree(AIA.addr)
 
+    #Find the boundary between the '0' region and the '1' region as the path between the beta fixed point and its preimage
     (H,boundary) = addboundary(H)
 
-    nums = Int[]
-    for angle in AIA.angles
-        if denominator(angle) > 2
-            push!(nums,numerator(angle))
-        end
-    end
+    #Filter the angles for those describing the characteristic points
+    charangles = filter(x -> denominator(x) != 2, AIA.angles)
 
+    #create empty oriented tree. 
     orientedH = Dict{Sequence{Char}, Vector{Sequence{Char}}}()
 
     charorbits = characteristicorbits(H)
-
-    for (node, num) in zip(charorbits,nums)
-        merge!(orientedH,orientpreimages(H.adj,node[2],orientcharacteristic(H, node[1],num)))
+    for (node, ang) in zip(charorbits,charangles)
+        merge!(orientedH,orientpreimages(H.adj,node[2],orientcharacteristic(H, node[1],ang)))
     end
 
     #Deal with the critical orbit
@@ -169,13 +172,19 @@ function orientnode(H,source::Sequence{Char},target::Pair{Sequence{Char}, Vector
 end
 
 #SKETCHY SKETCHY
-function orientcharacteristic(H,node,num)
+function orientcharacteristic(H,node,ang)
+    num = numerator(ang)
+    den = denominator(ang)
     glarms = globalarms(H.adj,node)
     zero = H.zero
     per = period(zero)
     c = shift(zero)
     q = length(glarms)
     n = period(node)
+
+    if den != q
+        error("the denominator of the characteristic angle does not match the order of the branch point")
+    end
 
     #the characteristic point has arms towards 1-n,1,1+n,1+2n, where n is the period of the characteristic point
     #the numerator tells us the arm towards 1 is in position num
@@ -407,6 +416,11 @@ function allanglesof(theta::Rational)
     return allanglesof(OZ,OH)
 end
 
+function allanglesof(H::OrientedHubbardTree)
+    OZ = labelonezero(H)
+    return allanglesof(OZ,H)
+end
+
 function angle_echo(theta::Rational)
     aia = AngledInternalAddress(theta)
     return criticalanglesof(aia)