Fix compile warnings and misc. build issues

.gitignore

@@ -0,0 +1,5 @@
+*.o
+Release/BMatchingSolver
+Release/src/*.d
+Shared\ Library/src/*.d
+Shared\ Library/libBMatchingSolver.*

Shared Library/objects.mk

@@ -4,5 +4,5 @@
 
 USER_OBJS :=
 
-LIBS :=
+LIBS := -lm -lpthread
 

src/BMatchingSolver.cpp

@@ -12,6 +12,7 @@
 #include <iostream>
 #include <fstream>
 #include <string>
+#include <cstdlib>
 #include "BMatchingLibrary.h"
 #include "utils.h"
 #include "SparseMatrix.h"

src/BeliefPropagator.cpp

@@ -10,6 +10,7 @@
 #include <math.h>
 #include <time.h>
 #include <pthread.h>
+#include <string.h>
 #include "BeliefPropagator.h"
 #include "BMatchingSolution.h"
 using namespace std;

src/BipartiteFunctionOracle.cpp

@@ -16,7 +16,7 @@ BipartiteFunctionOracle::BipartiteFunctionOracle(double **dataX, double **dataY,
 	rows = r;
 	cols = c;
 	dimension = d;
-	setCacheSize(max(rows, cols));
+	setCacheSize(std::max(rows, cols));
 }
 
 BipartiteFunctionOracle::~BipartiteFunctionOracle() {
@@ -27,12 +27,13 @@ int BipartiteFunctionOracle::getSize() {
 }
 
 double BipartiteFunctionOracle::computeWeight(int row, int col) {
-	if (row < rows && col < rows ||
-			row >= rows && col >= rows ||
-			row - rows >= cols || col - rows >= cols) {
+	if ((row < rows && col < rows) ||
+		(row >= rows && col >= rows) ||
+		row - rows >= cols || col - rows >= cols) {
 		return -INFINITY;
-	} else if (row < rows)
+	} else if (row < rows) {
 		return weightFunction->getWeight(X[row], Y[col - rows], dimension);
+	}
 	return weightFunction->getWeight(X[col], Y[row-rows], dimension);
 }
 

src/BipartiteMatrixOracle.cpp

@@ -27,12 +27,13 @@ int BipartiteMatrixOracle::getSize() {
 }
 
 double BipartiteMatrixOracle::computeWeight(int row, int col) {
-	if (row < rows && col < rows ||
-			row >= rows && col >= rows ||
-			row - rows >= cols || col - rows >= cols)
+	if ((row < rows && col < rows) ||
+		(row >= rows && col >= rows) ||
+		row - rows >= cols || col - rows >= cols) {
 		return -INFINITY;
-	else if (row < rows)
+	}else if (row < rows) {
 		return K[row][col - rows];
+	}
 	return K[col][row - rows];
 }
 

src/BipartiteMatrixOracle.h

@@ -40,8 +40,6 @@ class BipartiteMatrixOracle: public WeightOracle {
 	int rows;
 	int cols;
 	double **K;
-	int **index;
-	double **cache;
 };
 
 #endif /* KERNELMATRIXORACLE_H_ */

src/FunctionOracle.cpp

@@ -20,8 +20,7 @@ FunctionOracle::~FunctionOracle() {
 }
 
 double FunctionOracle::computeWeight(int row, int col) {
-	if (!selfLoops && row == col ||
-			row >= size || col >= size)
+	if ((!selfLoops && row == col) || row >= size || col >= size)
 		return -INFINITY;
 	return weightFunction->getWeight(data[row], data[col], dimension);
 }

src/IntDoubleMap.h

@@ -59,9 +59,7 @@ class IntDoubleMap {
 	double * value;
 	bool * filled;
 	int size;
-	int lastIndex;
 	int tableSize;
-	int maxSize;
 	double hits;
 	double misses;
 

src/IntSet.cpp

@@ -7,6 +7,7 @@
 
 #include "IntSet.h"
 #include <iostream>
+#include <string.h>
 using namespace std;
 
 IntSet::IntSet() {

src/MatrixOracle.cpp

@@ -22,8 +22,7 @@ int MatrixOracle::getSize() {
 }
 
 double MatrixOracle::computeWeight(int row, int col) {
-	if (!selfLoops && row == col ||
-			row >= size || col >= size)
+	if ((!selfLoops && row == col) || row >= size || col >= size)
 		return -INFINITY;
 	return weights[row][col];
 }

src/OscillationDetector.cpp

@@ -6,6 +6,7 @@
  */
 
 #include <math.h>
+#include <string.h>
 #include <iostream>
 #include "OscillationDetector.h"
 

src/utils.h

@@ -10,8 +10,6 @@
 #ifndef UTILS_H_
 #define UTILS_H_
 
-using namespace std;
-
 namespace utils {
 
 	// Takes a file and reads the input as a matrix of values