replaced include nice.h -- done

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/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;

features/fbase/FeatureFactory.h

@@ -9,6 +9,8 @@
 
 #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/localfeatures/LFColorWeijer.h

@@ -10,6 +10,7 @@
 #include "core/vector/VectorT.h"
 #include "core/vector/MatrixT.h"
 #include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
 
 #include "LocalFeature.h"
 #include "core/basics/Config.h"

features/localfeatures/LFColorWeijer.h~

@@ -7,7 +7,9 @@
 #ifndef LFColorWeijerINCLUDE
 #define LFColorWeijerINCLUDE
 
-#include <vislearning/nice.h>
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
 
 #include "LocalFeature.h"
 #include "core/basics/Config.h"

features/localfeatures/LFReadCache.h

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

features/localfeatures/LFSiftPP.cpp

@@ -8,9 +8,9 @@
 #include <iostream>
 #include <sstream>
 
-#ifdef NICE_USELIB_ICE
-  #include <image_nonvis.h>
-#endif
+// #ifdef NICE_USELIB_ICE
+//   #include <image_nonvis.h>
+// #endif
 #include "vislearning/features/localfeatures/LFSiftPP.h"
 
 
@@ -196,48 +196,49 @@ void LFSiftPP::visualizeFeatures ( NICE::Image & mark,
 				 const VVector & positions,
 				 size_t color ) const
 {
-#ifdef NICE_USELIB_ICE
-    ice::Image mark_ice = ice::NewImg ( mark.width(), 
-	mark.height(), 255 );
-    for ( size_t k = 0 ; k < positions.size() ; k++ )
-    {
-		const NICE::Vector & pos = positions[k];
-		ice::Matrix points ( 0, 2 );
-		const int size = 6;
-		points.Append ( ice::Vector(-size, -size) );
-		points.Append ( ice::Vector(-size, size) );
-		points.Append ( ice::Vector(size, size) );
-		points.Append ( ice::Vector(size, -size) );
-
-		ice::Trafo tr;
-
-		tr.Scale ( 0, 0, pos[2] );
-		tr.Rotate ( 0, 0, pos[3] );
-		tr.Shift ( pos[0], pos[1] );
-
-		ice::TransformList(tr, points);
-
-		for ( int j = 0 ; j < points.rows(); j++ )
-		{
-			if (points[j][0] < 0 ) 
-			points[j][0] = 0;
-			if (points[j][0] >= mark_ice->xsize) 
-			points[j][0] = mark_ice->xsize - 1;
-			if (points[j][1] < 0 ) 
-			points[j][1] = 0;
-			if (points[j][1] >= mark_ice->ysize) 
-			points[j][1] = mark_ice->ysize - 1;
-		}
-
-		ice::DrawPolygon ( points, color, mark_ice );
-    }
-
-    for ( unsigned int y = 0 ; y < mark.height(); y++ )
-		for ( unsigned int x = 0 ; x < mark.width(); x++ )
-			mark.setPixel(x,y, GetVal(mark_ice,x,y));
-#else
-			cerr << "uses ice visualization, please install ice or change to NICE visualization" << endl;
-#endif
+// #ifdef NICE_USELIB_ICE
+//     ice::Image mark_ice = ice::NewImg ( mark.width(), 
+// 	mark.height(), 255 );
+//     for ( size_t k = 0 ; k < positions.size() ; k++ )
+//     {
+// 		const NICE::Vector & pos = positions[k];
+// 		ice::Matrix points ( 0, 2 );
+// 		const int size = 6;
+// 		points.Append ( ice::Vector(-size, -size) );
+// 		points.Append ( ice::Vector(-size, size) );
+// 		points.Append ( ice::Vector(size, size) );
+// 		points.Append ( ice::Vector(size, -size) );
+// 
+// 		ice::Trafo tr;
+// 
+// 		tr.Scale ( 0, 0, pos[2] );
+// 		tr.Rotate ( 0, 0, pos[3] );
+// 		tr.Shift ( pos[0], pos[1] );
+// 
+// 		ice::TransformList(tr, points);
+// 
+// 		for ( int j = 0 ; j < points.rows(); j++ )
+// 		{
+// 			if (points[j][0] < 0 ) 
+// 			points[j][0] = 0;
+// 			if (points[j][0] >= mark_ice->xsize) 
+// 			points[j][0] = mark_ice->xsize - 1;
+// 			if (points[j][1] < 0 ) 
+// 			points[j][1] = 0;
+// 			if (points[j][1] >= mark_ice->ysize) 
+// 			points[j][1] = mark_ice->ysize - 1;
+// 		}
+// 
+// 		ice::DrawPolygon ( points, color, mark_ice );
+//     }
+// 
+//     for ( unsigned int y = 0 ; y < mark.height(); y++ )
+// 		for ( unsigned int x = 0 ; x < mark.width(); x++ )
+// 			mark.setPixel(x,y, GetVal(mark_ice,x,y));
+// #else
+// 			cerr << "uses ice visualization, please install ice or change to NICE visualization" << endl;
+// #endif
+//TODO check this!
 }
 
 

features/localfeatures/LFSiftPP.h

@@ -11,6 +11,7 @@
 #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 "LocalFeatureRepresentation.h"

features/localfeatures/LocalFeatureSift.cpp

@@ -4,9 +4,9 @@
 * @author Erik Rodner
 * @date 02/05/2008
 */
-#ifdef NICE_USELIB_ICE
-  #include <image_nonvis.h>
-#endif
+// #ifdef NICE_USELIB_ICE
+//   #include <image_nonvis.h>
+// #endif
 #include <iostream>
 
 #include "vislearning/features/localfeatures/sift.h"
@@ -171,46 +171,47 @@ void LocalFeatureSift::visualizeFeatures ( NICE::Image & mark,
 				 const VVector & positions,
 				 size_t color ) const
 {
-#ifdef NICE_USELIB_ICE
-    ice::Image mark_ice = ice::NewImg ( mark.width(), 
-	mark.height(), 255 );
-    for ( size_t k = 0 ; k < positions.size() ; k++ )
-    {
-		const NICE::Vector & pos = positions[k];
-		ice::Matrix points ( 0, 2 );
-		const int size = 6;
-		points.Append ( ice::Vector(-size, -size) );
-		points.Append ( ice::Vector(-size, size) );
-		points.Append ( ice::Vector(size, size) );
-		points.Append ( ice::Vector(size, -size) );
-
-		ice::Trafo tr;
-
-		tr.Scale ( 0, 0, pos[2] );
-		tr.Rotate ( 0, 0, pos[3] );
-		tr.Shift ( pos[0], pos[1] );
-
-		ice::TransformList(tr, points);
-
-		for ( int j = 0 ; j < points.rows(); j++ )
-		{
-			if (points[j][0] < 0 ) 
-			points[j][0] = 0;
-			if (points[j][0] >= mark_ice->xsize) 
-			points[j][0] = mark_ice->xsize - 1;
-			if (points[j][1] < 0 ) 
-			points[j][1] = 0;
-			if (points[j][1] >= mark_ice->ysize) 
-			points[j][1] = mark_ice->ysize - 1;
-		}
-		ice::DrawPolygon ( points, color, mark_ice );
-    }
-
-    for ( unsigned int y = 0 ; y < mark.height(); y++ )
-		for ( unsigned int x = 0 ; x < mark.width(); x++ )
-			mark.setPixel(x,y, GetVal(mark_ice,x,y));
-#else
-	cerr << "uses ice visualization, please install ice or change to NICE visualization" << endl;
-#endif
+// #ifdef NICE_USELIB_ICE
+//     ice::Image mark_ice = ice::NewImg ( mark.width(), 
+// 	mark.height(), 255 );
+//     for ( size_t k = 0 ; k < positions.size() ; k++ )
+//     {
+// 		const NICE::Vector & pos = positions[k];
+// 		ice::Matrix points ( 0, 2 );
+// 		const int size = 6;
+// 		points.Append ( ice::Vector(-size, -size) );
+// 		points.Append ( ice::Vector(-size, size) );
+// 		points.Append ( ice::Vector(size, size) );
+// 		points.Append ( ice::Vector(size, -size) );
+// 
+// 		ice::Trafo tr;
+// 
+// 		tr.Scale ( 0, 0, pos[2] );
+// 		tr.Rotate ( 0, 0, pos[3] );
+// 		tr.Shift ( pos[0], pos[1] );
+// 
+// 		ice::TransformList(tr, points);
+// 
+// 		for ( int j = 0 ; j < points.rows(); j++ )
+// 		{
+// 			if (points[j][0] < 0 ) 
+// 			points[j][0] = 0;
+// 			if (points[j][0] >= mark_ice->xsize) 
+// 			points[j][0] = mark_ice->xsize - 1;
+// 			if (points[j][1] < 0 ) 
+// 			points[j][1] = 0;
+// 			if (points[j][1] >= mark_ice->ysize) 
+// 			points[j][1] = mark_ice->ysize - 1;
+// 		}
+// 		ice::DrawPolygon ( points, color, mark_ice );
+//     }
+// 
+//     for ( unsigned int y = 0 ; y < mark.height(); y++ )
+// 		for ( unsigned int x = 0 ; x < mark.width(); x++ )
+// 			mark.setPixel(x,y, GetVal(mark_ice,x,y));
+// #else
+// 	cerr << "uses ice visualization, please install ice or change to NICE visualization" << endl;
+// #endif
+//TODO check this!
 }
 

features/localfeatures/LocalFeatureSift.h

@@ -11,6 +11,7 @@
 #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 "LocalFeature.h"

features/localfeatures/progs/testColorWeijer.cpp

@@ -1,5 +1,8 @@
 #include <fstream>
-#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 <iostream>
 #include "vislearning/features/localfeatures/LFColorWeijer.h"
 

math/cluster/progs/compareGMM.cpp

@@ -8,7 +8,10 @@
 #endif
 
 #include <fstream>
-#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 <iostream>
 #include <core/image/CrossT.h>
 #include "vislearning/math/cluster/GMM.h"

math/cluster/progs/testKMeans.cpp

@@ -4,7 +4,10 @@ int main(int argc, char **argv) {};
 
 #else
 
-#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 <iostream>
 
 #include <core/image/CrossT.h>

math/progs/testEigenvalues.cpp

@@ -7,7 +7,10 @@
 */
 
 
-#include <vislearning/nice.h>
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
 
 #ifdef NICE_USELIB_ICE
 

math/progs/testPLSA.cpp

@@ -5,7 +5,10 @@
 * @date 05/21/2008
 
 */
-#include <vislearning/nice.h>
+#include "core/vector/VectorT.h"
+#include "core/vector/MatrixT.h"
+#include "core/image/ImageT.h"
+#include "core/imagedisplay/ImageDisplay.h"
 
 #ifdef NICE_USELIB_ICE
 

optimization/mapestimation/progs/testDirichlet.cpp

@@ -10,7 +10,10 @@
     int main (int argc, char **argv) {};
 #else
 
-#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 <core/vector/Distance.h>
 #include <core/image/CrossT.h>