cvjena · K4stor · Jun 17, 2014 · Jun 17, 2014
diff --git a/core/algebra/CholeskyRobust.cpp b/core/algebra/CholeskyRobust.cpp
@@ -8,7 +8,7 @@
 #include <iostream>
 
 #include "CholeskyRobust.h"
-#include "core/vector/Algorithms.h"
+#include "../vector/Algorithms.h"
 
 #ifdef NICE_USELIB_CUDACHOLESKY
 #include "cholesky-gpu/niceinterface/CudaCholeskyNICE.h"

diff --git a/core/algebra/CholeskyRobust.h b/core/algebra/CholeskyRobust.h
@@ -8,7 +8,7 @@
 #define _NICE_NICE_CHOLESKYROBUSTINCLUDE
 
 #include <limits>
-#include "core/vector/MatrixT.h"
+#include "../vector/MatrixT.h"
 
 namespace NICE
 {

diff --git a/core/algebra/CholeskyRobustAuto.cpp b/core/algebra/CholeskyRobustAuto.cpp
@@ -7,7 +7,7 @@
 */
 #include <iostream>
 
-#include "core/vector/Algorithms.h"
+#include "../vector/Algorithms.h"
 
 #include "CholeskyRobustAuto.h"
 

diff --git a/core/algebra/CholeskyRobustAuto.h b/core/algebra/CholeskyRobustAuto.h
@@ -8,7 +8,7 @@
 #define _NICE_NICE_CHOLESKYROBUSTAUTOINCLUDE
 
 #include <limits>
-#include "core/vector/MatrixT.h"
+#include "../vector/MatrixT.h"
 
 #include "CholeskyRobust.h"
 

diff --git a/core/algebra/DiagonalMatrixApprox.cpp b/core/algebra/DiagonalMatrixApprox.cpp
@@ -7,12 +7,12 @@
 */
 #include <iostream>
 
-#include <core/optimization/gradientBased/FirstOrderRasmussen.h>
-#include <core/vector/Eigen.h>
+#include "../optimization/gradientBased/FirstOrderRasmussen.h"
+#include "../vector/Eigen.h"
 
 #include "DiagonalMatrixApprox.h"
 
-#include "core/basics/numerictools.h"
+#include "../basics/numerictools.h"
 
 using namespace NICE;
 using namespace std;

diff --git a/core/algebra/DiagonalMatrixApprox.h b/core/algebra/DiagonalMatrixApprox.h
@@ -7,10 +7,10 @@
 #ifndef _NICE_DIAGONALMATRIXAPPROXINCLUDE
 #define _NICE_DIAGONALMATRIXAPPROXINCLUDE
 
-#include <core/vector/MatrixT.h>
-#include <core/vector/VectorT.h>
-#include <core/optimization/gradientBased/OptimizationProblemFirst.h>
-#include <core/optimization/gradientBased/OptimizationAlgorithmFirst.h>
+#include "../vector/MatrixT.h"
+#include "../vector/VectorT.h"
+#include "../optimization/gradientBased/OptimizationProblemFirst.h"
+#include "../optimization/gradientBased/OptimizationAlgorithmFirst.h"
 
 namespace NICE {
 

diff --git a/core/algebra/GBCDSolver.cpp b/core/algebra/GBCDSolver.cpp
@@ -7,7 +7,7 @@
 */
 #include <iostream>
 
-#include <core/basics/Timer.h>
+#include "../basics/Timer.h"
 #include "GBCDSolver.h"
 
 using namespace NICE;

diff --git a/core/algebra/GMStandard.cpp b/core/algebra/GMStandard.cpp
@@ -1,4 +1,4 @@
-#include <core/basics/Exception.h>
+#include "../basics/Exception.h"
 
 #include "GMStandard.h"
 

diff --git a/core/algebra/GenericMatrix.h b/core/algebra/GenericMatrix.h
@@ -8,8 +8,8 @@
 #ifndef GENERICMATRIXINCLUDE
 #define GENERICMATRIXINCLUDE
 
-#include "core/basics/triplet.h"
-#include "core/vector/SparseVectorT.h"
+#include "../basics/triplet.h"
+#include "../vector/SparseVectorT.h"
 
 
 namespace NICE

diff --git a/core/algebra/ILSConjugateGradients.cpp b/core/algebra/ILSConjugateGradients.cpp
@@ -7,7 +7,7 @@
 */
 #include <iostream>
 
-#include <core/basics/Timer.h>
+#include "../basics/Timer.h"
 #include "ILSConjugateGradients.h"
 
 using namespace NICE;

diff --git a/core/algebra/ILSConjugateGradients.h b/core/algebra/ILSConjugateGradients.h
@@ -7,7 +7,7 @@
 #ifndef _NICE_ILSConjugateGradients_INCLUDE
 #define _NICE_ILSConjugateGradients_INCLUDE
 
-#include "core/vector/VectorT.h"
+#include "../vector/VectorT.h"
 #include "GenericMatrix.h"
 #include "IterativeLinearSolver.h"
 

diff --git a/core/algebra/ILSConjugateGradientsLanczos.h b/core/algebra/ILSConjugateGradientsLanczos.h
@@ -7,7 +7,7 @@
 #ifndef _NICE_ILSConjugateGradientsLanczos_INCLUDE
 #define _NICE_ILSConjugateGradientsLanczos_INCLUDE
 
-#include "core/vector/VectorT.h"
+#include "../vector/VectorT.h"
 #include "GenericMatrix.h"
 #include "IterativeLinearSolver.h"
 #include "EigValues.h"

diff --git a/core/algebra/ILSMinResLanczos.h b/core/algebra/ILSMinResLanczos.h
@@ -7,7 +7,7 @@
 #ifndef _NICE_ILSMinResLanczos_INCLUDE
 #define _NICE_ILSMinResLanczos_INCLUDE
 
-#include "core/vector/VectorT.h"
+#include "../vector/VectorT.h"
 #include "GenericMatrix.h"
 #include "IterativeLinearSolver.h"
 #include "EigValues.h"

diff --git a/core/algebra/ILSPlainGradient.cpp b/core/algebra/ILSPlainGradient.cpp
@@ -7,8 +7,8 @@
 */
 #include <iostream>
 
-#include "core/optimization/gradientBased/FirstOrderRasmussen.h"
-#include "core/optimization/gradientBased/FirstOrderTrustRegion.h"
+#include "../optimization/gradientBased/FirstOrderRasmussen.h"
+#include "../optimization/gradientBased/FirstOrderTrustRegion.h"
 #include "ILSPlainGradient.h"
 
 using namespace NICE;

diff --git a/core/algebra/ILSPlainGradient.h b/core/algebra/ILSPlainGradient.h
@@ -7,9 +7,9 @@
 #ifndef _NICE_ILSPlainGradient_INCLUDE
 #define _NICE_ILSPlainGradient_INCLUDE
 
-#include "core/vector/VectorT.h"
-#include "core/optimization/gradientBased/OptimizationProblemFirst.h"
-#include "core/optimization/gradientBased/OptimizationAlgorithmFirst.h"
+#include "../vector/VectorT.h"
+#include "../optimization/gradientBased/OptimizationProblemFirst.h"
+#include "../optimization/gradientBased/OptimizationAlgorithmFirst.h"
 
 #include "IterativeLinearSolver.h"
 

diff --git a/core/algebra/ILSSymmLqLanczos.h b/core/algebra/ILSSymmLqLanczos.h
@@ -7,7 +7,7 @@
 #ifndef _NICE_ILSSymmLqLanczos_INCLUDE
 #define _NICE_ILSSymmLqLanczos_INCLUDE
 
-#include "core/vector/VectorT.h"
+#include "../vector/VectorT.h"
 #include "GenericMatrix.h"
 #include "IterativeLinearSolver.h"
 #include "EigValues.h"

diff --git a/core/algebra/IterativeLinearSolver.h b/core/algebra/IterativeLinearSolver.h
@@ -7,7 +7,7 @@
 #ifndef _NICE_ITERATIVELINEARSOLVERINCLUDE
 #define _NICE_ITERATIVELINEARSOLVERINCLUDE
 
-#include "core/vector/VectorT.h"
+#include "../vector/VectorT.h"
 #include "GenericMatrix.h"
 
 namespace NICE {

diff --git a/core/algebra/LUDecomposition.h b/core/algebra/LUDecomposition.h
@@ -10,8 +10,8 @@
 #ifndef _NICE_LUDECOMPOSITION_
 #define _NICE_LUDECOMPOSITION_
 
-#include "core/vector/MatrixT.h"
-#include "core/vector/VectorT.h"
+#include "../vector/MatrixT.h"
+#include "../vector/VectorT.h"
 #include "MatrixDecomposition.h"
 
 namespace NICE

diff --git a/core/basics/BinStreamable.cpp b/core/basics/BinStreamable.cpp
@@ -4,12 +4,12 @@
  * See file License for license information.
  */
 /*****************************************************************************/
-#include "core/basics/BinStreamable.h"
+#include "BinStreamable.h"
 #include <stdexcept>
 #include <fstream>
-#include <core/basics/gzbinstream.h>
+#include "../basics/gzbinstream.h"
 
-#include "core/basics/Exception.h"
+#include "../basics/Exception.h"
 
 namespace NICE {
 

diff --git a/core/basics/BinStreamable.h b/core/basics/BinStreamable.h
@@ -9,7 +9,7 @@
 
 #include <iostream>
 
-#include <core/basics/binstream.h>
+#include "../basics/binstream.h"
 
 namespace NICE {
 

diff --git a/core/basics/Config.cpp b/core/basics/Config.cpp
@@ -3,11 +3,11 @@
 #include <fstream>
 
 // nice-core includes
-#include "core/basics/Exception.h"
-#include "core/basics/Config.h"
-#include "core/basics/ossettings.h"
-#include "core/basics/StringTools.h"
-#include "core/basics/FileName.h"
+#include "Exception.h"
+#include "Config.h"
+#include "ossettings.h"
+#include "StringTools.h"
+#include "FileName.h"
 
 using namespace NICE;
 

diff --git a/core/basics/Config.h b/core/basics/Config.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "StructuredMap.h"
-#include "core/basics/Persistent.h"
+#include "Persistent.h"
 
 namespace NICE {
 

diff --git a/core/basics/Exception.cpp b/core/basics/Exception.cpp
@@ -3,7 +3,7 @@
  *  - libfbasics - library of some basic tools
  * See file License for license information.
  */
-#include "core/basics/Exception.h"
+#include "Exception.h"
 #include <sstream>
 #include <iostream>
 

diff --git a/core/basics/FileName.cpp b/core/basics/FileName.cpp
@@ -1,4 +1,4 @@
-#include "core/basics/FileName.h"
+#include "FileName.h"
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/core/basics/FrameRateCounter.cpp b/core/basics/FrameRateCounter.cpp
@@ -3,7 +3,7 @@
  *  - libfbasics - library of some basic tools
  * See file License for license information.
  */
-#include "core/basics/FrameRateCounter.h"
+#include "FrameRateCounter.h"
 
 namespace NICE {
 

diff --git a/core/basics/FrameRateCounter.h b/core/basics/FrameRateCounter.h
@@ -8,7 +8,7 @@
 
 
 #include <string>
-#include <core/basics/Timer.h>
+#include "Timer.h"
 
 namespace NICE {
 

diff --git a/core/basics/Observable.cpp b/core/basics/Observable.cpp
@@ -1,4 +1,4 @@
-#include "core/basics/Observable.h"
+#include "Observable.h"
 
 namespace NICE {
 

diff --git a/core/basics/Observable.h b/core/basics/Observable.h
@@ -2,7 +2,7 @@
 #define _OBSERVABLE_FBASICS_H
 
 #include <vector>
-#include <core/basics/Observer.h>
+#include "Observer.h"
 
 namespace NICE {
 

diff --git a/core/basics/Observer.cpp b/core/basics/Observer.cpp
@@ -1,4 +1,4 @@
-#include "core/basics/Observer.h"
+#include "Observer.h"
 
 namespace NICE {
 

diff --git a/core/basics/Observer.h b/core/basics/Observer.h
@@ -38,6 +38,6 @@ class Observer {
 
 } // namespace
 
-#include <core/basics/Observable.h>
+#include "Observable.h"
 
 #endif // _OBSERVER_FBASICS_H
diff --git a/core/basics/Persistent.h b/core/basics/Persistent.h
@@ -7,7 +7,7 @@
 #include <fstream>
 #include <algorithm>
 
-#include "core/basics/Exception.h"
+#include "Exception.h"
 
 namespace NICE {
 

diff --git a/core/basics/ResourceStatistics.h b/core/basics/ResourceStatistics.h
@@ -14,7 +14,7 @@
 #include <sys/resource.h>
 #endif
 
-#include <core/basics/Exception.h>
+#include "Exception.h"
 
 namespace NICE {
 

diff --git a/core/basics/Streamable.cpp b/core/basics/Streamable.cpp
@@ -4,14 +4,14 @@
  * See file License for license information.
  */
 /*****************************************************************************/
-#include "core/basics/Streamable.h"
+#include "Streamable.h"
 #include <stdexcept>
 #include <fstream>
 #include <sstream>
-#include <core/basics/gzstream.h>
-#include <core/basics/bzstream.h>
+#include "gzstream.h"
+#include "bzstream.h"
 
-#include "core/basics/Exception.h"
+#include "Exception.h"
 
 namespace NICE {
 

diff --git a/core/basics/StringTools.h b/core/basics/StringTools.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <sstream>
 
-#include <core/vector/VectorT.h>
+#include "../vector/VectorT.h"
 
 namespace NICE
 {

diff --git a/core/basics/StructuredMap.h b/core/basics/StructuredMap.h
@@ -18,7 +18,7 @@
 
 #include <math.h>
 
-#include "core/basics/Persistent.h"
+#include "Persistent.h"
 
 
 

diff --git a/core/basics/Timer.cpp b/core/basics/Timer.cpp
@@ -3,8 +3,8 @@
  *  - libfbasics - library of some basic tools
  * See file License for license information.
  */
-#include "core/basics/Timer.h"
-#include <core/basics/Exception.h>
+#include "Timer.h"
+#include "Exception.h"
 #include <limits>
 
 #ifdef WIN32

diff --git a/core/basics/Timer.h b/core/basics/Timer.h
@@ -23,7 +23,7 @@
  #endif
 #endif
 #include <string>
-#include <core/basics/Log.h>
+#include "Log.h"
 
 namespace NICE {
 

diff --git a/core/basics/binstream.h b/core/basics/binstream.h
@@ -33,7 +33,7 @@
 #include <iostream>
 #include <fstream>
 #include <vector>
-#include <core/basics/types.h>
+#include "types.h"
 #include <string.h>
 #include "CrossplatformDefines.h"
 #ifdef NICE_USELIB_LINAL

diff --git a/core/basics/bzstream.cpp b/core/basics/bzstream.cpp
@@ -26,7 +26,7 @@
 // Standard C++ Library".
 // ============================================================================
 
-#include <core/basics/bzstream.h>
+#include "bzstream.h"
 #include "CrossplatformDefines.h"
 
 #ifdef NICE_USELIB_BZLIB

diff --git a/core/basics/gzbinstream.h b/core/basics/gzbinstream.h
@@ -29,7 +29,7 @@
 // ============================================================================
 
 
-#include "core/basics/binstream.h"
+#include "../basics/binstream.h"
 // standard C++ with new header file names and std:: namespace
 #ifdef NICE_USELIB_ZLIB
 #ifdef NICE_USELIB_LINAL
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,7 +18,7 @@

		#include <math.h>

		#include "core/basics/Persistent.h"
		#include "Persistent.h"



Expand Down