tweaks

Author: jeffwack

spiders/SpiderFuncs.jl

@@ -1,4 +1,4 @@
-using IterTools 
+using IterTools  
 
 function region(point::Complex,boundary::Vector{<:Complex})
     x2 = real(point)
@@ -140,4 +140,7 @@ function test_intersection(z1::Complex,z2::Complex,w1::Complex,w2::Complex)
 
 end
 
+#function angle(z1::Complex,z2::Complex,z3::Complex)
+    #calculate the angle at z2 formed by the segments (z1,z2) and (z2,z3)
+#end
 

spiders/Spiders.jl

@@ -177,4 +177,13 @@ function spideriterates(S0::Spider,n_iter::Int)
         push!(list,deepcopy(mapspider!(S0)))
     end
     return list
+end
+
+#TODO modify below to have tolerance-based convergence behavior
+function parameter(S0::Spider,n_iter::Int)
+    S = deepcopy(S0)
+    for ii in 1:n_iter
+        mapspider!(S)
+    end
+    return S.legs[2][end]/2
 end

trees/EmbedTrees.jl

@@ -9,7 +9,8 @@ function embednodes(OHT::OrientedHubbardTree)
     criticalorbit = orbit(OHT.zero) #This is a sequence orbit
 
     theta = angleof(first(criticalanglesof(OZ,OHT)))
-    c = spideriterate(theta,250)
+    c = parameter(standardspider(theta),250)
+    print(c)
 
     #critical orbit
     rays = Dict()

trees/ShowTree.jl

@@ -5,7 +5,6 @@ include("EmbedTrees.jl")
 include("../spiders/Spiders.jl")
 include("../parameters/DynamicRays.jl")
 
-
 ### Convenience functions
 function plottree!(scene,angle::Rational)
     return plottree!(scene,OrientedHubbardTree(angle))