Merge pull request #2 from CSCI-739/initial-draft

Initial draft merge 2

Author: adish29

.gitignore

@@ -1,2 +1,4 @@
 *.exe
-*.in
+*.in
+*.out
+*.o

hnsw.o

@@ -4,68 +4,124 @@
 #include <ctime>
 #include <iostream>
 #include <random>
+#include <fstream>
 #include <vector>
+#include <memory>
+#include <string>
+#include <sstream>
 using namespace std;
 
-void randomTest(int numItems, int dim, int numQueries, int K) {
-	std::default_random_engine generator;
-    std::uniform_real_distribution<double> distribution(0.0, 1.0);
-    std::vector<Item> randomItems;
-    randomItems.reserve(numItems);
+void readInputFromFile(const string& filename, int& D, int& N, int& M, vector<Item>& base, vector<Item>& queries) {
+    ifstream infile(filename);
+    if (!infile.is_open()) {
+        cerr << "Unable to open file " << filename << endl;
+        exit(EXIT_FAILURE);
+    }
+
+    string firstLine;
+    getline(infile, firstLine);
+
+    istringstream iss(firstLine);
+    if (!(iss >> D >> N >> M) || iss.rdbuf()->in_avail() > 0) {
+        cerr << "Invalid format in the input file " << filename << endl;
+        exit(EXIT_FAILURE);
+    }
+
+    base.reserve(N);
+    queries.reserve(M);
+
+    for (int i = 0; i < N; ++i) {
+        vector<double> temp(D);
+        for (int j = 0; j < D; ++j) {
+            if (!(infile >> temp[j])) {
+                cerr << "Invalid format in the input file " << filename << " at line " << (i + 2) << endl;
+                exit(EXIT_FAILURE);
+            }
+        }
+        base.emplace_back(temp);
+    }
 
-    for (int i = 0; i < numItems; i++) {
-        std::vector<double> temp(dim);
-        for (int d = 0; d < dim; d++) {
-            temp[d] = distribution(generator);
+    for (int i = 0; i < M; ++i) {
+        vector<double> temp(D);
+        for (int j = 0; j < D; ++j) {
+            if (!(infile >> temp[j])) {
+                cerr << "Invalid format in the input file " << filename << " at line " << (N + i + 2) << endl;
+                exit(EXIT_FAILURE);
+            }
         }
-        randomItems.emplace_back(temp);
+        queries.emplace_back(temp);
     }
 
-    std::shuffle(randomItems.begin(), randomItems.end(), generator);
-	HNSWGraph myHNSWGraph(10, 30, 30, 10, 2);
-	for (int i = 0; i < numItems; i++) {
-		if (i % 10000 == 0) cout << i << endl;
-		myHNSWGraph.Insert(randomItems[i]);
-	}
-	
-	double total_brute_force_time = 0.0;
-	double total_hnsw_time = 0.0;
-
-	cout << "START QUERY" << endl;
-	int numHits = 0;
-	for (int i = 0; i < numQueries; i++) {
-		vector<double> temp(dim);
-		for (int d = 0; d < dim; d++) {
-			temp[d] = distribution(generator);
-		}
-		Item query(temp);
-
-		// Brute force
-		clock_t begin_time = clock();
-		vector<pair<double, int>> distPairs;
-		for (int j = 0; j < numItems; j++) {
-			if (j == i) continue;
-			distPairs.emplace_back(query.dist(randomItems[j]), j);
-		}
-		sort(distPairs.begin(), distPairs.end());
-		total_brute_force_time += double( clock () - begin_time ) /  CLOCKS_PER_SEC;
-
-		begin_time = clock();
-		vector<int> knns = myHNSWGraph.KNNSearch(query, K);
-		// cout << "Printing vectors";
-		// std::cout << "Contents of knns vector:" << std::endl;
-		// for (size_t i = 0; i < knns.size(); ++i) {
-		// 	std::cout << "knns[" << i << "] = " << knns[i] << std::endl;
-		// }
-		// cout << "\nPrinted Vectors";
-		total_hnsw_time += double( clock () - begin_time ) /  CLOCKS_PER_SEC;
-
-		if (knns[0] == distPairs[0].second) numHits++;
-	}
-	cout << numHits << " " << total_brute_force_time / numQueries  << " " << total_hnsw_time / numQueries << endl;
+    infile.close();
 }
 
-int main() {
-	randomTest(10000, 4, 100, 5);
+
+int main(int argc, char* argv[]) {
+
+    if (argc != 3) {
+        cerr << "Usage: " << argv[0] << " <input_filename> <output_filename>" << endl;
+        return EXIT_FAILURE;
+    }
+
+    string filename = argv[1];
+    string outputFilename = argv[2];
+    int K = 5;
+
+    ifstream infile(filename);
+    if (!infile.is_open()) {
+        cerr << "Unable to open file " << filename << endl;
+        exit(EXIT_FAILURE);
+    }
+
+    int N = 0, D = 0, M = 0;
+
+    std::vector<Item> base, queries;
+
+    readInputFromFile(filename, D, N, M, base, queries);
+
+    HNSWGraph myHNSWGraph(10, 30, 30, 10, 2);
+
+    for (int i = 0; i < N; ++i) {
+        myHNSWGraph.Insert(base[i]);
+    }
+
+    double total_brute_force_time = 0.0;
+    double total_hnsw_time = 0.0;
+
+    int numHits = 0;
+    ofstream outfile(outputFilename);
+
+    if (!outfile.is_open()) {
+        cerr << "Unable to open output file " << outputFilename << endl;
+        exit(EXIT_FAILURE);
+    }
+
+    for (int i = 0; i < M; ++i) {
+        Item query = queries[i];
+        clock_t begin_time = clock();
+        vector<pair<double, int>> distPairs;
+        for (int j = 0; j < N; ++j) {
+            if (j == i) continue;
+            distPairs.emplace_back(query.dist(base[j]), j);
+        }
+        sort(distPairs.begin(), distPairs.end());
+        total_brute_force_time += double(clock() - begin_time) / CLOCKS_PER_SEC;
+
+        begin_time = clock();
+        vector<int> knns = myHNSWGraph.KNNSearch(query, K);
+        for (size_t idx = 0; idx < knns.size(); ++idx) {
+            outfile << knns[idx];
+            if (idx != knns.size() - 1) {
+                outfile << " ";
+            }
+        }
+        outfile << endl;
+        total_hnsw_time += double(clock() - begin_time) / CLOCKS_PER_SEC;
+
+        if (knns[0] == distPairs[0].second) numHits++;
+    }
+    outfile.close();
+    cout << numHits << " " << total_brute_force_time / M << " " << total_hnsw_time / M << endl;
+
 	return 0;
 }

hnsw.cpp hnsw_implementation/hnsw.cpphnsw.cpp renamed to hnsw_implementation/hnsw.cpp

@@ -1 +1 @@
-./my_program 
+./my_program $1 $2

hnsw.h hnsw_implementation/hnsw.hhnsw.h renamed to hnsw_implementation/hnsw.h

@@ -27,7 +27,7 @@ void dump_func(int cas,int D,int N,int M,double T){
 	printf("dumping case %d\n",cas);
 	std::string file_name = "sample" + std::to_string(cas) + ".in";
 	FILE* fp = fopen(file_name.c_str(),"w");
-	fprintf(fp,"%d %d %d %f\n",D,N,M,T);
+	fprintf(fp,"%d %d %d\n",D,N,M);
   std::vector<std::vector<double>> data;
   for(int i = 0;i < N;++i){
     std::vector<double> tmp;
@@ -67,19 +67,10 @@ void dump_func(int cas,int D,int N,int M,double T){
 }
 
 int main(){
-  // dump_func(12,128,10000, 10000,0.9);
   // Dimensions, Base Vectors, Queries, Targets
   dump_func(1,2,10,5,0.9);
   dump_func(2,4,50,10,0.9);
   dump_func(3,4,1000,100,0.9);
-  // dump_func(3,128,1000000,10000,0.9);
-  // dump_func(4,128,1000000,10000,0.95);
-  // dump_func(5,256,1000000,10000,0.9);
-  // dump_func(6,256,1000000,10000,0.95);
-  // dump_func(7,512,500000,10000,0.9);
-  // dump_func(8,512,500000,10000,0.95);
-  // dump_func(9,512,1000000,10000,0.9);
-  // dump_func(10,512,1000000,10000,0.95);
   return 0;
 }