Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: cluster c search #333

Merged
merged 4 commits into from
Jun 10, 2024
Merged

Feat: cluster c search #333

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
353b5d2
Feat: cluster c search
friendlymatthew Jun 7, 2024
bc860f9
e2e
friendlymatthew Jun 7, 2024
165c612
include furthest point
friendlymatthew Jun 7, 2024
77a8e76
re:
friendlymatthew Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 47 additions & 8 deletions pkg/hnsw/hnsw_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ var clusterB = []Point{
{4.01, 4.3},
}

func SetupClusterHnsw(cluster []Point) (*Hnsw, error) {
efc := 4

func SetupClusterHnsw(cluster []Point, efc, maxConnections int) (*Hnsw, error) {
entryPoint := Point{0, 0}
g := NewHnsw(2, efc, 4, entryPoint)
g := NewHnsw(2, efc, maxConnections, entryPoint)

for idx, point := range cluster {
pointId := Id(idx + 1)
Expand Down Expand Up @@ -118,7 +116,7 @@ func TestHnsw_SearchLevel(t *testing.T) {
})

t.Run("cluster a searchLayer for existing point", func(t *testing.T) {
g, err := SetupClusterHnsw(clusterA)
g, err := SetupClusterHnsw(clusterA, 4, 4)

if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -163,7 +161,7 @@ func TestHnsw_SearchLevel(t *testing.T) {
})

t.Run("cluster a searchLayer for new point", func(t *testing.T) {
g, err := SetupClusterHnsw(clusterA)
g, err := SetupClusterHnsw(clusterA, 4, 4)

if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -203,7 +201,7 @@ func TestHnsw_SearchLevel(t *testing.T) {

t.Run("cluster a, b, selectLayer and return the closest point", func(t *testing.T) {
clusterC := append(append([]Point{}, clusterA...), clusterB...)
g, err := SetupClusterHnsw(clusterC)
g, err := SetupClusterHnsw(clusterC, 8, 4)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -232,7 +230,7 @@ func TestHnsw_SearchLevel(t *testing.T) {

t.Run("cluster a, b, selectLayer and return the closest points from both clusters", func(t *testing.T) {
clusterC := append(append([]Point{}, clusterA...), clusterB...)
g, err := SetupClusterHnsw(clusterC)
g, err := SetupClusterHnsw(clusterC, 4, 4)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -559,4 +557,45 @@ func TestHnsw_KnnSearch(t *testing.T) {
t.Fatalf("expected closest points to be %v, got %v", expectedIds, gotIds)
}
})

t.Run("cluster c search", func(t *testing.T) {
clusterC := append(append([]Point{}, clusterA...), clusterB...)

clusterCLen := len(clusterC)

h := NewHnsw(2, clusterCLen+1, clusterCLen+1, Point{0, 0})

for _, cluster := range clusterC {
if err := h.InsertVector(cluster); err != nil {
t.Fatalf("failed to insert point: %v, err: %v", cluster, err)
}
}

q := Point{2, 2}

closestNeighbors, err := h.KnnSearch(q, len(clusterC)+1)
if err != nil {
t.Fatalf("unable to find closest neighbors: %v", err)
}

if closestNeighbors.Len() != len(clusterC)+1 {
t.Fatalf("expected closest neighbors length to be %v, got %v", len(clusterC)+1, closestNeighbors.Len())
}

expected := []Id{20, 3, 4, 6, 2, 1, 10, 7, 5, 9, 18, 11, 16, 22, 12, 8, 0, 14, 19, 23, 21, 13, 15, 17}
var got []Id

for !closestNeighbors.IsEmpty() {
closest, err := closestNeighbors.PopItem()
if err != nil {
t.Fatalf("failed to pop item: %v, err: %v", closestNeighbors, err)
}

got = append(got, closest.id)
}

if !reflect.DeepEqual(expected, got) {
t.Fatalf("expected closest points to be %v, got %v", expected, got)
}
})
}
Loading