cleaning this up

ocallaco · Apr 8, 2014 · 9b827e7 · 9b827e7
1 parent 427bf22
commit 9b827e7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 242 deletions.
diff --git a/lshkit/Makefile b/lshkit/Makefile
@@ -12,7 +12,7 @@ lshkit:
 	cp lshkit-0.2.1/build/src/liblshkit.so .
 
 temp/luash.o: temp
-	$(CC) -c luash.cc -o $@ ${CFLAGS} ${INCLUDE}
+	$(CC) -c luash.cpp mplsh-fit-tune.cpp -o $@ ${CFLAGS} ${INCLUDE}
 
 luash.so: temp/luash.o lshkit
 	$(CC) -shared -o $@ temp/luash.o 

diff --git a/lshkit/lshkit-0.2.1/include/lshkit/mplsh-model.h b/lshkit/lshkit-0.2.1/include/lshkit/mplsh-model.h
@@ -221,7 +221,7 @@ class MultiProbeLshRecallTable
         }
     }
 
-    float lookup (float dist, int T)
+    float lookup (float dist, int T) const
     {
         unsigned d;
         if (dist < min_) return 1.0;

diff --git a/lshkit/luash.cc b/lshkit/luash.cc
diff --git a/lshkit/mplsh-fit-tune.cpp b/lshkit/mplsh-fit-tune.cpp
@@ -12,13 +12,13 @@
 
 #include <cstdlib>
 #include <gsl/gsl_multifit.h>
-#include "lshkit.h"
+#include <lshkit.h>
 
 using namespace std;
 using namespace lshkit;
 using namespace tr1;
 
-#include "lshkit/tune.h"
+#include <lshkit/tune.h>
 
 static const int MIN_L = 1;
 static const int MAX_L = 20;