Changeset 747

Timestamp:

Feb 11, 2007, 2:26:41 PM (17 years ago)

Author:

Peter

Message:

replaced includes in header files with forward declarations when possible. Added some includes in cc files.

Location:

trunk

Files:

• test/score_test.cc (modified) (1 diff)
• test/svm_test.cc (modified) (1 diff)
• yat/classifier/DataLookup1D.h (modified) (2 diffs)
• yat/classifier/DataLookupWeighted1D.h (modified) (2 diffs)
• yat/classifier/FeatureSelectorIR.cc (modified) (1 diff)
• yat/classifier/FeatureSelectorIR.h (modified) (1 diff)
• yat/classifier/GaussianKernelFunction.h (modified) (2 diffs)
• yat/classifier/Kernel.cc (modified) (1 diff)
• yat/classifier/Kernel.h (modified) (2 diffs)
• yat/classifier/Kernel_MEV.h (modified) (1 diff)
• yat/classifier/PolynomialKernelFunction.h (modified) (2 diffs)
• yat/classifier/SVM.cc (modified) (1 diff)
• yat/classifier/SVM.h (modified) (2 diffs)
• yat/microarray/DataSet.h (modified) (2 diffs)
• yat/regression/Local.h (modified) (2 diffs)
• yat/regression/Polynomial.h (modified) (1 diff)
• yat/statistics/Fisher.h (modified) (2 diffs)
• yat/statistics/FoldChange.cc (modified) (1 diff)
• yat/statistics/ROC.cc (modified) (1 diff)
• yat/statistics/ROC.h (modified) (2 diffs)
• yat/statistics/SNR.cc (modified) (1 diff)
• yat/statistics/Score.cc (modified) (1 diff)
• yat/statistics/Score.h (modified) (2 diffs)
• yat/statistics/tScore.cc (modified) (1 diff)

trunk/test/score_test.cc

@@ -22 +22 @@
 */
 
+#include "yat/classifier/Target.h"
 #include "yat/statistics/FoldChange.h"
 #include "yat/statistics/Pearson.h"

trunk/test/svm_test.cc

@@ -28 +28 @@
 #include "yat/classifier/Kernel_MEV.h"
 #include "yat/classifier/PolynomialKernelFunction.h"
+#include "yat/classifier/Target.h"
 #include "yat/utility/matrix.h"
 #include "yat/utility/vector.h"

trunk/yat/classifier/DataLookup1D.h

@@ -25 +25 @@
 */
 
-#include "DataLookup2D.h"
-
 #include <cassert>
 #include <iostream>
@@ -34 +32 @@
 namespace yat {
 namespace classifier {  
+
+  class DataLookup2D;
 
   ///

trunk/yat/classifier/DataLookupWeighted1D.h

@@ -25 +25 @@
 */
 
-#include "MatrixLookupWeighted.h"
-
 #include <iostream>
 #include <vector>
@@ -33 +31 @@
 namespace yat {
 namespace classifier {  
+
+  class MatrixLookupWeighted;
 
   ///

trunk/yat/classifier/FeatureSelectorIR.cc

@@ -26 +26 @@
 #include "MatrixLookup.h"
 #include "InputRanker.h"
+#include "Target.h"
 
 #include <algorithm>

trunk/yat/classifier/FeatureSelectorIR.h

@@ -27 +27 @@
 #include "FeatureSelector.h"
 
-#include "yat/statistics/Score.h"
-
 namespace theplu {
 namespace yat {
+namespace statistics {
+  class Score;
+}
 namespace classifier {
 

trunk/yat/classifier/GaussianKernelFunction.h

@@ -26 +26 @@
 
 #include "KernelFunction.h"
-#include "DataLookup1D.h"
 
 #include <cmath>
@@ -33 +32 @@
 namespace yat {
 namespace classifier {
+
+  class DataLookup1D;
 
   ///

trunk/yat/classifier/Kernel.cc

@@ -27 +27 @@
 #include "KernelFunction.h"
 #include "MatrixLookup.h"
+#include "MatrixLookupWeighted.h"
 
 #include <vector>

trunk/yat/classifier/Kernel.h

@@ -25 +25 @@
 */
 
-#include "DataLookup2D.h"
 #include "KernelFunction.h"
-#include "MatrixLookupWeighted.h"
 
 #include <cctype>
@@ -36 +34 @@
 namespace classifier {
 
+  class DataLookup2D;
   class MatrixLookup;
+  class MatrixLookupWeighted;
 
   ///

trunk/yat/classifier/Kernel_MEV.h

@@ -25 +25 @@
 */
 
-#include "DataLookup1D.h"
 #include "Kernel.h"
 #include "KernelFunction.h"

trunk/yat/classifier/PolynomialKernelFunction.h

@@ -26 +26 @@
 
 #include "KernelFunction.h"
-#include "DataLookup1D.h"
 
 #include <cmath>
@@ -33 +32 @@
 namespace yat {
 namespace classifier {
+
+  class DataLookup1D;
 
   ///

trunk/yat/classifier/SVM.cc

@@ -24 +24 @@
 #include "SVM.h"
 #include "DataLookup2D.h"
+#include "Target.h"
 #include "yat/random/random.h"
 #include "yat/statistics/Averager.h"

trunk/yat/classifier/SVM.h

@@ -28 +28 @@
 #include "SupervisedClassifier.h"
 #include "SVindex.h"
-#include "Target.h"
 #include "yat/utility/vector.h"
 
@@ -39 +38 @@
 
   class DataLookup2D;
+  class Target;
+
   ///
   /// @brief Support Vector Machine 

trunk/yat/microarray/DataSet.h

@@ -26 +26 @@
 
 #include "yat/classifier/MatrixLookup.h"
-#include "yat/classifier/Target.h"
 
 #include <map>
@@ -34 +33 @@
 namespace theplu {
 namespace yat {
+namespace classifier {
+  class Target;
+}
 namespace microarray {
 

trunk/yat/regression/Local.h

@@ -25 +25 @@
 */
 
-#include "Kernel.h"
-#include "OneDimensionalWeighted.h"
 #include "yat/utility/vector.h"
 
@@ -34 +32 @@
 namespace yat {
 namespace regression {
+
+  class Kernel;
+  class OneDimensionalWeighted;
 
   ///

trunk/yat/regression/Polynomial.h

@@ -27 +27 @@
 #include "OneDimensional.h"
 #include "MultiDimensional.h"
-#include "yat/utility/vector.h"
 
 namespace theplu {
 namespace yat {
+namespace utility {
+  class vector;
+}
 namespace regression {
 

trunk/yat/statistics/Fisher.h

@@ -26 +26 @@
 
 #include "Score.h"
-#include "yat/utility/vector.h"
+
+#include <sys/types.h>
 
 #include <cmath>
@@ -32 +33 @@
 namespace theplu {
 namespace yat {
+namespace utility {
+  class vector;
+}
 namespace statistics {  
   /**

trunk/yat/statistics/FoldChange.cc

@@ -28 +28 @@
 #include "yat/classifier/DataLookupWeighted1D.h"
 #include "yat/classifier/Target.h"
+#include "yat/utility/vector.h"
 
 namespace theplu {

trunk/yat/statistics/ROC.cc

@@ -24 +24 @@
 #include "ROC.h"
 #include "yat/classifier/DataLookupWeighted1D.h"
+#include "yat/classifier/Target.h"
 #include "yat/utility/stl_utility.h"
 #include "yat/utility/vector.h"

trunk/yat/statistics/ROC.h

@@ -26 +26 @@
 
 #include "Score.h"
-#include "yat/classifier/Target.h"
 
 #include <utility>
@@ -33 +32 @@
 namespace theplu {
 namespace yat {
-  namespace utility {
-    class vector;
-  }
+namespace classifier {
+  class Target;
+}
+namespace utility {
+  class vector;
+}
 namespace statistics {  
 

trunk/yat/statistics/SNR.cc

@@ -27 +27 @@
 #include "yat/classifier/DataLookupWeighted1D.h"
 #include "yat/classifier/Target.h"
+#include "yat/utility/vector.h"
 
 namespace theplu {

trunk/yat/statistics/Score.cc

@@ -23 +23 @@
 
 #include "Score.h"
+
+#include "yat/classifier/DataLookup1D.h"
+#include "yat/classifier/Target.h"
+#include "yat/classifier/utility.h"
+#include "yat/utility/vector.h"
+
 
 namespace theplu {

trunk/yat/statistics/Score.h

@@ -25 +25 @@
 */
 
-#include "yat/classifier/utility.h"
-#include "yat/utility/vector.h"
-
 #include <cassert>
-#ifndef NDEGUG
-#include "yat/classifier/Target.h"
-#include "yat/classifier/DataLookup1D.h"
-#endif
 
 namespace theplu {
@@ -41 +34 @@
   class DataLookupWeighted1D;
 }
-
+namespace utility {
+  class vector;
+}
 namespace statistics {
 

trunk/yat/statistics/tScore.cc

@@ -27 +27 @@
 #include "yat/classifier/DataLookupWeighted1D.h"
 #include "yat/classifier/Target.h"
+#include "yat/utility/vector.h"
 
 #include <cassert>