flattening refactor and show() for AngledInternalAddress

Author: jeffwack

Manifest.toml

@@ -2,7 +2,7 @@
 
 julia_version = "1.11.1"
 manifest_format = "2.0"
-project_hash = "74c0bf4d8402a002223529b16ce89f50dc321b94"
+project_hash = "6277cafafbf607b44d7cdb3f1f8ae6312d05d56e"
 
 [[deps.AbstractFFTs]]
 deps = ["LinearAlgebra"]
@@ -273,11 +273,6 @@ git-tree-sha1 = "cc5231d52eb1771251fbd37171dbc408bcc8a1b6"
 uuid = "2e619515-83b5-522b-bb60-26c02a35a201"
 version = "2.6.4+0"
 
-[[deps.ExprTools]]
-git-tree-sha1 = "27415f162e6028e81c72b82ef756bf321213b6ec"
-uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04"
-version = "0.1.10"
-
 [[deps.Extents]]
 git-tree-sha1 = "81023caa0021a41712685887db1fc03db26f41f5"
 uuid = "411431e0-e8b7-467b-b5e0-f676ba4f2910"
@@ -837,12 +832,6 @@ version = "1.2.0"
 uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 version = "1.11.0"
 
-[[deps.Mocking]]
-deps = ["Compat", "ExprTools"]
-git-tree-sha1 = "c74e5e7c5f83ccb0bca0377d316d966d296106d4"
-uuid = "78c3b35d-d492-501b-9361-3d52fe80e533"
-version = "0.7.9"
-
 [[deps.ModernGL]]
 deps = ["Libdl"]
 git-tree-sha1 = "b76ea40b5c0f45790ae09492712dd326208c28b2"
@@ -859,12 +848,6 @@ version = "0.3.4"
 uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 version = "2023.12.12"
 
-[[deps.Mustache]]
-deps = ["Printf", "Tables"]
-git-tree-sha1 = "3b2db451a872b20519ebb0cec759d3d81a1c6bcb"
-uuid = "ffc61752-8dc7-55ee-8c37-f3e9cdd09e70"
-version = "1.0.20"
-
 [[deps.Netpbm]]
 deps = ["FileIO", "ImageCore", "ImageMetadata"]
 git-tree-sha1 = "d92b107dbb887293622df7697a2223f9f8176fcd"
@@ -975,12 +958,6 @@ git-tree-sha1 = "e127b609fb9ecba6f201ba7ab753d5a605d53801"
 uuid = "36c8627f-9965-5494-a995-c6b170f724f3"
 version = "1.54.1+0"
 
-[[deps.Parameters]]
-deps = ["OrderedCollections", "UnPack"]
-git-tree-sha1 = "34c0e9ad262e5f7fc75b10a9952ca7692cfc5fbe"
-uuid = "d96e819e-fc66-5662-9728-84c9c7592b0a"
-version = "0.12.3"
-
 [[deps.Parsers]]
 deps = ["Dates", "PrecompileTools", "UUIDs"]
 git-tree-sha1 = "8489905bcdbcfac64d1daa51ca07c0d8f0283821"
@@ -1002,12 +979,6 @@ weakdeps = ["REPL"]
     [deps.Pkg.extensions]
     REPLExt = "REPL"
 
-[[deps.PkgTemplates]]
-deps = ["Dates", "InteractiveUtils", "LibGit2", "Mocking", "Mustache", "Parameters", "Pkg", "REPL", "UUIDs"]
-git-tree-sha1 = "18626dfafdd45a49c47b66071498d75ab08633f7"
-uuid = "14b8a8f1-9102-5b29-a752-f990bacb7fe1"
-version = "0.7.53"
-
 [[deps.PkgVersion]]
 deps = ["Pkg"]
 git-tree-sha1 = "f9501cc0430a26bc3d156ae1b5b0c1b47af4d6da"
@@ -1365,11 +1336,6 @@ deps = ["Random", "SHA"]
 uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 version = "1.11.0"
 
-[[deps.UnPack]]
-git-tree-sha1 = "387c1f73762231e86e0c9c5443ce3b4a0a9a0c2b"
-uuid = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
-version = "1.0.2"
-
 [[deps.Unicode]]
 uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 version = "1.11.0"

Project.toml

@@ -8,16 +8,14 @@ ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
 IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
-PkgTemplates = "14b8a8f1-9102-5b29-a752-f990bacb7fe1"
 Primes = "27ebfcd6-29c5-5fa9-bf4b-fb8fc14df3ae"
 
 [compat]
+ColorSchemes = "3"
 Colors = "0.12"
-Primes = "0.5"
 GLMakie = "0.10"
-PkgTemplates = "0.7"
-ColorSchemes = "3"
 IterTools = "1"
+Primes = "0.5"
 julia = "1.6.7"
 
 [extras]

src/trees/Graphs.jl renamed to src/Graphs.jl

@@ -1,10 +1,6 @@
 #Algorithms from https://eudml.org/doc/283172
 #Existence of quadratic Hubbard trees
 #Henk Bruin, Alexandra Kafll, Dierk Schleicher
-
-include("../sequences/AngleDoubling.jl") 
-include("Graphs.jl")
-
 abstract type AbstractHubbardTree <: Graph end
 
 function criticalpoint(H::AbstractHubbardTree)

src/trees/HubbardTrees.jl renamed to src/HubbardTrees.jl

@@ -1,20 +1,46 @@
 module Mandelbrot
-include("trees/ShowTree.jl")
 
-export RationalAngle
-export BinaryExpansion
-export KneadingSequence
+export RationalAngle,
+       BinaryExpansion, 
+       KneadingSequence, 
+       InternalAddress, 
+       HubbardTree, 
+       AngledInternalAddress, 
+       OrientedHubbardTree, 
+       parameter,
+       treeplot,
+       spiderplot
 
-export InternalAddress
-export HubbardTree
+using ColorSchemes,
+      Colors,
+      GLMakie,
+      IterTools,
+      Primes
 
-export AngledInternalAddress
-export OrientedHubbardTree
+include("Sequences.jl")
+include("angledoubling.jl")
 
-export parameter
+include("Graphs.jl")
+include("HubbardTrees.jl")
 
-#export HyperbolicComponent
+include("orienttrees.jl")
+include("dynamicrays.jl")
+include("embedtrees.jl")
+
+include("interiorbinarydecomp.jl")
+include("juliaset.jl")
+include("lamination.jl")
+include("mandelbrotset.jl")
+
+include("spiderfuncs.jl")
+include("spidermap.jl")
+
+include("renderfractal.jl")
+include("perturb.jl")
+
+include("showrays.jl")
+include("showspider.jl")
+include("showtree.jl")
 
-#export treeplot
 
 end

src/Mandelbrot.jl

@@ -1,6 +1,3 @@
-using Primes
-using IterTools
-
 struct Sequence{T}
     items::Vector{T}
     preperiod::Int
@@ -72,12 +69,12 @@ function Base.hash(S::Sequence,h::UInt)
 end
 
 function Base.show(io::IO, K::Sequence)
-    str = join([repr(item) for item in K.items])
+    str = join([string(item) for item in K.items])
     L = K.preperiod
     if L == 0
-        return println(io,"|"*str*"|")
+        return print(io,"|"*str*"|")
     else
-        return println(io,str[1:L]*"|"*str[L+1:end]*"|")
+        return print(io,str[1:L]*"|"*str[L+1:end]*"|")
     end
 end
 

src/sequences/Sequences.jl renamed to src/Sequences.jl

@@ -1,6 +1,3 @@
-using GLMakie
-include("SpiderFuncs.jl")
-
 A = 1.0-3.0im
 B = -2.0+1.0im
 

src/spidermap/paths.jl renamed to src/__paths__.jl

@@ -1,6 +1,4 @@
-include("Sequences.jl")
 
-alphabet = ['*','A','B']
 
 struct RationalAngle <: Number
     value::Rational
@@ -26,6 +24,10 @@ phi::RationalAngle < theta::RationalAngle = phi.value < theta.value
 denominator(theta::RationalAngle) = denominator(theta.value)
 numerator(theta::RationalAngle) = numerator(theta.value)
 
+function Base.show(io::IO, theta::RationalAngle)
+    return print(io,theta.value)
+end
+
 function orbit(angle::RationalAngle)
     items = RationalAngle[]
 
@@ -40,7 +42,7 @@ function orbit(angle::RationalAngle)
 
 end
 
-struct KneadingSymbol <: Integer
+struct KneadingSymbol #<: Integer <--- got rid of this due to issues with converting to a string
     value::Int
     function KneadingSymbol(value::Int)
         0 <= value <=2  || error("Value must be in range [0, 2]")
@@ -51,6 +53,8 @@ end
 #necessary for using kneading sequences as dictionary keys
 Base.hash(d::KneadingSymbol,h::UInt64) = hash(d.value,h)
 
+alphabet = ['*','A','B']
+
 function KneadingSymbol(c::Char)
     return KneadingSymbol(first(findall(x->x==c,alphabet))-1)
 end
@@ -220,7 +224,20 @@ function AngledInternalAddress(theta::RationalAngle)
 end
 
 function AngledInternalAddress(theta::Rational)
-    return AngledInternalAddress(Rationalangle(theta))
+    return AngledInternalAddress(RationalAngle(theta))
+end
+
+function Base.show(io::IO, AIA::AngledInternalAddress)
+    address = ""
+    for ii in eachindex(AIA.addr)
+        address *= repr(AIA.addr[ii])
+        if ii < lastindex(AIA.addr)#this will return true if num is not the last element because addr has no repeats
+            address *= "———"
+            address *= repr(AIA.angles[ii])
+            address *= "——>"
+        end
+    end
+    return print(io,"Angled Internal Address"*"\n"*address)
 end
 
 function firstaddress(intadd::Vector{Int})

src/sequences/AngleDoubling.jl renamed to src/angledoubling.jl

@@ -1,6 +1,3 @@
-include("../sequences/AngleDoubling.jl")
-include("../spidermap/SpiderFuncs.jl")
-
 struct ExternalRays
     orb::Sequence{BinaryExpansion}
     rays::Dict{BinaryExpansion,Vector{ComplexF64}}

src/parameters/DynamicRays.jl renamed to src/dynamicrays.jl

@@ -1,7 +1,3 @@
-include("OrientTrees.jl")
-include("../spidermap/SpiderMap.jl")
-include("../parameters/DynamicRays.jl")
-
 struct HyperbolicComponent
     criticalpoint::Sequence
     adj::Dict{KneadingSequence,Vector{KneadingSequence}}