Skip to content

Commit 7f9d292

Browse files
committed
Remove unnecessary data structure files and add tests
* Previously several files from DataStructures.jl were copied into this repo. With this PR several are removed and a dependency on DataStructures.jl is introduced. * test/runtests.jl is created with a few tests
1 parent f823ce8 commit 7f9d292

File tree

11 files changed

+65
-2051
lines changed

11 files changed

+65
-2051
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.DS_Store
2+
/Manifest.toml
3+
/dev/

Manifest.toml

Lines changed: 0 additions & 8 deletions
This file was deleted.

Project.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@ authors = ["Christopher Chubb <[email protected]>"]
44
version = "0.1.4"
55

66
[deps]
7+
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
78
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
89

910
[compat]
1011
julia = "1.4"
12+
13+
[extras]
14+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
15+
16+
[targets]
17+
test = ["Test"]

src/SweepContractor.jl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ module SweepContractor
66

77
import Base: By, Lt, Ordering, Forward, ForwardOrdering, ReverseOrdering, lt
88
include("sorted_data_structs/data_structures.jl")
9-
include("sorted_data_structs/balanced_tree.jl")
109
include("sorted_data_structs/avl_tree.jl")
11-
include("sorted_data_structs/sorted_dict.jl")
12-
include("sorted_data_structs/priorityqueue.jl")
1310
import LinearAlgebra
1411
import Base: issorted, sortperm, sort!, isless, intersect
1512
# Utilities to make sure networks are suitably formatted for sweep contraction

src/sorted_data_structs/avl_tree.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ end
109109
function search_node(tree::AVLTree{K}, d::K) where K
110110
prev = nothing
111111
node = tree.root
112-
while node != nothing && node.data != nothing && !eq(tree.ord, node.data, d)
112+
while node != nothing && node.data != nothing && !DataStructures.eq(tree.ord, node.data, d)
113113

114114
prev = node
115115
if lt(tree.ord, d, node.data)
@@ -125,7 +125,7 @@ end
125125
function Base.haskey(tree::AVLTree{K}, d::K) where K
126126
(tree.root == nothing) && return false
127127
node = search_node(tree, d)
128-
return eq(tree.ord, node.data, d)
128+
return DataStructures.eq(tree.ord, node.data, d)
129129
end
130130

131131
Base.in(key, tree::AVLTree) = haskey(tree, key)
@@ -242,7 +242,7 @@ function sorted_rank(tree::AVLTree{K}, key::K) where K
242242
!haskey(tree, key) && throw(KeyError(key))
243243
node = tree.root
244244
rank = 0
245-
while !eq(tree.ord, node.data, key)
245+
while !DataStructures.eq(tree.ord, node.data, key)
246246
if lt(tree.ord, node.data, key)
247247
rank += (1 + get_subsize(node.leftChild))
248248
node = node.rightChild

0 commit comments

Comments
 (0)