Cleaning unit tests imports: Removed unneeded #include, i.e. <init.h>

shogun-toolbox · Mar 16, 2014 · cf0db85 · cf0db85
1 parent 55912da
commit cf0db85
Show file tree

Hide file tree

Showing 67 changed files with 4 additions and 119 deletions.
diff --git a/tests/unit/base/Serialization_unittest.cc b/tests/unit/base/Serialization_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2013 Heiko Strathmann
  */
 
-#include <shogun/base/init.h>
 #include <shogun/labels/BinaryLabels.h>
 #include <shogun/labels/MulticlassLabels.h>
 #include <shogun/io/SerializableAsciiFile.h>

diff --git a/tests/unit/base/main_unittest.cc b/tests/unit/base/main_unittest.cc
@@ -1,4 +1,3 @@
-#include <iostream>
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 #include <shogun/base/init.h>

diff --git a/tests/unit/converter/Isomap_unittest.cc b/tests/unit/converter/Isomap_unittest.cc
@@ -1,6 +1,6 @@
 #include <vector>
 #include <set>
-#include <algorithm>
+#include <queue>
 
 #include <shogun/converter/Isomap.h>
 #include <shogun/distance/EuclideanDistance.h>

diff --git a/tests/unit/converter/ica/FFSep_unittest.cc b/tests/unit/converter/ica/FFSep_unittest.cc
@@ -1,13 +1,10 @@
-#include <shogun/base/init.h>
 #include <shogun/lib/common.h>
 #include <shogun/features/DenseFeatures.h>
 #include <gtest/gtest.h>
 
 #ifdef HAVE_EIGEN3
 
-#include <shogun/mathematics/Math.h>
 #include <shogun/mathematics/eigen3.h>
-
 #include <shogun/converter/ica/FFSep.h>
 #include <shogun/evaluation/ica/PermutationMatrix.h>
 

diff --git a/tests/unit/converter/ica/FastICA_unittest.cc b/tests/unit/converter/ica/FastICA_unittest.cc
@@ -1,11 +1,9 @@
-#include <shogun/base/init.h>
 #include <shogun/lib/common.h>
 #include <shogun/features/DenseFeatures.h>
 #include <gtest/gtest.h>
 
 #ifdef HAVE_EIGEN3
 
-#include <shogun/mathematics/Math.h>
 #include <shogun/mathematics/eigen3.h>
 
 #include <shogun/converter/ica/FastICA.h>

diff --git a/tests/unit/converter/ica/Jade_unittest.cc b/tests/unit/converter/ica/Jade_unittest.cc
@@ -1,11 +1,9 @@
-#include <shogun/base/init.h>
 #include <shogun/lib/common.h>
 #include <shogun/features/DenseFeatures.h>
 #include <gtest/gtest.h>
 
 #ifdef HAVE_EIGEN3
 
-#include <shogun/mathematics/Math.h>
 #include <shogun/mathematics/eigen3.h>
 
 #include <shogun/converter/ica/Jade.h>

diff --git a/tests/unit/converter/ica/JediSep_unittest.cc b/tests/unit/converter/ica/JediSep_unittest.cc
@@ -1,11 +1,9 @@
-#include <shogun/base/init.h>
 #include <shogun/lib/common.h>
 #include <shogun/features/DenseFeatures.h>
 #include <gtest/gtest.h>
 
 #ifdef HAVE_EIGEN3
 
-#include <shogun/mathematics/Math.h>
 #include <shogun/mathematics/eigen3.h>
 
 #include <shogun/converter/ica/JediSep.h>

diff --git a/tests/unit/converter/ica/SOBI_unittest.cc b/tests/unit/converter/ica/SOBI_unittest.cc
@@ -1,11 +1,9 @@
-#include <shogun/base/init.h>
 #include <shogun/lib/common.h>
 #include <shogun/features/DenseFeatures.h>
 #include <gtest/gtest.h>
 
 #ifdef HAVE_EIGEN3
 
-#include <shogun/mathematics/Math.h>
 #include <shogun/mathematics/eigen3.h>
 
 #include <shogun/converter/ica/SOBI.h>

diff --git a/tests/unit/converter/ica/UWedgeSep_unittest.cc b/tests/unit/converter/ica/UWedgeSep_unittest.cc
@@ -1,11 +1,9 @@
-#include <shogun/base/init.h>
 #include <shogun/lib/common.h>
 #include <shogun/features/DenseFeatures.h>
 #include <gtest/gtest.h>
 
 #ifdef HAVE_EIGEN3
 
-#include <shogun/mathematics/Math.h>
 #include <shogun/mathematics/eigen3.h>
 
 #include <shogun/converter/ica/UWedgeSep.h>

diff --git a/tests/unit/distribution/classical/GaussianDistribution_unittest.cc b/tests/unit/distribution/classical/GaussianDistribution_unittest.cc
@@ -10,7 +10,6 @@
 #ifdef HAVE_EIGEN3
 
 #include <shogun/distributions/classical/GaussianDistribution.h>
-#include <shogun/mathematics/Math.h>
 #include <shogun/mathematics/eigen3.h>
 #include <gtest/gtest.h>
 

diff --git a/tests/unit/evaluation/ROCEvaluation_unittest.cc b/tests/unit/evaluation/ROCEvaluation_unittest.cc
@@ -8,7 +8,6 @@
  * Written (W) 2013 Heiko Strathmann
  */
 
-#include <shogun/base/init.h>
 #include <shogun/labels/BinaryLabels.h>
 #include <shogun/evaluation/ROCEvaluation.h>
 #include <gtest/gtest.h>

diff --git a/tests/unit/evaluation/SplittingStrategy_unittest.cc b/tests/unit/evaluation/SplittingStrategy_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2013 Saurabh Mahindre
  */
 
-#include <shogun/base/init.h>
 #include <shogun/evaluation/CrossValidationSplitting.h>
 #include <shogun/labels/RegressionLabels.h>
 #include <shogun/evaluation/StratifiedCrossValidationSplitting.h>

diff --git a/tests/unit/evaluation/ica/AmariIndex_unittest.cc b/tests/unit/evaluation/ica/AmariIndex_unittest.cc
@@ -1,4 +1,3 @@
-#include <shogun/base/init.h>
 #include <shogun/lib/common.h>
 #include <gtest/gtest.h>
 

diff --git a/tests/unit/evaluation/ica/PermutationMatrix_unittest.cc b/tests/unit/evaluation/ica/PermutationMatrix_unittest.cc
@@ -1,4 +1,3 @@
-#include <shogun/base/init.h>
 #include <shogun/lib/common.h>
 #include <gtest/gtest.h>
 

diff --git a/tests/unit/features/CombinedDotFeatures_unittest.cc b/tests/unit/features/CombinedDotFeatures_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2012-2013 Evangelos Anagnostopoulos
  */
 
-#include <shogun/base/init.h>
 #include <shogun/features/DenseFeatures.h>
 #include <shogun/features/SparseFeatures.h>
 #include <shogun/features/CombinedDotFeatures.h>

diff --git a/tests/unit/features/CombinedFeatures_unittest.cc b/tests/unit/features/CombinedFeatures_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2012-2013 Heiko Strathmann
  */
 
-#include <shogun/base/init.h>
 #include <shogun/features/DenseFeatures.h>
 #include <shogun/features/CombinedFeatures.h>
 #include <gtest/gtest.h>

diff --git a/tests/unit/features/DataGenerators_unittest.cc b/tests/unit/features/DataGenerators_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2012-2013 Heiko Strathmann
  */
 
-#include <shogun/base/init.h>
 #include <shogun/mathematics/Statistics.h>
 #include <shogun/features/streaming/generators/GaussianBlobsDataGenerator.h>
 #include <shogun/features/streaming/generators/MeanShiftDataGenerator.h>

diff --git a/tests/unit/features/DenseFeatures_unittest.cc b/tests/unit/features/DenseFeatures_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2012-2013 Heiko Strathmann
  */
 
-#include <shogun/base/init.h>
 #include <shogun/features/DenseFeatures.h>
 #include <gtest/gtest.h>
 

diff --git a/tests/unit/features/HashedDenseFeatures_unittest.cc b/tests/unit/features/HashedDenseFeatures_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2012-2013 Heiko Strathmann
  */
 
-#include <shogun/base/init.h>
 #include <shogun/lib/Hash.h>
 #include <shogun/features/DenseFeatures.h>
 #include <shogun/features/HashedDenseFeatures.h>

diff --git a/tests/unit/features/HashedDocDotFeatures_unittest.cc b/tests/unit/features/HashedDocDotFeatures_unittest.cc
@@ -15,11 +15,8 @@
 #include <shogun/lib/DelimiterTokenizer.h>
 #include <shogun/lib/NGramTokenizer.h>
 #include <shogun/lib/Hash.h>
-#include <shogun/multiclass/MulticlassLibLinear.h>
-#include <shogun/base/init.h>
 #include <gtest/gtest.h>
 
-#include <iostream>
 using namespace shogun;
 
 TEST(HashedDocDotFeaturesTest, computed_features_test)

diff --git a/tests/unit/features/HashedSparseFeatures_unittest.cc b/tests/unit/features/HashedSparseFeatures_unittest.cc
@@ -8,7 +8,6 @@
  * Copyright (C) 2013 Evangelos Anagnostopoulos
  */
 
-#include <shogun/base/init.h>
 #include <shogun/lib/Hash.h>
 #include <shogun/features/HashedSparseFeatures.h>
 #include <gtest/gtest.h>

diff --git a/tests/unit/features/LBPPyrDotFeatures_unittest.cc b/tests/unit/features/LBPPyrDotFeatures_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2013 Evangelos Anagnostopoulos
  */
 
-#include <shogun/base/init.h>
 #include <shogun/features/LBPPyrDotFeatures.h>
 #include <shogun/lib/SGMatrix.h>
 #include <gtest/gtest.h>

diff --git a/tests/unit/features/StreamingHashedDenseFeatures_unittest.cc b/tests/unit/features/StreamingHashedDenseFeatures_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2013 Evangelos Anagnostopoulos
  */
 
-#include <shogun/base/init.h>
 #include <shogun/lib/Hash.h>
 #include <shogun/features/DenseFeatures.h>
 #include <shogun/features/streaming/StreamingHashedDenseFeatures.h>

diff --git a/tests/unit/features/StreamingHashedSparseFeatures_unittest.cc b/tests/unit/features/StreamingHashedSparseFeatures_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2013 Evangelos Anagnostopoulos
  */
 
-#include <shogun/base/init.h>
 #include <shogun/lib/Hash.h>
 #include <shogun/features/SparseFeatures.h>
 #include <shogun/features/streaming/StreamingHashedSparseFeatures.h>

diff --git a/tests/unit/features/StreamingSparseFeatures_unittest.cc b/tests/unit/features/StreamingSparseFeatures_unittest.cc
@@ -10,7 +10,6 @@
 #include <unistd.h>
 #include <gtest/gtest.h>
 
-#include <shogun/base/init.h>
 #include <shogun/io/streaming/StreamingAsciiFile.h>
 #include <shogun/features/streaming/StreamingSparseFeatures.h>
 

diff --git a/tests/unit/features/StringFeatures_unittest.cc b/tests/unit/features/StringFeatures_unittest.cc
@@ -7,10 +7,8 @@
  * Written (W) 2011-2013 Heiko Strathmann
  */
 
-#include <shogun/base/init.h>
 #include <shogun/lib/memory.h>
 #include <shogun/features/DenseFeatures.h>
-#include <shogun/features/Subset.h>
 #include <shogun/lib/SGStringList.h>
 #include <gtest/gtest.h>
 

diff --git a/tests/unit/io/LibSVMFile_unittest.cc b/tests/unit/io/LibSVMFile_unittest.cc
@@ -3,7 +3,6 @@
 #include <shogun/mathematics/Random.h>
 
 #include <cstdio>
-#include <cstring>
 
 #include <gtest/gtest.h>
 

diff --git a/tests/unit/io/LineReader_unittest.cc b/tests/unit/io/LineReader_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2013 Evgeniy Andreev (gsomix)
  */
 
-#include <shogun/base/init.h>
 #include <shogun/io/LineReader.h>
 #include <shogun/lib/DelimiterTokenizer.h>
 #include <shogun/lib/SGVector.h>

diff --git a/tests/unit/kernel/CustomKernel_unittest.cc b/tests/unit/kernel/CustomKernel_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2013 Heiko Strathmann
  */
 
-#include <shogun/base/init.h>
 #include <shogun/kernel/GaussianKernel.h>
 #include <shogun/kernel/CustomKernel.h>
 #include <shogun/features/DenseFeatures.h>

diff --git a/tests/unit/labels/BinaryLabels_unittest.cc b/tests/unit/labels/BinaryLabels_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2012-2013 Heiko Strathmann
  */
 
-#include <shogun/base/init.h>
 #include <shogun/labels/BinaryLabels.h>
 #include <gtest/gtest.h>
 

diff --git a/tests/unit/labels/MulticlassLabels_unittest.cc b/tests/unit/labels/MulticlassLabels_unittest.cc
@@ -7,7 +7,6 @@
  * Written (W) 2013 Sergey Lisitsyn
  */
 
-#include <shogun/base/init.h>
 #include <shogun/labels/MulticlassLabels.h>
 #include <gtest/gtest.h>
 

diff --git a/tests/unit/labels/StructuredLabels_unittest.cc b/tests/unit/labels/StructuredLabels_unittest.cc
@@ -9,7 +9,6 @@
  * Copyright (C) 2013 Thoralf Klein
  */
 
-#include <shogun/base/init.h>
 #include <shogun/labels/StructuredLabels.h>
 #include <shogun/structure/MulticlassSOLabels.h>
 #include <gtest/gtest.h>

diff --git a/tests/unit/lib/CircularBuffer_unittest.cc b/tests/unit/lib/CircularBuffer_unittest.cc
@@ -7,13 +7,10 @@
  * Written (W) 2013 Evgeniy Andreev (gsomix)
  */
 
-#include <shogun/base/init.h>
 #include <shogun/lib/CircularBuffer.h>
 #include <shogun/lib/DelimiterTokenizer.h>
 #include <gtest/gtest.h>
 
-#include <cstring>
-
 using namespace shogun;
 
 TEST(CircularBufferTest, constructor)

diff --git a/tests/unit/lib/Memory_unittest.cc b/tests/unit/lib/Memory_unittest.cc
@@ -1,7 +1,7 @@
 #include <shogun/lib/memory.h>
-#include <shogun/lib/SGMatrix.h>
-#include <shogun/lib/SGSparseVector.h>
-#include <shogun/lib/SGVector.h>
+namespace shogun { template <class T> class SGMatrix; }
+namespace shogun { template <class T> class SGSparseVector; }
+namespace shogun { template <class T> class SGVector; }
 
 #include <gtest/gtest.h>
 

diff --git a/tests/unit/lib/SGMatrixList_unittest.cc b/tests/unit/lib/SGMatrixList_unittest.cc
@@ -1,6 +1,5 @@
 #include <shogun/lib/SGMatrix.h>
 #include <shogun/lib/SGMatrixList.h>
-#include <shogun/lib/SGVector.h>
 #include <shogun/lib/common.h>
 #include <shogun/lib/memory.h>
 #include <gtest/gtest.h>

diff --git a/tests/unit/lib/SGMatrix_unittest.cc b/tests/unit/lib/SGMatrix_unittest.cc
@@ -1,6 +1,5 @@
 #include <shogun/lib/SGMatrix.h>
 #include <shogun/lib/SGVector.h>
-#include <shogun/mathematics/Math.h>
 #include <gtest/gtest.h>
 
 using namespace shogun;

diff --git a/tests/unit/machine/gp/GaussianLikelihood_unittest.cc b/tests/unit/machine/gp/GaussianLikelihood_unittest.cc
@@ -13,9 +13,7 @@
 
 #include <shogun/base/Parameter.h>
 #include <shogun/labels/RegressionLabels.h>
-#include <shogun/features/DenseFeatures.h>
 #include <shogun/machine/gp/GaussianLikelihood.h>
-#include <shogun/evaluation/GradientResult.h>
 #include <gtest/gtest.h>
 
 using namespace shogun;

diff --git a/tests/unit/machine/gp/StudentsTLikelihood_unittest.cc b/tests/unit/machine/gp/StudentsTLikelihood_unittest.cc
@@ -13,9 +13,7 @@
 
 #include <shogun/base/Parameter.h>
 #include <shogun/labels/RegressionLabels.h>
-#include <shogun/features/DenseFeatures.h>
 #include <shogun/machine/gp/StudentsTLikelihood.h>
-#include <shogun/evaluation/GradientResult.h>
 #include <gtest/gtest.h>
 
 using namespace shogun;

diff --git a/tests/unit/mathematics/Random_unittest.cc b/tests/unit/mathematics/Random_unittest.cc
@@ -6,7 +6,6 @@
 #include <shogun/mathematics/Statistics.h>
 #include <shogun/lib/SGVector.h>
 #include <gtest/gtest.h>
-#include <stdio.h>
 
 using namespace shogun;
 

diff --git a/tests/unit/mathematics/ajd/FFDiag_unittest.cc b/tests/unit/mathematics/ajd/FFDiag_unittest.cc
@@ -1,10 +1,8 @@
-#include <shogun/base/init.h>
 #include <shogun/lib/common.h>
 #include <gtest/gtest.h>
 
 #ifdef HAVE_EIGEN3
 
-#include <shogun/lib/SGVector.h>
 #include <shogun/lib/SGMatrix.h>
 #include <shogun/lib/SGNDArray.h>
 

diff --git a/tests/unit/mathematics/ajd/JADiagOrth_unittest.cc b/tests/unit/mathematics/ajd/JADiagOrth_unittest.cc
@@ -1,10 +1,8 @@
-#include <shogun/base/init.h>
 #include <shogun/lib/common.h>
 #include <gtest/gtest.h>
 
 #ifdef HAVE_EIGEN3
 
-#include <shogun/lib/SGVector.h>
 #include <shogun/lib/SGMatrix.h>
 #include <shogun/lib/SGNDArray.h>
 

diff --git a/tests/unit/mathematics/ajd/JADiag_unittest.cc b/tests/unit/mathematics/ajd/JADiag_unittest.cc
@@ -1,10 +1,8 @@
-#include <shogun/base/init.h>
 #include <shogun/lib/common.h>
 #include <gtest/gtest.h>
 
 #ifdef HAVE_EIGEN3
 
-#include <shogun/lib/SGVector.h>
 #include <shogun/lib/SGMatrix.h>
 #include <shogun/lib/SGNDArray.h>
 

diff --git a/tests/unit/mathematics/ajd/JediDiag_unittest.cc b/tests/unit/mathematics/ajd/JediDiag_unittest.cc
@@ -1,10 +1,8 @@
-#include <shogun/base/init.h>
 #include <shogun/lib/common.h>
 #include <gtest/gtest.h>
 
 #ifdef HAVE_EIGEN3
 
-#include <shogun/lib/SGVector.h>
 #include <shogun/lib/SGMatrix.h>
 #include <shogun/lib/SGNDArray.h>
 
@@ -13,7 +11,6 @@
 #include <shogun/mathematics/ajd/JediDiag.h>
 
 #include <shogun/evaluation/ica/PermutationMatrix.h>
-#include <iostream>
 
 using namespace Eigen;