distance fixed

src/mmr/CMakeLists.txt

@@ -33,7 +33,9 @@ set(DESCRIPTORS
 
 set(FEATURE_VECTOR
     "include/feature_vector.h"
+    "include/emd.h"
     "src/feature_vector.cpp"
+    "src/emd.c"
 )
 
 add_executable(${EXC_NAME} 

src/mmr/include/emd.h

+#ifdef __cplusplus
+extern "C" {
+#endif // DEBUG
+
 #ifndef _EMD_H
 #define _EMD_H
 /*
@@ -50,3 +54,7 @@ float emd(signature_t *Signature1, signature_t *Signature2,
 	  flow_t *Flow, int *FlowSize);
 
 #endif
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus

src/mmr/include/feature_vector.h

@@ -5,3 +5,11 @@
 #include <vector>
 #include "emd.h"
 #include "descriptors.h"
+
+typedef float feature_t;
+
+float e_dist(feature_t *F1, feature_t *F2);
+Scalar dist(mmr::Histogram h1, mmr::Histogram h2);
+Scalar dist(std::map<std::string, Scalar> data1,
+            std::map<std::string, Scalar> data2,
+            std::vector<std::string> index);