rename width to m_width too

shogun-toolbox · Apr 13, 2011 · 1371376 · 1371376
1 parent cce0b5d
commit 1371376
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/libshogun/kernel/ExponentialKernel.cpp b/src/libshogun/kernel/ExponentialKernel.cpp
@@ -20,20 +20,18 @@
 using namespace shogun;
 
 CExponentialKernel::CExponentialKernel()
-	: CDotKernel(), width(1), m_distance(NULL)
+	: CDotKernel(), m_distance(NULL), m_width(1)
 {
 	init();
 }
 
 CExponentialKernel::CExponentialKernel(
-	CDotFeatures* l, CDotFeatures* r, float64_t w, CDistance* distance, int32_t size)
-: CDotKernel(size)
+	CDotFeatures* l, CDotFeatures* r, float64_t width, CDistance* distance, int32_t size)
+: CDotKernel(size), m_distance(distance), m_width(width)
 {
 	init();
-	width=w;
 	ASSERT(distance);
 	SG_REF(distance);
-	m_distance = distance;
 	init(l,r);
 }
 
@@ -50,15 +48,17 @@ void CExponentialKernel::cleanup()
 
 bool CExponentialKernel::init(CFeatures* l, CFeatures* r)
 {
+	ASSERT(m_distance);
 	CDotKernel::init(l, r);
 	m_distance->init(l, r);
 	return init_normalizer();
 }
 
 float64_t CExponentialKernel::compute(int32_t idx_a, int32_t idx_b)
 {
+	ASSERT(m_distance);
 	float64_t dist=m_distance->distance(idx_a, idx_b);
-	return exp(-dist/width);
+	return exp(-dist/m_width);
 }
 
 void CExponentialKernel::load_serializable_post(void) throw (ShogunException)
@@ -69,6 +69,6 @@ void CExponentialKernel::load_serializable_post(void) throw (ShogunException)
 
 void CExponentialKernel::init()
 {
-	m_parameters->add(&width, "width", "Kernel width.");
+	m_parameters->add(&m_width, "width", "Kernel width.");
 	m_parameters->add((CSGObject**) &m_distance, "distance", "Distance to be used.");
 }
diff --git a/src/libshogun/kernel/ExponentialKernel.h b/src/libshogun/kernel/ExponentialKernel.h
@@ -50,7 +50,7 @@ class CExponentialKernel: public CDotKernel
 		 * @param size cache size
 		 */
 		CExponentialKernel(CDotFeatures* l, CDotFeatures* r,
-			float64_t width, CDistance* dist, int32_t size=10);
+			float64_t width, CDistance* distance, int32_t size);
 
 		virtual ~CExponentialKernel();
 
@@ -81,8 +81,9 @@ class CExponentialKernel: public CDotKernel
 		 *
 		 * @return kernel width
 		 */
-		inline virtual float64_t get_width(void) const {
-			return width;
+		inline virtual float64_t get_width(void) const
+		{
+			return m_width;
 		}
 
 	protected:
@@ -113,7 +114,7 @@ class CExponentialKernel: public CDotKernel
 		/** distance **/
 		CDistance* m_distance;
 		/** width */
-		float64_t width;
+		float64_t m_width;
 };
 }
 #endif /* _EXPONENTIALKERNEL_H__ */