5 files changed, 53 insertions, 113 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5144b83..dca0a4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,17 +57,10 @@ set(MAIN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/main)
 include_directories (${INCLUDE_DIR})
 
 add_library(uknapsack STATIC ${SRC_FILES})
+add_executable(uknapsack_bin ${MAIN_SRC_DIR}/uknapsack)
 
-add_executable(nem_ull ${MAIN_SRC_DIR}/nem_ull.c)
-add_executable(dfs ${MAIN_SRC_DIR}/dfs.c)
-add_executable(random_heuristic ${MAIN_SRC_DIR}/random_heuristic.c)
+target_link_libraries(uknapsack_bin uknapsack)
 
-target_link_libraries(nem_ull uknapsack)
-target_link_libraries(dfs uknapsack)
-target_link_libraries(random_heuristic uknapsack)
-
-install(TARGETS nem_ull DESTINATION bin)
-install(TARGETS dfs DESTINATION bin)
-install(TARGETS random_heuristic DESTINATION bin)
+install(TARGETS uknapsack_bin DESTINATION bin)
 install(TARGETS uknapsack DESTINATION lib)
 install(FILES ${INCLUDE_FILES} DESTINATION include)
diff --git a/src/main/dfs.c b/src/main/dfs.c
deleted file mode 100644
index f28f8ab..0000000
--- a/src/main/dfs.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <stdio.h>
-#include <time.h>
-#include <stdlib.h>
-#include "common.h"
-#include "structs.h"
-#include "dfs.h"
-
-int main(int argc, char * argv[]){
-  struct data * d;
-  struct front_item * b;
-
-  if(argc!=2){
-    printf("Wrong number of arguments!\n");
-    printf("Example usage: %s data_file\n",argv[0]);
-    return 0;
-  }
-
-  d = input(argv[1]);
-
-  /* srand() and qsort data  */
-  srand(time(NULL));
-  qsort(d->items, d->N, sizeof(struct item), cmp_items_random);
-
-  clock_t t = clock();
-  b = dfs(d);
-
-  t = clock() - t;
-  printf("%f,%d\n",((float)t)/CLOCKS_PER_SEC,len_front(b));
-
-  print_front(b);
-
-  free_front(b);
-  free_data(d);
-
-  return 0;
-}
diff --git a/src/main/nem_ull.c b/src/main/nem_ull.c
deleted file mode 100644
index 2bf29a6..0000000
--- a/src/main/nem_ull.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdio.h>
-#include <time.h>
-#include "common.h"
-#include "structs.h"
-#include "nem_ull.h"
-
-int main(int argc, char * argv[]){
-  struct data * d;
-  struct front_item * b;
-
-  if(argc!=2){
-    printf("Wrong number of arguments!\n");
-    printf("Example usage: %s data_file\n",argv[0]);
-    return 0;
-  }
-
-  d = input(argv[1]);
-  
-  clock_t t = clock();
-  b = nem_ull(d);
-
-  t = clock() - t;
-  printf("%f,%d\n",((float)t)/CLOCKS_PER_SEC,len_front(b));
-
-  print_front(b);
-
-  free_front(b);
-  free_data(d);
-
-  return 0;
-}
diff --git a/src/main/random_heuristic.c b/src/main/random_heuristic.c
deleted file mode 100644
index 9f3c683..0000000
--- a/src/main/random_heuristic.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <stdio.h>
-#include <time.h>
-#include <stdlib.h>
-#include "common.h"
-#include "structs.h"
-#include "random_heuristic.h"
-
-int main(int argc, char * argv[]){
-  struct data * d;
-  struct front_item * b;
-
-  if(argc!=2){
-    printf("Wrong number of arguments!\n");
-    printf("Example usage: %s data_file\n",argv[0]);
-    return 0;
-  }
-
-  d = input(argv[1]);
-
-  /* srand() and qsort data  */
-  srand(time(NULL));
-  qsort(d->items, d->N, sizeof(struct item), cmp_items_ratio);
-
-  clock_t t = clock();
-  b = random_heuristic(d);
-
-  t = clock() - t;
-  printf("%f,%d\n",((float)t)/CLOCKS_PER_SEC,len_front(b));
-
-  print_front(b);
-
-  free_front(b);
-  free_data(d);
-
-  return 0;
-}
diff --git a/src/main/uknapsack.c b/src/main/uknapsack.c
new file mode 100644
index 0000000..e7f3055
--- /dev/null
+++ b/src/main/uknapsack.c
@@ -0,0 +1,50 @@
+#include <stdio.h>
+#include <time.h>
+#include <stdlib.h>
+#include <string.h>
+#include "common.h"
+#include "structs.h"
+#include "dfs.h"
+#include "random_heuristic.h"
+#include "nem_ull.h"
+
+int main(int argc, char * argv[]){
+  struct data * data;
+  struct front_item * front = NULL;
+
+  if(argc!=4){
+    printf("Wrong number of arguments!\n");
+    printf("Example usage: %s algorithm sort_method data_file\n",argv[0]);
+    return 0;
+  }
+
+  data = input(argv[3]);
+
+  /* Sort data */
+  srand(time(NULL));
+  if(strcmp(argv[2], "random") == 0) {
+    qsort(data->items, data->N, sizeof(struct item), cmp_items_random);
+  } else if(strcmp(argv[2], "ratio") == 0) {
+    qsort(data->items, data->N, sizeof(struct item), cmp_items_ratio);
+  }
+
+  clock_t t = clock();
+  /* Choose algorithm */
+  if(strcmp(argv[1], "nem_ull") == 0) {
+    front = nem_ull(data);
+  } else if(strcmp(argv[1], "dfs") == 0) {
+    front = dfs(data);
+  } else if(strcmp(argv[1], "random_heuristic") == 0) {
+    front = random_heuristic(data);
+  }
+
+  t = clock() - t;
+  printf("%f,%d\n",((float)t)/CLOCKS_PER_SEC,len_front(front));
+
+  print_front(front);
+
+  free_front(front);
+  free_data(data);
+
+  return 0;
+}