Revert "remove unneeded class definitions from .h files"

This reverts commit ff5f545.
shogun-toolbox · Sep 21, 2011 · c738a00 · c738a00
1 parent 00f7777
commit c738a00
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 4 deletions.
diff --git a/src/shogun/classifier/LDA.h b/src/shogun/classifier/LDA.h
@@ -21,6 +21,7 @@
 
 namespace shogun
 {
+	template <class ST> class CSimpleFeatures;
 /** @brief Class LDA implements regularized Linear Discriminant Analysis.
  *
  * LDA learns a linear classifier and requires examples to be CSimpleFeatures.

diff --git a/src/shogun/classifier/svm/WDSVMOcas.h b/src/shogun/classifier/svm/WDSVMOcas.h
@@ -20,6 +20,8 @@
 
 namespace shogun
 {
+template <class ST> class CStringFeatures;
+
 /** @brief class WDSVMOcas */
 class CWDSVMOcas : public CMachine
 {

diff --git a/src/shogun/distance/CanberraMetric.h b/src/shogun/distance/CanberraMetric.h
@@ -17,6 +17,8 @@
 
 namespace shogun
 {
+	template <class T> class CSimpleFeatures;
+
 /** @brief class CanberraMetric 
  *
  * The Canberra distance sums up the dissimilarity (ratios) between feature 

diff --git a/src/shogun/distance/HammingWordDistance.h b/src/shogun/distance/HammingWordDistance.h
@@ -19,6 +19,8 @@
 
 namespace shogun
 {
+	template <class T> class CStringFeatures;
+
 /** @brief class HammingWordDistance */
 class CHammingWordDistance: public CStringDistance<uint16_t>
 {

diff --git a/src/shogun/distance/SparseEuclidianDistance.h b/src/shogun/distance/SparseEuclidianDistance.h
@@ -17,6 +17,7 @@
 
 namespace shogun
 {
+	template <class T> class CSparseFeatures;
 /** @brief class SparseEucldianDistance */
 class CSparseEuclidianDistance: public CSparseDistance<float64_t>
 {

diff --git a/src/shogun/distributions/HMM.h b/src/shogun/distributions/HMM.h
@@ -28,6 +28,8 @@
 
 namespace shogun
 {
+	class CFeatures;
+	template <class ST> class CStringFeatures;
 /**@name HMM specific types*/
 //@{
 

diff --git a/src/shogun/distributions/Histogram.h b/src/shogun/distributions/Histogram.h
@@ -16,6 +16,8 @@
 
 namespace shogun
 {
+	template <class ST> class CStringFeatures;
+
 /** @brief Class Histogram computes a histogram over all 16bit unsigned
  * integers in the features.
  *

diff --git a/src/shogun/kernel/AUCKernel.h b/src/shogun/kernel/AUCKernel.h
@@ -19,6 +19,9 @@
 
 namespace shogun
 {
+	class CLabels;
+	template <class T> class CSimpleFeatures;
+
 /** @brief The AUC kernel can be used to maximize the area under the receiver operator
  * characteristic curve (AUC) instead of margin in SVM training.
  *

diff --git a/src/shogun/kernel/CommUlongStringKernel.h b/src/shogun/kernel/CommUlongStringKernel.h
@@ -18,6 +18,9 @@
 
 namespace shogun
 {
+template <class T> class CDynamicArray;
+template <class ST> class CStringFeatures;
+
 /** @brief The CommUlongString kernel may be used to compute the spectrum kernel
  * from strings that have been mapped into unsigned 64bit integers.
  *

diff --git a/src/shogun/kernel/HistogramWordStringKernel.h b/src/shogun/kernel/HistogramWordStringKernel.h
@@ -19,6 +19,8 @@
 
 namespace shogun
 {
+	class CPluginEstimate;
+	template <class T> class CStringFeatures;
 /** @brief The HistogramWordString computes the TOP kernel on inhomogeneous
  * Markov Chains. */
 class CHistogramWordStringKernel: public CStringKernel<uint16_t>

diff --git a/src/shogun/kernel/Kernel.h b/src/shogun/kernel/Kernel.h
@@ -30,6 +30,12 @@
 
 namespace shogun
 {
+	class CFile;
+	class CFeatures;
+	class CKernelNormalizer;
+	enum EFeatureType;
+	enum EFeatureClass;
+
 #ifdef USE_SHORTREAL_KERNELCACHE
 	/** kernel cache element */
 	typedef float32_t KERNELCACHE_ELEM;

diff --git a/src/shogun/kernel/PyramidChi2.h b/src/shogun/kernel/PyramidChi2.h
@@ -18,6 +18,8 @@
 
 namespace shogun
 {
+	template <class T> class CSimpleFeatures;
+
 /** @brief Pyramid Kernel over Chi2 matched histograms.
  *
  * 

diff --git a/src/shogun/modelselection/ModelSelectionParameters.cpp b/src/shogun/modelselection/ModelSelectionParameters.cpp
@@ -8,9 +8,8 @@
  * Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
  */
 
-#include <shogun/modelselection/ParameterCombination.h>
-#include <shogun/lib/DynamicObjectArray.h>
 #include <shogun/modelselection/ModelSelectionParameters.h>
+#include <shogun/modelselection/ParameterCombination.h>
 #include <shogun/lib/DataType.h>
 #include <shogun/base/Parameter.h>
 #include <shogun/base/DynArray.h>

diff --git a/src/shogun/modelselection/ModelSelectionParameters.h b/src/shogun/modelselection/ModelSelectionParameters.h
@@ -13,11 +13,12 @@
 
 #include <shogun/base/SGObject.h>
 #include <shogun/lib/DynamicObjectArray.h>
-#include <shogun/modelselection/ParameterCombination.h>
 
 namespace shogun
 {
 
+class CParameterCombination;
+
 /** type of range */
 enum ERangeType
 {

diff --git a/src/shogun/modelselection/ParameterCombination.cpp b/src/shogun/modelselection/ParameterCombination.cpp
@@ -8,7 +8,6 @@
  * Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
  */
 
-#include <shogun/lib/DynamicObjectArray.h>
 #include <shogun/modelselection/ParameterCombination.h>
 #include <shogun/base/Parameter.h>
 #include <shogun/machine/Machine.h>

diff --git a/src/shogun/structure/DynProg.h b/src/shogun/structure/DynProg.h
@@ -37,6 +37,12 @@
 
 namespace shogun
 {
+	template <class T> class CSparseFeatures;
+	class CIntronList;
+	class CPlifMatrix;
+	class CSegmentLoss;
+	template <class T> class CArray;
+
 //#define DYNPROG_TIMING
 
 #ifdef USE_BIGSTATES

diff --git a/src/shogun/structure/PlifMatrix.h b/src/shogun/structure/PlifMatrix.h
@@ -21,6 +21,8 @@
 
 namespace shogun
 {
+template <class T> class SGString;
+
 /** @brief store plif arrays for all transitions in the model
  */
 class CPlifMatrix: public CSGObject

diff --git a/src/shogun/structure/SegmentLoss.h b/src/shogun/structure/SegmentLoss.h
@@ -19,6 +19,9 @@
 
 namespace shogun
 {
+	template <class T> class CArray;
+	template <class T> class CArray2;
+	template <class T> class CArray3;
 /** @brief class IntronList */   
 class CSegmentLoss : public CSGObject
 {