Merge pull request #533 from iglesias/qda

Minor changes in QDA
shogun-toolbox · May 20, 2012 · 0fbded0 · 0fbded0
2 parents 788043e + 21a5be9
commit 0fbded0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/shogun/classifier/QDA.cpp b/src/shogun/classifier/QDA.cpp
@@ -46,11 +46,11 @@ CQDA::~CQDA()
 
 void CQDA::init()
 {
-	m_parameters->add(&m_tolerance, "m_tolerance", "Tolerance member.");
-	m_parameters->add(&m_store_covs, "m_store_covs", "Store covariances member");
-	m_parameters->add((CSGObject**) &m_features, "m_features", "Feature object.");
-	m_parameters->add(&m_means, "m_means", "Mean vectors list");
-	m_parameters->add(&m_slog, "m_slog", "Vector used in classification");
+	SG_ADD(&m_tolerance, "m_tolerance", "Tolerance member.", MS_AVAILABLE);
+	SG_ADD(&m_store_covs, "m_store_covs", "Store covariances member", MS_NOT_AVAILABLE);
+	SG_ADD((CSGObject**) &m_features, "m_features", "Feature object.", MS_NOT_AVAILABLE);
+	SG_ADD(&m_means, "m_means", "Mean vectors list", MS_NOT_AVAILABLE);
+	SG_ADD(&m_slog, "m_slog", "Vector used in classification", MS_NOT_AVAILABLE);
 
 	//TODO include SGNDArray objects for serialization
 

diff --git a/src/shogun/classifier/QDA.h b/src/shogun/classifier/QDA.h
@@ -27,6 +27,10 @@ namespace shogun
 
 /** @brief Class QDA implements Quadratic Discriminant Analysis.
  *
+ *  QDA learns a quadratic classifier and requires examples to be CSimplefeatures.
+ *  This classifier is optimal under the assumptions that the classes are normally
+ *  distributed (i.e. they are Gaussians). Unlike LDA, QDA does not assume that all
+ *  the classes are distributed with equal co-variance.
  *  TODO
  */
 class CQDA : public CMachine