Mercurial > hg > tipic

changeset 22:528185bfb0e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Wire up normalisation
author Chris Cannam
date Mon, 28 Sep 2015 14:54:07 +0100
parents 51d6dd470646
children 7330e78bedb4
files src/CRP.cpp
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/CRP.cpp	Mon Sep 28 14:51:17 2015 +0100
+++ b/src/CRP.cpp	Mon Sep 28 14:54:07 2015 +0100
@@ -3,6 +3,7 @@
 #include "CRP.h"
 
 #include "DCT.h"
+#include "Normalise.h"
 
 #include <cmath>
 #include <iostream>
@@ -29,6 +30,8 @@
     RealBlock out;
     RealColumn dctOut(m_size);
 
+    int normP = 2; //!!! L2 norm (this is a param in MATLAB version)
+
     for (RealColumn col: in) {
 
 	RealColumn crp(bins);
@@ -59,9 +62,7 @@
 	    crp[i % bins] += col[i];
 	}
 
-	//!!! normalise as in normalizeFeature.m
-	
-	out.push_back(crp);
+	out.push_back(Normalise::normalise(crp, normP));
     }
 
     return out;