Merge branch 'master' of /home/dbv/git/nice/vislearning

Conflicts:
	math/algebra/AlgebraTools.cpp
	math/algebra/AlgebraTools.h
	math/algebra/EigValues.cpp
	math/algebra/EigValues.h
	math/algebra/GMSparse2.h
	math/ftransform/FTransform.h
	math/ftransform/PCA.cpp
	math/ftransform/PCA.h
	math/progs/testEigenvalues.cpp
	optimization/quadprog/QuadProg++.cpp

baselib/ColorSpace.cpp

@@ -5,7 +5,9 @@
  * @date 07/28/2008
  */
 
-#include <vislearning/nice.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <iostream>
 

baselib/ColorSpace.h

@@ -9,7 +9,9 @@
 #define COLORSPACEINCLUDE
 
 
-#include <vislearning/nice.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include "core/image/MultiChannelImageT.h"
 

baselib/Conversions.cpp

@@ -5,11 +5,9 @@
 * @date 02/19/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <iostream>
 #include <assert.h>

baselib/Conversions.h

@@ -9,7 +9,9 @@
 #define CONVERSIONSINCLUDE
 
 
-#include <vislearning/nice.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
  
 #include <vector>
 

baselib/ICETools.cpp

@@ -5,12 +5,11 @@
 * @date 03/13/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#include <core/imagedisplay/SimpleSelector.h>
-#endif
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include <core/imagedisplay/ImageDisplay.h>
+#include <core/image/Filter.h>
 
 #include <iostream>
 
@@ -37,7 +36,9 @@ void ICETools::selectRectangles ( const NICE::Image & panel, NICE::Image & overl
 #ifndef NOVISUAL
     // new NICE code
     vector<RectT<double> > rectangles;
-    NICE::selectRectangles ( panel, rectangles, "select rectangles" );
+	 //TODO check this!
+//     NICE::selectRectangles ( panel, rectangles, "select rectangles" );
+// 	 selectRectangles ( panel, rectangles, "select rectangles" );
 
     for ( vector<RectT<double> >::const_iterator i = rectangles.begin();
 	i != rectangles.end(); i++ )
@@ -60,7 +61,9 @@ void ICETools::selectPoints ( const NICE::Image & panel, NICE::Image & overlay,
 {
 #ifndef NOVISUAL
     vector<CoordT<double> > points;
-    NICE::selectPoints ( panel, points, "select points" );
+	 //TODO check this!
+//     NICE::selectPoints ( panel, points, "select points" );
+// 	selectPoints ( panel, points, "select points" );
 
     for ( vector<CoordT<double> >::const_iterator i = points.begin();
 	i != points.end(); i++ )

baselib/ICETools.h

@@ -8,8 +8,9 @@
 #ifndef ICETOOLSINCLUDE
 #define ICETOOLSINCLUDE
 
-
-#include <vislearning/nice.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <vector>
  

baselib/Preprocess.cpp

@@ -5,11 +5,9 @@
 * @date 02/20/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <iostream>
 

baselib/ProgressBar.cpp

@@ -5,12 +5,10 @@
  * @date 25/03/2010
 
  */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#include <core/imagedisplay/QtFramework.h>
-#endif
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include <core/imagedisplay/ImageDisplay.h>
 
 #include <iostream>
 #include <sys/time.h>

baselib/ProgressBarQt.cpp

@@ -5,12 +5,12 @@
  * @date 25/03/2010
 
  */
-//#ifdef NOVISUAL
-//#include <vislearning/nice_nonvis.h>
-//#else
-#include <vislearning/nice.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include <core/imagedisplay/ImageDisplay.h>
 #include <core/imagedisplay/QtFramework.h>
-//#endif
+
 
 #include <iostream>
 #include <sys/time.h>

baselib/RunningStat.cpp

@@ -5,11 +5,9 @@
  * @date 18/02/2009
  */
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include "vislearning/baselib/RunningStat.h"
 

baselib/RunningStatVector.cpp

@@ -5,11 +5,9 @@
  * @date 19/01/2010
  */
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include "vislearning/baselib/RunningStatVector.h"
 

baselib/VectorStatistics.cpp

@@ -5,11 +5,8 @@
  * @date 18/02/2009
  */
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include "vislearning/baselib/RunningStat.h"
 #include "vislearning/baselib/VectorStatistics.h"

baselib/VectorStatistics.h

@@ -7,11 +7,8 @@
 #ifndef VectorStatisticsINCLUDE
 #define VectorStatisticsINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 namespace OBJREC
 {
 

cbaselib/BasicVectorTransformations.h

@@ -8,7 +8,10 @@
 #ifndef BASICVECTORTRANSFORMATIONSINCLUDE
 #define BASICVECTORTRANSFORMATIONSINCLUDE
 
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+
 #include "core/vector/VVector.h"
 #include <vector>
 #include "vislearning/cbaselib/VectorTransform.h"

cbaselib/ClassNames.cpp

@@ -5,7 +5,9 @@
 * @date 02/08/2008
 
 */
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <iostream>
 #include <algorithm>

cbaselib/ClassNames.h

@@ -8,7 +8,9 @@
 #ifndef CLASSNAMESINCLUDE
 #define CLASSNAMESINCLUDE
 
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
  
 #include <string>
 #include <map>

cbaselib/ClassificationResult.cpp

@@ -5,7 +5,9 @@
 * @date 02/13/2008
 
 */
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <iostream>
 

cbaselib/ClassificationResult.h

@@ -8,7 +8,9 @@
 #ifndef CLASSIFICATIONRESULTINCLUDE
 #define CLASSIFICATIONRESULTINCLUDE
 
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <string>
 #include <map>

cbaselib/ClassificationResults.cpp

@@ -7,7 +7,9 @@
 * @date 02/13/2008
 
 */
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <iostream>
 #include <fstream>

cbaselib/ClassificationResults.h

@@ -10,7 +10,9 @@
 #ifndef CLASSIFICATIONRESULTSINCLUDE
 #define CLASSIFICATIONRESULTSINCLUDE
 
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <vector>
 #include "ClassificationResult.h"

cbaselib/Feature.cpp

@@ -5,11 +5,9 @@
 * @date 04/21/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <iostream>
 

cbaselib/ImageInfo.cpp

@@ -5,7 +5,9 @@
 * @date 04/16/2008
 
 */
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <iostream>
 

cbaselib/ImageInfo.h

@@ -7,7 +7,9 @@
 #ifndef IMAGEINFOINCLUDE
 #define IMAGEINFOINCLUDE
 
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
  
 #include "vislearning/cbaselib/Polygon.h"
 #include "vislearning/cbaselib/BoundingBox.h"

cbaselib/LabeledFileList.cpp

@@ -5,7 +5,9 @@
 * @date 17.09.2007
 
 */
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <iostream>
 #include <sstream>

cbaselib/LabeledSet.cpp

@@ -8,7 +8,9 @@
 #ifndef LABELEDSETTCCINCLUDE
 #define LABELEDSETTCCINCLUDE
 
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <iostream>
 

cbaselib/LabeledSetSelection.h

@@ -8,7 +8,9 @@
 #ifndef LABELEDSETSELECTIONINCLUDE
 #define LABELEDSETSELECTIONINCLUDE
 
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <set>
 #include <map>

cbaselib/LabeledSetVectorTransform.h

@@ -8,7 +8,9 @@
 #ifndef LABELEDSETVECTORTRANSFORMINCLUDE
 #define LABELEDSETVECTORTRANSFORMINCLUDE
 
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <vector>
 #include <map>

cbaselib/LocalizationResult.cpp

@@ -5,7 +5,9 @@
 * @date 02/13/2008
 
 */
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <iostream>
 

cbaselib/LocalizationResult.h

@@ -8,7 +8,9 @@
 #ifndef LocalizationResultINCLUDE
 #define LocalizationResultINCLUDE
 
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <string>
 #include <vector>

cbaselib/VectorFeature.cpp

@@ -1,4 +1,6 @@
-#include <vislearning/nice.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <iostream>
 

cbaselib/VectorTransform.h

@@ -8,7 +8,9 @@
 #ifndef VECTORTRANSFORMINCLUDE
 #define VECTORTRANSFORMINCLUDE
 
-#include <vislearning/nice_nonvis.h>
+#include "core/image/ImageT.h"
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 #include "core/vector/VVector.h"
 #include <vector>
 

cbaselib/progs/calcCurves.cpp

@@ -5,7 +5,9 @@
 * @date 09/01/2008
 
 */
-#include <vislearning/nice_nonvis.h>
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
 
 #include <core/basics/Config.h>
 #include <vislearning/baselib/Gnuplot.h>

cbaselib/progs/createNormTrainingSet.cpp

@@ -5,11 +5,10 @@
 * @date 07/21/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
 
 #include <core/image/Convert.h>
 

cbaselib/progs/statisticsTrainingSet.cpp

@@ -5,11 +5,10 @@
 * @date 07/21/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
 
 #include <core/image/CrossT.h>
 

cbaselib/progs/testLabeledSet.cpp

@@ -5,11 +5,9 @@
 * @date 03/03/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
 
 #include <core/basics/Config.h>
 #include <vislearning/baselib/cmdline.h>

classifier/classifierbase/FeaturePoolClassifier.cpp

@@ -10,11 +10,7 @@
 
 #include "vislearning/classifier/classifierbase/FeaturePoolClassifier.h"
 #include "vislearning/baselib/ICETools.h"
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+
 
 using namespace OBJREC;
 

classifier/classifierbase/VecClassifier.cpp

@@ -5,12 +5,6 @@
 * @date 07.09.2007
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 #include <fstream>
 

classifier/classifiercombination/VCPreRandomForest.h

@@ -7,7 +7,11 @@
 #ifndef VCPRERANDOMFORESTINCLUDE
 #define VCPRERANDOMFORESTINCLUDE
 
-#include <vislearning/nice_nonvis.h>
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
+
 #include <map>
 
 #include "vislearning/cbaselib/LabeledSet.h"

classifier/classifierinterfaces/VCFeaturePool.cpp

@@ -5,8 +5,6 @@
 * @date 07.09.2007
 
 */
-#include <vislearning/nice.h>
-
 #include <iostream>
 
 #include "VCFeaturePool.h"

classifier/classifierinterfaces/VCFeaturePool.h

@@ -8,7 +8,10 @@
 #ifndef VCFeaturePoolINCLUDE
 #define VCFeaturePoolINCLUDE
 
-#include <vislearning/nice.h>
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
 
 #include <string>
 

classifier/fpclassifier/boosting/FPCBoosting.cpp

@@ -5,12 +5,6 @@
 * @date 04/24/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "vislearning/classifier/fpclassifier/randomforest/FPCRandomForests.h"

classifier/fpclassifier/boosting/FPCBoosting.h

@@ -8,11 +8,8 @@
 #ifndef FPCBoostingINCLUDE
 #define FPCBoostingINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include "core/basics/Config.h"
 #include "vislearning/classifier/classifierbase/FeaturePoolClassifier.h"

classifier/fpclassifier/boosting/FPCFullSearch.cpp

@@ -5,12 +5,6 @@
 * @date 04/21/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "FPCFullSearch.h"

classifier/fpclassifier/boosting/FPCFullSearch.h

@@ -8,11 +8,8 @@
 #ifndef FPCFullSearchINCLUDE
 #define FPCFullSearchINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <set>
 

classifier/fpclassifier/cascade/CascadeOptimization.cpp

@@ -5,12 +5,6 @@
 * @date 11/13/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 #include <algorithm>
 #include <assert.h>

classifier/fpclassifier/cascade/CascadeOptimization.h

@@ -8,11 +8,8 @@
 #ifndef CASCADEOPTIMIZATIONINCLUDE
 #define CASCADEOPTIMIZATIONINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include <vector>
 #include <list>

classifier/fpclassifier/cascade/FPCCascade.cpp

@@ -5,12 +5,6 @@
 * @date 04/21/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "FPCCascade.h"

classifier/fpclassifier/cascade/FPCCascade.h

@@ -8,11 +8,8 @@
 #ifndef FPCCascadeINCLUDE
 #define FPCCascadeINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
   
 #include "vislearning/classifier/classifierbase/FeaturePoolClassifier.h"
 

classifier/fpclassifier/fptools/NegativeFactory.cpp

@@ -5,12 +5,6 @@
 * @date 11/13/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "NegativeFactory.h"

classifier/fpclassifier/fptools/NegativeFactory.h

@@ -8,11 +8,8 @@
 #ifndef NEGATIVEFACTORYINCLUDE
 #define NEGATIVEFACTORYINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
  
 #include <vector>
 #include <string>

classifier/fpclassifier/logisticregression/FPCSMLR.h

@@ -8,7 +8,10 @@
 #ifndef FPCSMLRDEF
 #define FPCSMLRDEF
 
-#include <vislearning/nice.h>
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
 
 #include "vislearning/classifier/classifierbase/FeaturePoolClassifier.h"
 #include "vislearning/classifier/fpclassifier/logisticregression/SLR.h"

classifier/fpclassifier/logisticregression/SLR.h

@@ -7,7 +7,10 @@
 #ifndef SLRDEF
 #define SLRDEF
 
-#include <vislearning/nice.h>
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
 
 #include "vislearning/classifier/classifierbase/FeaturePoolClassifier.h"
 #include "vislearning/cbaselib/FeaturePool.h"

classifier/fpclassifier/randomforest/DTBClusterRandom.cpp

@@ -4,12 +4,6 @@
 * @author Erik Rodner
 * @date 05/01/2010
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "vislearning/classifier/fpclassifier/randomforest/DTBClusterRandom.h"

classifier/fpclassifier/randomforest/DTBClusterRandom.h

@@ -7,11 +7,8 @@
 #ifndef DTBCLUSTERRANDOMINCLUDE
 #define DTBCLUSTERRANDOMINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include "core/basics/Config.h"
 #include "DecisionTreeBuilder.h"

classifier/fpclassifier/randomforest/DTBPruning.cpp

@@ -5,12 +5,6 @@
 * @date 05/06/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "DTBPruning.h"

classifier/fpclassifier/randomforest/DTBPruning.h

@@ -8,11 +8,8 @@
 #ifndef DTBPruningINCLUDE
 #define DTBPruningINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include "DecisionTreeBuilder.h"
 

classifier/fpclassifier/randomforest/DTBRandom.cpp

@@ -5,12 +5,6 @@
 * @date 05/06/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "vislearning/classifier/fpclassifier/randomforest/DTBRandom.h"

classifier/fpclassifier/randomforest/DTBRandom.h

@@ -8,11 +8,8 @@
 #ifndef DTBRANDOMINCLUDE
 #define DTBRANDOMINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include "core/basics/Config.h"
 #include "DecisionTreeBuilder.h"

classifier/fpclassifier/randomforest/DTBStandard.cpp

@@ -5,8 +5,6 @@
 * @date 05/06/2008
 
 */
-#include <vislearning/nice_nonvis.h>
-
 #include <iostream>
 
 #include "vislearning/classifier/fpclassifier/randomforest/DTBStandard.h"

classifier/fpclassifier/randomforest/DTBStandard.h

@@ -8,7 +8,8 @@
 #ifndef DTBSTANDARDINCLUDE
 #define DTBSTANDARDINCLUDE
 
-#include <vislearning/nice_nonvis.h>
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
  
 #include "core/basics/Config.h"
 

classifier/fpclassifier/randomforest/DTEstimateAPriori.cpp

@@ -5,12 +5,6 @@
 * @date 05/27/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "vislearning/classifier/fpclassifier/randomforest/DTEstimateAPriori.h"

classifier/fpclassifier/randomforest/DTEstimateAPriori.h

@@ -8,11 +8,8 @@
 #ifndef DTESTIMATEAPRIORIINCLUDE
 #define DTESTIMATEAPRIORIINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
  
 #include "core/basics/Config.h"
 #include "vislearning/optimization/mapestimation/MAPEstimation.h"

classifier/fpclassifier/randomforest/DecisionNode.cpp

@@ -5,8 +5,6 @@
 * @date 04/24/2008
 
 */
-#include <vislearning/nice.h>
-
 #include <iostream>
 
 #include "vislearning/classifier/fpclassifier/randomforest/DecisionNode.h"

classifier/fpclassifier/randomforest/DecisionNode.h

@@ -8,6 +8,10 @@
 #ifndef DECISIONNODEINCLUDE
 #define DECISIONNODEINCLUDE
 
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
 #include <map>
 #include <limits>
 

classifier/fpclassifier/randomforest/DecisionTree.cpp

@@ -5,12 +5,6 @@
 * @date 04/24/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "vislearning/classifier/fpclassifier/randomforest/DecisionTree.h"

classifier/fpclassifier/randomforest/DecisionTree.h

@@ -11,6 +11,9 @@
 #include <map>
 #include <set>
 
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+
 #include "core/basics/triplet.h"
 #include "core/basics/Config.h"
 #include "core/basics/Persistent.h"
@@ -19,6 +22,8 @@
 #include "vislearning/cbaselib/CachedExample.h"
 
 
+
+
 namespace OBJREC {
 
 /** decision tree implementation */

classifier/fpclassifier/randomforest/DecisionTreeBuilder.cpp

@@ -5,12 +5,6 @@
 * @date 05/06/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "vislearning/classifier/fpclassifier/randomforest/DecisionTreeBuilder.h"

classifier/fpclassifier/randomforest/DecisionTreeBuilder.h

@@ -15,6 +15,9 @@
 #include "vislearning/cbaselib/FeaturePool.h"
 #include "vislearning/cbaselib/CachedExample.h"
 
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+
 #include "DecisionNode.h"
 #include "DecisionTree.h"
 

classifier/fpclassifier/randomforest/FPCDecisionTree.cpp

@@ -5,12 +5,6 @@
 * @date 04/21/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "vislearning/classifier/fpclassifier/randomforest/FPCDecisionTree.h"

classifier/fpclassifier/randomforest/FPCDecisionTree.h

@@ -8,11 +8,8 @@
 #ifndef FPCDECISIONTREEINCLUDE
 #define FPCDECISIONTREEINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include "core/basics/Config.h"
 

classifier/fpclassifier/randomforest/FPCRandomForestTransfer.cpp

@@ -5,12 +5,6 @@
 * @date 04/24/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 #include <list>
 

classifier/fpclassifier/randomforest/FPCRandomForestTransfer.h

@@ -8,11 +8,8 @@
 #ifndef FPCRandomForestTransferINCLUDE
 #define FPCRandomForestTransferINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include "core/basics/Config.h"
 #include "vislearning/cbaselib/ClassNames.h"

classifier/fpclassifier/randomforest/FPCRandomForests.cpp

@@ -10,8 +10,6 @@
 #include <omp.h>
 #endif
 
-#include <vislearning/nice.h>
-
 #include <iostream>
 
 #include "vislearning/classifier/fpclassifier/randomforest/FPCRandomForests.h"

classifier/fpclassifier/randomforest/FPCRandomForests.h

@@ -10,6 +10,11 @@
 
 #include <vector>
 
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
+
 #include "vislearning/classifier/classifierbase/FeaturePoolClassifier.h"
 #include "vislearning/cbaselib/FeaturePool.h"
 #include "DecisionTree.h"

classifier/progs/toyExampleUnsupervisedGP.cpp

@@ -17,11 +17,10 @@
 #include "vislearning/regression/gpregression/RegGaussianProcess.h" 
 #include "vislearning/math/kernels/KernelRBF.h"
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
 
 using namespace OBJREC;
 using namespace NICE;

classifier/vclassifier/VCAmitSVM.cpp

@@ -5,11 +5,6 @@
 * @date 11/28/2007
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
 
 #include <iostream>
 #include <fstream>

classifier/vclassifier/VCAmitSVM.h

@@ -8,11 +8,8 @@
 #ifndef VCAMITSVMINCLUDE
 #define VCAMITSVMINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
  
 #include "VCLearnFromSC.h"
 

classifier/vclassifier/VCDTSVM.h

@@ -7,7 +7,10 @@
 #ifndef VCDTSVMINCLUDE
 #define VCDTSVMINCLUDE
 
-#include <vislearning/nice.h>
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
 
 #include "vislearning/cbaselib/LabeledSet.h"
 #include "vislearning/classifier/classifierbase/VecClassifier.h"

classifier/vclassifier/VCLearnFromSC.cpp

@@ -5,12 +5,6 @@
 * @date 07.09.2007
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 #include <fstream>
 

classifier/vclassifier/VCLearnFromSC.h

@@ -8,11 +8,8 @@
 #ifndef VCLearnFromSCINCLUDE
 #define VCLearnFromSCINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include "vislearning/classifier/classifierbase/VecClassifier.h"
 

classifier/vclassifier/VCLogisticRegression.cpp

@@ -5,12 +5,6 @@
 * @date 08/03/2009
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "vislearning/classifier/vclassifier/VCLogisticRegression.h"

classifier/vclassifier/VCLogisticRegression.h

@@ -8,11 +8,8 @@
 #ifndef VCLogisticRegressionINCLUDE
 #define VCLogisticRegressionINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
   
 #include "vislearning/classifier/classifierbase/VecClassifier.h"
 

classifier/vclassifier/VCNearestNeighbour.cpp

@@ -5,12 +5,6 @@
 * @date 10/25/2007
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 #include <queue>
 

classifier/vclassifier/VCNearestNeighbour.h

@@ -8,11 +8,9 @@
 #ifndef VCNEARESTNEIGHBOURINCLUDE
 #define VCNEARESTNEIGHBOURINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+
 #include <core/vector/Distance.h>
 
 #include "vislearning/cbaselib/LabeledSet.h"

classifier/vclassifier/VCNormalize.cpp

@@ -7,12 +7,6 @@
  * @date 11/28/2007
 
  */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 #include <fstream>
 

classifier/vclassifier/VCNormalize.h

@@ -10,11 +10,9 @@
 #ifndef VCNormalizeINCLUDE
 #define VCNormalizeINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+
 #include "vislearning/math/ftransform/FTransform.h"
 #include "vislearning/classifier/classifierbase/VecClassifier.h"
 

classifier/vclassifier/VCOneVsAll.cpp

@@ -4,12 +4,6 @@
 * @date 10/25/2007
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "vislearning/classifier/vclassifier/VCOneVsAll.h"

classifier/vclassifier/VCOneVsAll.h

@@ -8,7 +8,10 @@
 #ifndef VCOneVsAllINCLUDE
 #define VCOneVsAllINCLUDE
 
-#include <vislearning/nice.h>
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
 
 #include "vislearning/classifier/classifierbase/VecClassifier.h"
 #include "core/basics/triplet.h"

classifier/vclassifier/VCOneVsOne.cpp

@@ -4,12 +4,6 @@
 * @date 10/25/2007
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "core/basics/StringTools.h"

classifier/vclassifier/VCOneVsOne.h

@@ -8,11 +8,8 @@
 #ifndef VCOneVsOneINCLUDE
 #define VCOneVsOneINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include "vislearning/classifier/classifierbase/VecClassifier.h"
 #include "core/basics/triplet.h"

classifier/vclassifier/VCTransform.cpp

@@ -7,12 +7,6 @@
  * @date 11/28/2007
 
  */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 #include <fstream>
 

classifier/vclassifier/VCTransform.h

@@ -10,11 +10,9 @@
 #ifndef VCTransformINCLUDE
 #define VCTransformINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+
 #include "vislearning/math/ftransform/FTransform.h"
 #include "vislearning/classifier/classifierbase/VecClassifier.h"
 

features/fbase/FeatureFactory.cpp

@@ -5,12 +5,6 @@
 * @date 07.09.2007
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "vislearning/features/fbase/FeatureFactory.h"

features/fbase/FeatureFactory.h

@@ -7,11 +7,10 @@
 #ifndef FeatureFactoryINCLUDE
 #define FeatureFactoryINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
 
 #include "core/basics/Config.h"
 #include "vislearning/cbaselib/LabeledSet.h"

features/fpfeatures/ColorHistogramFeature.h

@@ -8,11 +8,8 @@
 #ifndef ColorHistogramFeatureINCLUDE
 #define ColorHistogramFeatureINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
  
 #include "core/basics/Config.h"
 #include "vislearning/cbaselib/Feature.h"

features/fpfeatures/EOHFeature.h

@@ -8,11 +8,8 @@
 #ifndef EOHFeatureINCLUDE
 #define EOHFeatureINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
  
 #include "core/basics/Config.h"
 #include "vislearning/cbaselib/Feature.h"

features/fpfeatures/HOGFeature.cpp

@@ -5,12 +5,6 @@
 * @date 05/07/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
-
 #include <iostream>
 
 #include "HOGFeature.h"

features/fpfeatures/HOGFeature.h

@@ -8,11 +8,8 @@
 #ifndef HOGFeatureINCLUDE
 #define HOGFeatureINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
  
 #include "core/basics/Config.h"
 #include "vislearning/cbaselib/Feature.h"

features/fpfeatures/HaarFeature.cpp

@@ -5,11 +5,6 @@
 * @date 04/21/2008
 
 */
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
 
 #include <iostream>
 

features/fpfeatures/HaarFeature.h

@@ -8,11 +8,8 @@
 #ifndef HAARFEATUREINCLUDE
 #define HAARFEATUREINCLUDE
 
-#ifdef NOVISUAL
-#include <vislearning/nice_nonvis.h>
-#else
-#include <vislearning/nice.h>
-#endif
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
 
 #include "core/basics/Config.h"