Merge branch 'master', remote branch 'christoph/master'

featureLearning/libdepend.inc

@@ -3,5 +3,4 @@ $(call PKG_DEPEND_INT,vislearning/baselib/)
 $(call PKG_DEPEND_INT,vislearning/cbaselib/)
 $(call PKG_DEPEND_INT,vislearning/features/)
 $(call PKG_DEPEND_INT,vislearning/math/)
-$(call PKG_DEPEND_INT,vislearning/noveltyDetecion/)
 $(call PKG_DEPEND_INT,segmentation/)

featureLearning/progs/libdepend.inc

@@ -4,4 +4,3 @@ $(call PKG_DEPEND_INT,vislearning/features/)
 $(call PKG_DEPEND_INT,vislearning/math/)
 $(call PKG_DEPEND_INT,vislearning/noveltyDetection/)
 $(call PKG_DEPEND_INT,segmentation/)
-$(call PKG_DEPEND_EXT_ESSENTIAL,VLFEAT)

math/cluster/GMM.cpp

@@ -9,7 +9,7 @@
 
 #include "vislearning/math/cluster/KMeans.h"
 
-#define DEBUGGMM
+// #define DEBUGGMM
 
 using namespace OBJREC;
 using namespace NICE;

progs/libdepend.inc

@@ -3,7 +3,8 @@ $(call PKG_DEPEND_INT,core/algebra)
 $(call PKG_DEPEND_INT,vislearning/math)
 $(call PKG_DEPEND_INT,vislearning/baselib)
 $(call PKG_DEPEND_INT,vislearning/cbaselib)
-$(call PKG_DEPEND_INT,vislearning/classifier/kernelclassifier)
+$(call PKG_DEPEND_INT,vislearning/classifier)
+$(call PKG_DEPEND_INT,vislearning/features)
 $(call PKG_DEPEND_INT,vislearning/matlabAccessHighLevel)
 $(call PKG_DEPEND_EXT,MATIO)
 $(call PKG_DEPEND_EXT,HDF5)