Moved the haversine code to a subdirectory

.gitignore

@@ -1,4 +1,4 @@
-python/__pycache__/**/*
+haversine/python/__pycache__/**/*
-cpp/haverscan
+haversine/cpp/haverscan
-cpp/haverstrtok
+haversine/cpp/haverstrtok
-data_10000000_flex.json
+haversine/data_10000000_flex.json

Makefile

@@ -1,14 +1,14 @@
-mk_fscanf:
+mk_haversine_fscanf:
-	clang++ -g cpp/fscanf.cpp cpp/haversine.cpp -o cpp/haverscan
+	clang++ -g haversine/cpp/fscanf.cpp haversine/cpp/haversine.cpp -o haversine/cpp/haverscan
 
-run_fscanf:
+run_haversine_fscanf:
-	./cpp/haverscan
+	cd ./haversine/cpp && ./haverscan
 
-mk_strtok:
+mk_haversine_strtok:
-	clang++ -g cpp/strtok.cpp cpp/haversine.cpp -o cpp/haverstrtok
+	clang++ -g haversine/cpp/strtok.cpp haversine/cpp/haversine.cpp -o haversine/cpp/haverstrtok
 
-run_strtok:
+run_haversine_strtok:
-	./cpp/haverstrtok
+	cd ./haversine/cpp && ./haverstrtok
 
-run_python_json:
+run_haversine_python_json:
-	python ./python/haversine_json.py
+	python ./haversine/python/haversine_json.py

haversine/cpp/fscanf.cpp

@@ -24,13 +24,9 @@ struct Item {
 
 int main(int argc, char *argv[]) {
 #if DEBUG
-  FILE *fp = fopen("/home/abdelrahman/Sources/dev/"
+  FILE *fp = fopen("../test_data.json", "rb");
-                   "performance_aware_programming/test_data.json",
-                   "rb");
 #else
-  FILE *fp = fopen("/home/abdelrahman/Sources/dev/"
+  FILE *fp = fopen("../data_10000000_flex.json", "rb");
-                   "performance_aware_programming/data_10000000_flex.json",
-                   "rb");
 #endif
 
   Item *items = (Item *)malloc(ITEM_COUNT * sizeof(Item));

haversine/cpp/strtok.cpp

@@ -24,13 +24,9 @@ struct Item {
 
 int main(int argc, char *argv[]) {
 #if DEBUG
-  FILE *fp = fopen("/home/abdelrahman/Sources/dev/"
+  FILE *fp = fopen("../test_data.json", "rb");
-                   "performance_aware_programming/test_data.json",
-                   "rb");
 #else
-  FILE *fp = fopen("/home/abdelrahman/Sources/dev/"
+  FILE *fp = fopen("../data_10000000_flex.json", "rb");
-                   "performance_aware_programming/data_10000000_flex.json",
-                   "rb");
 #endif
 
   Item *items = (Item *)malloc(ITEM_COUNT * sizeof(Item));