Renamed variables

Author: adish29

CPU/computations.h

@@ -1,5 +1,5 @@
-#ifndef ITEMS_H
-#define ITEMS_H
+#ifndef COMPUTATIONS_H
+#define COMPUTATIONS_H
 
 #include <vector>
 #include <fstream>

Project Document.docx

@@ -12,16 +12,16 @@
 #include <limits> 
 using namespace std;
 
-vector<int> HNSWGraph::searchLayer(Item& q, int entry_point, int ef, int lc) {
-	if (lc < 0 || lc >= layerEdgeLists.size()) {
+vector<int> HNSWGraph::searchLayer(Item& query, int entry_point, int efficient, int layers) {
+	if (layers < 0 || layers >= layerEdgeLists.size()) {
         cerr << "Error: Invalid layer index." << endl;
         exit(EXIT_FAILURE); 
     }
 	set<pair<double, int>> candidates;
 	set<pair<double, int>> nearestNeighbors;
 	unordered_set<int> isVisited;
 
-	double td = q.dist(items[entry_point]);
+	double td = query.dist(items[entry_point]);
 	candidates.insert(make_pair(td, entry_point));
 	nearestNeighbors.insert(make_pair(td, entry_point));
 	isVisited.insert(entry_point);
@@ -33,18 +33,18 @@ vector<int> HNSWGraph::searchLayer(Item& q, int entry_point, int ef, int lc) {
 		if (ci->first > fi->first) {
 			break;
 		}
-		for (int ed: layerEdgeLists[lc][nid]) {
+		for (int ed: layerEdgeLists[layers][nid]) {
 			if (isVisited.find(ed) != isVisited.end()) {
 				continue;
 			}
 			fi = nearestNeighbors.end(); 
 			fi--;
 			isVisited.insert(ed);
-			td = q.dist(items[ed]);
-			if ((td < fi->first) || nearestNeighbors.size() < ef) {
+			td = query.dist(items[ed]);
+			if ((td < fi->first) || nearestNeighbors.size() < efficient) {
 				candidates.insert(make_pair(td, ed));
 				nearestNeighbors.insert(make_pair(td, ed));
-				if (nearestNeighbors.size() > ef) {
+				if (nearestNeighbors.size() > efficient) {
 					nearestNeighbors.erase(fi);
 				}
 			}
@@ -55,7 +55,7 @@ vector<int> HNSWGraph::searchLayer(Item& q, int entry_point, int ef, int lc) {
 	return results;
 }
 
-vector<int> HNSWGraph::KNNSearch(Item& q, int K, int N) {
+vector<int> HNSWGraph::KNNSearch(Item& query, int K, int N) {
 
 	if (K <= 0 || std::ceil(K) != K || K > std::numeric_limits<int>::max()) {
 		cerr << "Error: Invalid value of K for KNNSearch." << endl;
@@ -67,30 +67,31 @@ vector<int> HNSWGraph::KNNSearch(Item& q, int K, int N) {
         exit(EXIT_FAILURE);
     }
 
-	int maxLyer = layerEdgeLists.size() - 1;
+	int maxLayer = layerEdgeLists.size() - 1;
 	int entry_point = enterNode;
-	for (int l = maxLyer; l >= 1; l--) {
-		entry_point = searchLayer(q, entry_point, 1, l)[0];
+	for (int l = maxLayer; l >= 1; l--) {
+		entry_point = searchLayer(query, entry_point, 1, l)[0];
 	}
-	return searchLayer(q, entry_point, K, 0);
+	return searchLayer(query, entry_point, K, 0);
 }
 
-void HNSWGraph::addEdge(int st, int ed, int lc) {
-	if (lc < 0 || lc >= layerEdgeLists.size()) {
+void HNSWGraph::addEdge(int st, int ed, int layers) {
+	if (layers < 0 || layers >= layerEdgeLists.size()) {
         cerr << "Error: Invalid layer index." << endl;
         return;
     }
 	if (st == ed) {
 		return;
 	}
-	layerEdgeLists[lc][st].push_back(ed);
-	layerEdgeLists[lc][ed].push_back(st);
+	layerEdgeLists[layers][st].push_back(ed);
+	layerEdgeLists[layers][ed].push_back(st);
 }
 
-void HNSWGraph::Insert(Item& q) {
+void HNSWGraph::Insert(Item& query) {
 	int nid = items.size();
-	itemNum++; items.push_back(q);
-	int maxLyer = layerEdgeLists.size() - 1;
+	itemNum++; 
+	items.push_back(query);
+	int maxLayer = layerEdgeLists.size() - 1;
 	int l = 0;
 	uniform_real_distribution<double> distribution(0.0,1.0);
 	while(l < ml && (1.0 / ml <= distribution(generator))) {
@@ -104,20 +105,20 @@ void HNSWGraph::Insert(Item& q) {
 		return;
 	}
 	int entry_point = enterNode;
-	for (int i = maxLyer; i > l; i--) {
-		entry_point = searchLayer(q, entry_point, 1, i)[0];
+	for (int i = maxLayer; i > l; i--) {
+		entry_point = searchLayer(query, entry_point, 1, i)[0];
 	}
 	#pragma omp parallel for
-	for (int i = min(l, maxLyer); i >= 0; i--) {
+	for (int i = min(l, maxLayer); i >= 0; i--) {
 		int MM = l == 0 ? MMax0 : MMax;
-		vector<int> neighbors = searchLayer(q, entry_point, efConstruction, i);
-		vector<int> selectedNeighbors = vector<int>(neighbors.begin(), neighbors.begin()+min(int(neighbors.size()), M));
-		for (size_t j = 0; j < selectedNeighbors.size(); j++) {
-            int n = selectedNeighbors[j];
+		vector<int> neighbours = searchLayer(query, entry_point, efficientConstruction, i);
+		vector<int> selectedNeighbours = vector<int>(neighbours.begin(), neighbours.begin()+min(int(neighbours.size()), M));
+		for (size_t j = 0; j < selectedNeighbours.size(); j++) {
+            int n = selectedNeighbours[j];
             addEdge(n, nid, i);
         }
-		for (size_t j = 0; j < selectedNeighbors.size(); j++)  {
-			int n = selectedNeighbors[j];
+		for (size_t j = 0; j < selectedNeighbours.size(); j++)  {
+			int n = selectedNeighbours[j];
 			if (layerEdgeLists[i][n].size() > MM) {
 				vector<pair<double, int>> distPairs;
 				for (int nn: layerEdgeLists[i][n]) {
@@ -130,7 +131,7 @@ void HNSWGraph::Insert(Item& q) {
 				}
 			}
 		}
-		entry_point = selectedNeighbors[0];
+		entry_point = selectedNeighbours[0];
 	}
 	if (l == layerEdgeLists.size() - 1) {
 		enterNode = nid;

hnsw_implementation/hnsw.cpp

@@ -11,13 +11,13 @@ using namespace std;
 
 
 struct HNSWGraph {
-	HNSWGraph(int _M, int _MMax, int _MMax0, int _efConstruction, int _ml):M(_M),MMax(_MMax),MMax0(_MMax0),efConstruction(_efConstruction),ml(_ml){
+	HNSWGraph(int _M, int _MMax, int _MMax0, int _efficientConstruction, int _ml):M(_M),MMax(_MMax),MMax0(_MMax0),efficientConstruction(_efficientConstruction),ml(_ml){
 		layerEdgeLists.push_back(unordered_map<int, vector<int>>());
 	}
 	int M;
 	int MMax;
 	int MMax0;
-	int efConstruction;
+	int efficientConstruction;
 	int ml;
 	int itemNum;
 	vector<Item> items;