From cfee43b706f470dec95d4f367b7f9f1f11ac92a5 Mon Sep 17 00:00:00 2001 From: Kastor Date: Tue, 17 Jun 2014 17:08:42 +0200 Subject: [PATCH 1/2] Cleaned up include paths for many modules. All path are set to relative path to be more robust. --- core/algebra/CholeskyRobust.cpp | 2 +- core/algebra/CholeskyRobust.h | 2 +- core/algebra/CholeskyRobustAuto.cpp | 2 +- core/algebra/CholeskyRobustAuto.h | 2 +- core/algebra/DiagonalMatrixApprox.cpp | 6 ++--- core/algebra/DiagonalMatrixApprox.h | 8 +++---- core/algebra/GBCDSolver.cpp | 2 +- core/algebra/GMStandard.cpp | 2 +- core/algebra/GenericMatrix.h | 4 ++-- core/algebra/ILSConjugateGradients.cpp | 2 +- core/algebra/ILSConjugateGradients.h | 2 +- core/algebra/ILSConjugateGradientsLanczos.h | 2 +- core/algebra/ILSMinResLanczos.h | 2 +- core/algebra/ILSPlainGradient.cpp | 4 ++-- core/algebra/ILSPlainGradient.h | 6 ++--- core/algebra/ILSSymmLqLanczos.h | 2 +- core/algebra/IterativeLinearSolver.h | 2 +- core/algebra/LUDecomposition.h | 4 ++-- core/basics/BinStreamable.cpp | 6 ++--- core/basics/BinStreamable.h | 2 +- core/basics/Config.cpp | 10 ++++---- core/basics/Config.h | 2 +- core/basics/Exception.cpp | 2 +- core/basics/FileName.cpp | 2 +- core/basics/FrameRateCounter.cpp | 2 +- core/basics/FrameRateCounter.h | 2 +- core/basics/Observable.cpp | 2 +- core/basics/Observable.h | 2 +- core/basics/Observer.cpp | 2 +- core/basics/Observer.h | 2 +- core/basics/Persistent.h | 2 +- core/basics/ResourceStatistics.h | 2 +- core/basics/Streamable.cpp | 8 +++---- core/basics/StringTools.cpp | 2 ++ core/basics/StringTools.h | 2 +- core/basics/StructuredMap.h | 2 +- core/basics/Timer.cpp | 4 ++-- core/basics/Timer.h | 2 +- core/basics/binstream.h | 2 +- core/basics/bzstream.cpp | 2 +- core/basics/gzbinstream.h | 2 +- core/basics/gzstream.cpp | 2 +- core/basics/numerictools.cpp | 10 ++++---- core/basics/stringutils.cpp | 4 ++-- core/basics/tools.cpp | 2 +- core/basics/tools.h | 2 +- core/basics/vectorio.h | 2 +- core/basics/vectorio.tcc | 4 ++-- core/image/BlockImageAccessT.h | 8 +++---- core/image/BlockImageAccessT.tcc | 2 +- core/image/Buffer.h | 10 ++++---- core/image/ColorImageAccess.cpp | 2 +- core/image/ColorImageAccess.h | 2 +- core/image/ColorImageT.cpp | 2 +- core/image/ColorImageT.h | 20 ++++++++-------- core/image/ColorImageT.tcc | 8 +++---- core/image/ColorT.h | 6 ++--- core/image/ColorT.tcc | 2 +- core/image/Convert.cpp | 2 +- core/image/Convert.h | 16 ++++++------- core/image/Convert.tcc | 6 ++--- core/image/CoordT.h | 2 +- core/image/DeprecatedConverter.cpp | 6 ++--- core/image/DeprecatedConverter.h | 19 ++++++++------- core/image/DeprecatedConverter.tcc | 2 +- core/image/Drawable.h | 8 +++---- core/image/Filter.cpp | 4 ++-- core/image/Filter.h | 18 +++++++-------- core/image/FilterT.cpp | 2 +- core/image/FilterT.h | 18 +++++++-------- core/image/FilterT.tcc | 2 +- core/image/Fourier.h | 2 +- core/image/GHough.cpp | 2 +- core/image/GHough.h | 2 +- core/image/GaussPyramid.cpp | 2 +- core/image/GaussPyramid.h | 4 ++-- .../GrayColorImageCommonImplementation.cpp | 2 +- .../GrayColorImageCommonImplementation.h | 2 +- .../GrayColorImageCommonImplementationT.h | 12 +++++----- .../GrayColorImageCommonImplementationT.tcc | 4 ++-- core/image/Histogram.cpp | 2 +- core/image/Histogram.h | 10 ++++---- core/image/ImageAccess.cpp | 4 ++-- core/image/ImageAccess.h | 2 +- core/image/ImageAccessT.h | 4 ++-- core/image/ImageAccessT.tcc | 2 +- core/image/ImageException.h | 2 +- core/image/ImageFile.cpp | 4 ++-- core/image/ImageFile.h | 6 ++--- core/image/ImageFile.tcc | 10 ++++---- core/image/ImageFileListReader.cpp | 6 ++--- core/image/ImageFileListReader.h | 4 ++-- core/image/ImageFileListWriter.cpp | 6 ++--- core/image/ImageFileListWriter.h | 2 +- core/image/ImageInputStream.cpp | 4 ++-- core/image/ImageInputStream.h | 2 +- core/image/ImageOperators.h | 10 ++++---- core/image/ImageOutputStream.h | 2 +- core/image/ImageT.cpp | 6 ++--- core/image/ImageT.h | 18 +++++++-------- core/image/ImageT.tcc | 4 ++-- core/image/ImageTools.cpp | 2 +- core/image/ImageTools.h | 23 +++++++++---------- core/image/ImageTools.tcc | 4 ++-- core/image/Morph.cpp | 4 ++-- core/image/Morph.h | 18 +++++++-------- core/image/MultiChannelImage3DT.cpp | 2 +- core/image/MultiChannelImage3DT.h | 10 ++++---- core/image/MultiChannelImageT.cpp | 2 +- core/image/MultiChannelImageT.h | 6 ++--- core/image/RectT.h | 8 +++---- core/image/RectT.tcc | 2 +- core/image/ippwrapper.h | 2 +- core/image/pointerArithmetic.h | 4 ++-- core/optimization/blackbox/CostFunction.cpp | 2 +- core/optimization/blackbox/CostFunction.h | 4 ++-- .../blackbox/Definitions_core_opt.h | 2 +- .../blackbox/DimWrapperCostFunction.h | 4 ++-- .../blackbox/DownhillSimplexOptimizer.cpp | 4 ++-- .../blackbox/DownhillSimplexOptimizer.h | 2 +- core/optimization/blackbox/OptLogBase.cpp | 2 +- core/optimization/blackbox/OptLogBase.h | 2 +- core/optimization/blackbox/Optimizable.cpp | 2 +- core/optimization/blackbox/Optimizable.h | 2 +- core/optimization/blackbox/Optimizer.cpp | 2 +- core/optimization/blackbox/Optimizer.h | 6 ++--- .../blackbox/SimpleOptProblem.cpp | 2 +- core/optimization/blackbox/SimpleOptProblem.h | 6 ++--- .../optimization/blackbox/SimpleOptimizer.cpp | 2 +- core/optimization/blackbox/SimpleOptimizer.h | 6 ++--- .../gradientBased/FirstOrderRasmussen.cpp | 2 +- .../gradientBased/FirstOrderRasmussen.h | 4 ++-- .../gradientBased/FirstOrderTrustRegion.cpp | 4 ++-- .../gradientBased/FirstOrderTrustRegion.h | 6 ++--- .../OptimizationAlgorithmFirst.cpp | 2 +- .../OptimizationAlgorithmFirst.h | 6 ++--- .../OptimizationAlgorithmSecond.cpp | 2 +- .../OptimizationAlgorithmSecond.h | 4 ++-- .../OptimizationProblemFirst.cpp | 4 ++-- .../gradientBased/OptimizationProblemFirst.h | 4 ++-- .../OptimizationProblemSecond.cpp | 2 +- .../gradientBased/OptimizationProblemSecond.h | 4 ++-- .../gradientBased/SecondOrderTrustRegion.cpp | 6 ++--- .../gradientBased/SecondOrderTrustRegion.h | 6 ++--- .../gradientBased/TrustRegionBase.cpp | 4 ++-- .../gradientBased/TrustRegionBase.h | 4 ++-- core/vector/Algorithms.h | 10 ++++---- core/vector/Algorithms.tcc | 6 ++--- core/vector/Distance.cpp | 2 +- core/vector/Distance.h | 6 ++--- core/vector/Eigen.h | 10 ++++---- core/vector/Eigen.tcc | 2 +- core/vector/MatrixT.h | 10 ++++---- core/vector/MatrixT.tcc | 6 ++--- core/vector/RowMatrixT.h | 8 +++---- core/vector/RowMatrixT.tcc | 6 ++--- core/vector/SVD.h | 6 ++--- core/vector/SparseVectorT.h | 6 ++--- core/vector/SparseVectorT.tcc | 2 +- core/vector/VVector.h | 2 +- core/vector/VectorT.h | 12 +++++----- core/vector/VectorT.tcc | 8 +++---- core/vector/ippwrapper.cpp | 2 +- core/vector/ippwrapper.h | 2 +- core/vector/ippwrapper.tcc | 4 ++-- 165 files changed, 384 insertions(+), 384 deletions(-) diff --git a/core/algebra/CholeskyRobust.cpp b/core/algebra/CholeskyRobust.cpp index e72edc9..e04c2c3 100644 --- a/core/algebra/CholeskyRobust.cpp +++ b/core/algebra/CholeskyRobust.cpp @@ -8,7 +8,7 @@ #include #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 index 98b706f..d3b005b 100644 --- a/core/algebra/CholeskyRobust.h +++ b/core/algebra/CholeskyRobust.h @@ -8,7 +8,7 @@ #define _NICE_NICE_CHOLESKYROBUSTINCLUDE #include -#include "core/vector/MatrixT.h" +#include "../vector/MatrixT.h" namespace NICE { diff --git a/core/algebra/CholeskyRobustAuto.cpp b/core/algebra/CholeskyRobustAuto.cpp index cffcceb..8d795ff 100644 --- a/core/algebra/CholeskyRobustAuto.cpp +++ b/core/algebra/CholeskyRobustAuto.cpp @@ -7,7 +7,7 @@ */ #include -#include "core/vector/Algorithms.h" +#include "../vector/Algorithms.h" #include "CholeskyRobustAuto.h" diff --git a/core/algebra/CholeskyRobustAuto.h b/core/algebra/CholeskyRobustAuto.h index 5e0d7d7..9c470ea 100644 --- a/core/algebra/CholeskyRobustAuto.h +++ b/core/algebra/CholeskyRobustAuto.h @@ -8,7 +8,7 @@ #define _NICE_NICE_CHOLESKYROBUSTAUTOINCLUDE #include -#include "core/vector/MatrixT.h" +#include "../vector/MatrixT.h" #include "CholeskyRobust.h" diff --git a/core/algebra/DiagonalMatrixApprox.cpp b/core/algebra/DiagonalMatrixApprox.cpp index 2958fce..3d41d6f 100644 --- a/core/algebra/DiagonalMatrixApprox.cpp +++ b/core/algebra/DiagonalMatrixApprox.cpp @@ -7,12 +7,12 @@ */ #include -#include -#include +#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 index bb2ebf6..c121a04 100644 --- a/core/algebra/DiagonalMatrixApprox.h +++ b/core/algebra/DiagonalMatrixApprox.h @@ -7,10 +7,10 @@ #ifndef _NICE_DIAGONALMATRIXAPPROXINCLUDE #define _NICE_DIAGONALMATRIXAPPROXINCLUDE -#include -#include -#include -#include +#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 index 465ca96..4da0ef2 100644 --- a/core/algebra/GBCDSolver.cpp +++ b/core/algebra/GBCDSolver.cpp @@ -7,7 +7,7 @@ */ #include -#include +#include "../basics/Timer.h" #include "GBCDSolver.h" using namespace NICE; diff --git a/core/algebra/GMStandard.cpp b/core/algebra/GMStandard.cpp index 057d838..1ecd872 100644 --- a/core/algebra/GMStandard.cpp +++ b/core/algebra/GMStandard.cpp @@ -1,4 +1,4 @@ -#include +#include "../basics/Exception.h" #include "GMStandard.h" diff --git a/core/algebra/GenericMatrix.h b/core/algebra/GenericMatrix.h index 93317d5..9f6a55f 100644 --- 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 index 956868f..30735d9 100644 --- a/core/algebra/ILSConjugateGradients.cpp +++ b/core/algebra/ILSConjugateGradients.cpp @@ -7,7 +7,7 @@ */ #include -#include +#include "../basics/Timer.h" #include "ILSConjugateGradients.h" using namespace NICE; diff --git a/core/algebra/ILSConjugateGradients.h b/core/algebra/ILSConjugateGradients.h index f952329..27cd5f6 100644 --- 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 index e9351cd..9cc77f8 100644 --- 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 index ed8569b..4c2b9f1 100644 --- 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 index fb096df..060a3a6 100644 --- a/core/algebra/ILSPlainGradient.cpp +++ b/core/algebra/ILSPlainGradient.cpp @@ -7,8 +7,8 @@ */ #include -#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 index 349fb0b..5d8a379 100644 --- 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 index b66e2b8..38d5076 100644 --- 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 index 4a8476b..6219d99 100644 --- 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 index 41b18e6..ae7279a 100644 --- 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 index 184a068..e00d64c 100644 --- 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 #include -#include +#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 index 8fd5627..2d5f9fd 100644 --- a/core/basics/BinStreamable.h +++ b/core/basics/BinStreamable.h @@ -9,7 +9,7 @@ #include -#include +#include "../basics/binstream.h" namespace NICE { diff --git a/core/basics/Config.cpp b/core/basics/Config.cpp index b77ed54..07a8936 100644 --- a/core/basics/Config.cpp +++ b/core/basics/Config.cpp @@ -3,11 +3,11 @@ #include // 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 index a0da5bf..614757f 100644 --- a/core/basics/Config.h +++ b/core/basics/Config.h @@ -15,7 +15,7 @@ #include #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 index b7576dd..6f9c225 100644 --- 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 #include diff --git a/core/basics/FileName.cpp b/core/basics/FileName.cpp index 999d0e0..327b46a 100644 --- a/core/basics/FileName.cpp +++ b/core/basics/FileName.cpp @@ -1,4 +1,4 @@ -#include "core/basics/FileName.h" +#include "FileName.h" #include #include #include diff --git a/core/basics/FrameRateCounter.cpp b/core/basics/FrameRateCounter.cpp index bcd9131..997f497 100644 --- 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 index 8f7087f..bda739c 100644 --- a/core/basics/FrameRateCounter.h +++ b/core/basics/FrameRateCounter.h @@ -8,7 +8,7 @@ #include -#include +#include "Timer.h" namespace NICE { diff --git a/core/basics/Observable.cpp b/core/basics/Observable.cpp index d9f026f..49b0ddc 100644 --- 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 index 00b8ed0..60d7eae 100644 --- a/core/basics/Observable.h +++ b/core/basics/Observable.h @@ -2,7 +2,7 @@ #define _OBSERVABLE_FBASICS_H #include -#include +#include "Observer.h" namespace NICE { diff --git a/core/basics/Observer.cpp b/core/basics/Observer.cpp index 460e685..9c34953 100644 --- 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 index 3b65fd4..e87d334 100644 --- a/core/basics/Observer.h +++ b/core/basics/Observer.h @@ -38,6 +38,6 @@ class Observer { } // namespace -#include +#include "Observable.h" #endif // _OBSERVER_FBASICS_H diff --git a/core/basics/Persistent.h b/core/basics/Persistent.h index ae31d5d..0bb3ab2 100644 --- a/core/basics/Persistent.h +++ b/core/basics/Persistent.h @@ -7,7 +7,7 @@ #include #include -#include "core/basics/Exception.h" +#include "Exception.h" namespace NICE { diff --git a/core/basics/ResourceStatistics.h b/core/basics/ResourceStatistics.h index 8df2a73..ca32879 100644 --- a/core/basics/ResourceStatistics.h +++ b/core/basics/ResourceStatistics.h @@ -14,7 +14,7 @@ #include #endif -#include +#include "Exception.h" namespace NICE { diff --git a/core/basics/Streamable.cpp b/core/basics/Streamable.cpp index 461a7da..9244fef 100644 --- 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 #include #include -#include -#include +#include "gzstream.h" +#include "bzstream.h" -#include "core/basics/Exception.h" +#include "Exception.h" namespace NICE { diff --git a/core/basics/StringTools.cpp b/core/basics/StringTools.cpp index cd9acfe..407a871 100644 --- a/core/basics/StringTools.cpp +++ b/core/basics/StringTools.cpp @@ -16,6 +16,8 @@ #include "StringTools.h" +#define NICE_USELIB_REGEX + #ifdef NICE_USELIB_REGEX #include #endif diff --git a/core/basics/StringTools.h b/core/basics/StringTools.h index 356dc58..fd4a951 100644 --- a/core/basics/StringTools.h +++ b/core/basics/StringTools.h @@ -12,7 +12,7 @@ #include #include -#include +#include "../vector/VectorT.h" namespace NICE { diff --git a/core/basics/StructuredMap.h b/core/basics/StructuredMap.h index 8eb8752..703ca95 100644 --- a/core/basics/StructuredMap.h +++ b/core/basics/StructuredMap.h @@ -18,7 +18,7 @@ #include -#include "core/basics/Persistent.h" +#include "Persistent.h" diff --git a/core/basics/Timer.cpp b/core/basics/Timer.cpp index 56ce522..d8e7d9a 100644 --- 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 +#include "Timer.h" +#include "Exception.h" #include #ifdef WIN32 diff --git a/core/basics/Timer.h b/core/basics/Timer.h index 8355b6e..25f524a 100644 --- a/core/basics/Timer.h +++ b/core/basics/Timer.h @@ -23,7 +23,7 @@ #endif #endif #include -#include +#include "Log.h" namespace NICE { diff --git a/core/basics/binstream.h b/core/basics/binstream.h index f7f0485..19cc3c2 100644 --- a/core/basics/binstream.h +++ b/core/basics/binstream.h @@ -33,7 +33,7 @@ #include #include #include -#include +#include "types.h" #include #include "CrossplatformDefines.h" #ifdef NICE_USELIB_LINAL diff --git a/core/basics/bzstream.cpp b/core/basics/bzstream.cpp index 62c3c53..09fcafd 100644 --- a/core/basics/bzstream.cpp +++ b/core/basics/bzstream.cpp @@ -26,7 +26,7 @@ // Standard C++ Library". // ============================================================================ -#include +#include "bzstream.h" #include "CrossplatformDefines.h" #ifdef NICE_USELIB_BZLIB diff --git a/core/basics/gzbinstream.h b/core/basics/gzbinstream.h index 758e35d..d0e3f51 100644 --- 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 diff --git a/core/basics/gzstream.cpp b/core/basics/gzstream.cpp index e23214b..d5b2b9d 100644 --- a/core/basics/gzstream.cpp +++ b/core/basics/gzstream.cpp @@ -26,7 +26,7 @@ // Standard C++ Library". // ============================================================================ -#include +#include "gzstream.h" #ifdef NICE_USELIB_ZLIB #include #include // for memcpy diff --git a/core/basics/numerictools.cpp b/core/basics/numerictools.cpp index e343817..8c0f3b5 100644 --- a/core/basics/numerictools.cpp +++ b/core/basics/numerictools.cpp @@ -3,7 +3,7 @@ * - libfbasics - library of some basic tools * See file License for license information. */ -#include "core/basics/numerictools.h" +#include "numerictools.h" // STL includes #include @@ -12,10 +12,10 @@ #include // NICE-core includes -#include -#include -#include -#include +#include "Log.h" +#include "Timer.h" +#include "Exception.h" +#include "Streamable.h" typedef unsigned int uint; diff --git a/core/basics/stringutils.cpp b/core/basics/stringutils.cpp index 421f365..26200b5 100644 --- a/core/basics/stringutils.cpp +++ b/core/basics/stringutils.cpp @@ -3,8 +3,8 @@ * - libfbasics - library of some basic tools * See file License for license information. */ -#include "core/basics/stringutils.h" -#include +#include "stringutils.h" +#include "types.h" namespace NICE { diff --git a/core/basics/tools.cpp b/core/basics/tools.cpp index 2fc09e0..00e4408 100644 --- a/core/basics/tools.cpp +++ b/core/basics/tools.cpp @@ -3,7 +3,7 @@ * - libfbasics - library of some basic tools * See file License for license information. */ -#include +#include "tools.h" typedef unsigned int uint; diff --git a/core/basics/tools.h b/core/basics/tools.h index 372e40f..ce0e5ef 100644 --- a/core/basics/tools.h +++ b/core/basics/tools.h @@ -6,7 +6,7 @@ #ifndef _FBASICS_TOOLS_H #define _FBASICS_TOOLS_H -#include +#include "numerictools.h" #include #include #include diff --git a/core/basics/vectorio.h b/core/basics/vectorio.h index 35d2f1b..112c11e 100644 --- a/core/basics/vectorio.h +++ b/core/basics/vectorio.h @@ -61,7 +61,7 @@ void readVectorOfPointers ( std::istream& input, std::vector& v ); } // namespace //#ifdef __GNUC__ -#include "core/basics/vectorio.tcc" +#include "../basics/vectorio.tcc" //#endif #endif //_VECTORIO_H_ diff --git a/core/basics/vectorio.tcc b/core/basics/vectorio.tcc index fa548f4..88edb6f 100644 --- a/core/basics/vectorio.tcc +++ b/core/basics/vectorio.tcc @@ -3,9 +3,9 @@ * - libfbasics - library of some basic tools * See file License for license information. */ -#include "core/basics/vectorio.h" +#include "vectorio.h" #include -#include "core/basics/Exception.h" +#include "Exception.h" namespace NICE { diff --git a/core/image/BlockImageAccessT.h b/core/image/BlockImageAccessT.h index 2e15c25..60d1be2 100644 --- a/core/image/BlockImageAccessT.h +++ b/core/image/BlockImageAccessT.h @@ -7,9 +7,9 @@ #ifndef _LIMUN_BLOCKIMAGET_H #define _LIMUN_BLOCKIMAGET_H -#include -#include -#include +#include "GrayColorImageCommonImplementationT.h" +#include "ImageAccessT.h" +#include "pointerArithmetic.h" namespace NICE { @@ -68,7 +68,7 @@ class BlockImageAccessT : public GrayColorImageCommonImplementationT

, public } // namespace //#ifdef __GNUC__ -#include "core/image/BlockImageAccessT.tcc" +#include "BlockImageAccessT.tcc" //#endif #endif diff --git a/core/image/BlockImageAccessT.tcc b/core/image/BlockImageAccessT.tcc index d0e596d..5d73976 100644 --- a/core/image/BlockImageAccessT.tcc +++ b/core/image/BlockImageAccessT.tcc @@ -3,7 +3,7 @@ * - libimage - An ImageT library * See file License for license information. */ -#include "core/image/BlockImageAccessT.h" +#include "BlockImageAccessT.h" namespace NICE { diff --git a/core/image/Buffer.h b/core/image/Buffer.h index 9b4c891..63b5b07 100644 --- a/core/image/Buffer.h +++ b/core/image/Buffer.h @@ -7,10 +7,10 @@ #define LIMUN_BUFFER_H -#include "core/image/ippwrapper.h" -#include "core/image/GrayColorImageCommonImplementation.h" -#include "core/image/RectT.h" -#include "core/vector/VectorT.h" +#include "ippwrapper.h" +#include "GrayColorImageCommonImplementation.h" +#include "RectT.h" +#include "../vector/VectorT.h" namespace NICE { @@ -37,7 +37,7 @@ namespace NICE { //#ifdef __GNUC__ - #include + #include "Buffer.tcc" //#endif #endif //LIMUN_BUFFER_H diff --git a/core/image/ColorImageAccess.cpp b/core/image/ColorImageAccess.cpp index 2dddb66..fe6a83a 100644 --- a/core/image/ColorImageAccess.cpp +++ b/core/image/ColorImageAccess.cpp @@ -1,4 +1,4 @@ -#include +#include "ColorImageAccess.h" namespace NICE { diff --git a/core/image/ColorImageAccess.h b/core/image/ColorImageAccess.h index d64b50e..5e9c165 100644 --- a/core/image/ColorImageAccess.h +++ b/core/image/ColorImageAccess.h @@ -7,7 +7,7 @@ #ifndef _LIMUN_MULTICHANNELIMAGEACESS_H #define _LIMUN_MULTICHANNELIMAGEACESS_H -#include +#include "MultiChannelImageAccess.h" namespace NICE { diff --git a/core/image/ColorImageT.cpp b/core/image/ColorImageT.cpp index da5ae4a..0ab4b23 100644 --- a/core/image/ColorImageT.cpp +++ b/core/image/ColorImageT.cpp @@ -3,7 +3,7 @@ * - libimage - An image library * See file License for license information. */ -#include "core/image/ColorImageT.h" +#include "ColorImageT.h" #include diff --git a/core/image/ColorImageT.h b/core/image/ColorImageT.h index 3cd69c5..59989ff 100644 --- a/core/image/ColorImageT.h +++ b/core/image/ColorImageT.h @@ -3,7 +3,7 @@ * - libimage - An image library * See file License for license information. */ -#include +#include "Convert.h" #ifndef _LIMUN_COLORIMAGET_H #define _LIMUN_COLORIMAGET_H @@ -16,15 +16,15 @@ namespace NICE { #endif -#include "core/image/ippwrapper.h" +#include "ippwrapper.h" -#include "core/image/Drawable.h" -#include "core/image/CoordT.h" -#include "core/image/ColorT.h" -#include "core/image/GrayColorImageCommonImplementation.h" -#include "core/image/GrayColorImageCommonImplementationT.h" -#include "core/image/ColorImageAccess.h" -#include "core/image/RectT.h" +#include "Drawable.h" +#include "CoordT.h" +#include "ColorT.h" +#include "GrayColorImageCommonImplementation.h" +#include "GrayColorImageCommonImplementationT.h" +#include "ColorImageAccess.h" +#include "RectT.h" namespace NICE { @@ -886,7 +886,7 @@ typedef ColorImageT YUVColorImage; } // namespace //#ifdef __GNUC__ -#include "core/image/ColorImageT.tcc" +#include "ColorImageT.tcc" //#endif #endif diff --git a/core/image/ColorImageT.tcc b/core/image/ColorImageT.tcc index e6bcbe2..6f614c3 100644 --- a/core/image/ColorImageT.tcc +++ b/core/image/ColorImageT.tcc @@ -5,11 +5,11 @@ */ -#include +#include "ippwrapper.h" -#include -#include -#include +#include "ColorImageT.h" +#include "ImageT.h" +#include "../basics/tools.h" #include namespace NICE { diff --git a/core/image/ColorT.h b/core/image/ColorT.h index c6fd2be..994fbac 100644 --- a/core/image/ColorT.h +++ b/core/image/ColorT.h @@ -13,8 +13,8 @@ // #include #include -#include -#include +#include "../vector/VectorBase.h" +#include "../vector/VectorT.h" namespace NICE { @@ -126,7 +126,7 @@ typedef ColorT Color; }; // namespace NICE //#ifdef __GNUC__ -#include "core/image/ColorT.tcc" +#include "ColorT.tcc" //#endif #endif // COLOR_H diff --git a/core/image/ColorT.tcc b/core/image/ColorT.tcc index 0c36eb7..862158f 100644 --- a/core/image/ColorT.tcc +++ b/core/image/ColorT.tcc @@ -3,7 +3,7 @@ * - libimage - An image/template for new NICE libraries * See file License for license information. */ -#include "core/image/ColorT.h" +#include "ColorT.h" #ifdef NICE_USELIB_FBASICS #include "core/basics/Exception.h" #else diff --git a/core/image/Convert.cpp b/core/image/Convert.cpp index bac5e25..a05241e 100644 --- a/core/image/Convert.cpp +++ b/core/image/Convert.cpp @@ -1,5 +1,5 @@ -#include "core/image/Convert.h" +#include "Convert.h" using namespace std; diff --git a/core/image/Convert.h b/core/image/Convert.h index bdf28d3..a1a00bf 100644 --- a/core/image/Convert.h +++ b/core/image/Convert.h @@ -7,15 +7,15 @@ #define LIMUN_CONVERT_H -#include "core/image/ippwrapper.h" +#include "ippwrapper.h" -#include "core/vector/VectorT.h" -#include "core/image/Buffer.h" +#include "../vector/VectorT.h" +#include "Buffer.h" -#include "core/image/GrayColorImageCommonImplementation.h" -#include "core/image/RectT.h" -#include "core/image/ImageT.h" -#include "core/image/ColorImageT.h" +#include "GrayColorImageCommonImplementation.h" +#include "RectT.h" +#include "ImageT.h" +#include "ColorImageT.h" #include @@ -392,7 +392,7 @@ template class ImageT; } // namespace //#ifdef __GNUC__ -#include +#include "Convert.tcc" //#endif #endif // LIMUN_CONVERT_H diff --git a/core/image/Convert.tcc b/core/image/Convert.tcc index a05e0bd..05b5ca6 100644 --- a/core/image/Convert.tcc +++ b/core/image/Convert.tcc @@ -1,9 +1,9 @@ -#include "core/image/Convert.h" +#include "Convert.h" #include #include -#include "core/image/ColorImageT.h" -#include +#include "ColorImageT.h" +#include "../basics/tools.h" namespace NICE { diff --git a/core/image/CoordT.h b/core/image/CoordT.h index 58b2a90..f16e711 100644 --- a/core/image/CoordT.h +++ b/core/image/CoordT.h @@ -5,7 +5,7 @@ //STL #include //core -#include "core/vector/VectorT.h" +#include "../vector/VectorT.h" namespace NICE { diff --git a/core/image/DeprecatedConverter.cpp b/core/image/DeprecatedConverter.cpp index ceab2c3..5475878 100644 --- a/core/image/DeprecatedConverter.cpp +++ b/core/image/DeprecatedConverter.cpp @@ -1,11 +1,11 @@ -#include "core/image/DeprecatedConverter.h" +#include "DeprecatedConverter.h" #include #include -#include +#include "../basics/numerictools.h" #include #include -#include +#include "../basics/Log.h" using namespace std; namespace NICE { diff --git a/core/image/DeprecatedConverter.h b/core/image/DeprecatedConverter.h index e94710d..1e3e6ac 100644 --- a/core/image/DeprecatedConverter.h +++ b/core/image/DeprecatedConverter.h @@ -13,13 +13,13 @@ #ifndef LIMUN_CONVERTER_H #define LIMUN_CONVERTER_H -#include +#include "../basics/deprecated.h" -#include "core/image/ippwrapper.h" -#include "core/image/GrayColorImageCommonImplementation.h" -#include "core/image/RectT.h" -#include "core/vector/VectorT.h" -#include "core/image/Convert.h" +#include "ippwrapper.h" +#include "GrayColorImageCommonImplementation.h" +#include "RectT.h" +#include "../vector/VectorT.h" +#include "Convert.h" namespace NICE { class DeprecatedConverter; @@ -877,12 +877,11 @@ class LIMUN_DEPRECATED DeprecatedConverter { } // namespace -#include "core/image/ImageT.h" -#include "core/image/ImageT.h" -#include "core/image/ColorImageT.h" +#include "ImageT.h" +#include "ColorImageT.h" //#ifdef __GNUC__ -#include +#include "DeprecatedConverter.tcc" //#endif #endif diff --git a/core/image/DeprecatedConverter.tcc b/core/image/DeprecatedConverter.tcc index 425a21b..85c9665 100644 --- a/core/image/DeprecatedConverter.tcc +++ b/core/image/DeprecatedConverter.tcc @@ -1,4 +1,4 @@ -#include "core/image/DeprecatedConverter.h" +#include "DeprecatedConverter.h" #include namespace NICE { diff --git a/core/image/Drawable.h b/core/image/Drawable.h index 73db64b..fa93290 100644 --- a/core/image/Drawable.h +++ b/core/image/Drawable.h @@ -19,8 +19,8 @@ #define _DRAWABLE_IMAGE_H -#include -#include +#include "ippwrapper.h" +#include "ColorT.h" namespace NICE { @@ -91,8 +91,8 @@ class Drawable } // namespace NICE -#include "core/image/ColorImageT.h" -#include "core/image/ImageT.h" +#include "ColorImageT.h" +#include "ImageT.h" #endif /* _DRAWABLE_IMAGE_H */ diff --git a/core/image/Filter.cpp b/core/image/Filter.cpp index 92acd65..365ed4f 100644 --- a/core/image/Filter.cpp +++ b/core/image/Filter.cpp @@ -1,7 +1,7 @@ -#include "core/image/Filter.h" +#include "Filter.h" #include #include -#include +#include "../basics/numerictools.h" #include using namespace std; diff --git a/core/image/Filter.h b/core/image/Filter.h index 6c7c894..2ccd97c 100644 --- a/core/image/Filter.h +++ b/core/image/Filter.h @@ -7,17 +7,17 @@ #define LIMUN_FILTER_H -#include -#include +#include "ippwrapper.h" +#include "ImageOperators.h" -#include -#include +#include "../vector/VectorT.h" +#include "../vector/MatrixT.h" -#include +#include "../basics/RoundToNearest.h" -#include -#include -#include +#include "ImageT.h" +#include "ColorImageT.h" +#include "Buffer.h" #pragma message NICE_WARNING("Filter.h is obsolete. Please use FilterT.h instead and adapt your calls and implement the filter if necessary :)") @@ -471,7 +471,7 @@ ColorImageT

* wiener ( const ColorImageT

& src, int anchorx = -1, int anchor } // namespace //#ifdef __GNUC__ -#include +#include "Filter.tcc" //#endif #endif //LIMUN_FILTER_H diff --git a/core/image/FilterT.cpp b/core/image/FilterT.cpp index 5991e79..34c098b 100644 --- a/core/image/FilterT.cpp +++ b/core/image/FilterT.cpp @@ -1,4 +1,4 @@ -#include +#include "FilterT.h" using namespace NICE; diff --git a/core/image/FilterT.h b/core/image/FilterT.h index 508c4df..fc32154 100644 --- a/core/image/FilterT.h +++ b/core/image/FilterT.h @@ -6,17 +6,17 @@ * @example notyet */ -#include -#include +#include "ippwrapper.h" +#include "ImageOperators.h" -#include -#include +#include "../vector/VectorT.h" +#include "../vector/MatrixT.h" -#include +#include "../basics/RoundToNearest.h" -#include -#include -#include +#include "ImageT.h" +#include "ColorImageT.h" +#include "Buffer.h" #ifndef NICE_FILTERT_H #define NICE_FILTERT_H @@ -178,7 +178,7 @@ typedef FilterT FilterDouble; } //namespace //#ifdef __GNUC__ -#include +#include "FilterT.tcc" //#endif #endif diff --git a/core/image/FilterT.tcc b/core/image/FilterT.tcc index d578371..4fc2cef 100644 --- a/core/image/FilterT.tcc +++ b/core/image/FilterT.tcc @@ -1,6 +1,6 @@ #include #include "ImageT.h" -#include +#include "FilterT.h" namespace NICE { diff --git a/core/image/Fourier.h b/core/image/Fourier.h index ae94cf5..a0419c9 100644 --- a/core/image/Fourier.h +++ b/core/image/Fourier.h @@ -17,7 +17,7 @@ #ifndef NICE_Fourier_INCLUDE #define NICE_Fourier_INCLUDE -#include "core/image/ImageT.h" +#include "ImageT.h" #ifdef NICE_USELIB_ICE diff --git a/core/image/GHough.cpp b/core/image/GHough.cpp index 54e16c7..72f14c8 100644 --- a/core/image/GHough.cpp +++ b/core/image/GHough.cpp @@ -15,7 +15,7 @@ */ /*****************************************************************************/ -#include "core/image/GHough.h" +#include "GHough.h" namespace NICE { diff --git a/core/image/GHough.h b/core/image/GHough.h index 8cc275e..91510c5 100644 --- a/core/image/GHough.h +++ b/core/image/GHough.h @@ -20,7 +20,7 @@ #include -#include +#include "ImageT.h" namespace NICE { diff --git a/core/image/GaussPyramid.cpp b/core/image/GaussPyramid.cpp index db246e2..b5c227c 100644 --- a/core/image/GaussPyramid.cpp +++ b/core/image/GaussPyramid.cpp @@ -1,5 +1,5 @@ -#include "core/image/GaussPyramid.h" +#include "GaussPyramid.h" #include #include diff --git a/core/image/GaussPyramid.h b/core/image/GaussPyramid.h index 2ae6006..556288a 100644 --- a/core/image/GaussPyramid.h +++ b/core/image/GaussPyramid.h @@ -7,8 +7,8 @@ #define LIMUN_GAUSSSPYRAMID_H -#include "core/image/ColorImageT.h" -#include "core/image/ImageT.h" +#include "ColorImageT.h" +#include "ImageT.h" #include namespace NICE { diff --git a/core/image/GrayColorImageCommonImplementation.cpp b/core/image/GrayColorImageCommonImplementation.cpp index 977264b..49cf72a 100644 --- a/core/image/GrayColorImageCommonImplementation.cpp +++ b/core/image/GrayColorImageCommonImplementation.cpp @@ -3,7 +3,7 @@ * - libimage - An image library * See file License for license information. */ -#include "core/image/GrayColorImageCommonImplementation.h" +#include "GrayColorImageCommonImplementation.h" #include diff --git a/core/image/GrayColorImageCommonImplementation.h b/core/image/GrayColorImageCommonImplementation.h index a8ee03d..9da7abe 100644 --- a/core/image/GrayColorImageCommonImplementation.h +++ b/core/image/GrayColorImageCommonImplementation.h @@ -12,7 +12,7 @@ class GrayColorImageCommonImplementation; } -#include "core/image/ImageException.h" +#include "ImageException.h" namespace NICE { diff --git a/core/image/GrayColorImageCommonImplementationT.h b/core/image/GrayColorImageCommonImplementationT.h index b774646..1e67a5e 100644 --- a/core/image/GrayColorImageCommonImplementationT.h +++ b/core/image/GrayColorImageCommonImplementationT.h @@ -11,11 +11,11 @@ namespace NICE { class ImageFile; } -#include "core/image/ippwrapper.h" -#include "core/image/pointerArithmetic.h" -#include "core/image/ImageException.h" -#include "core/image/GrayColorImageCommonImplementation.h" -#include +#include "ippwrapper.h" +#include "pointerArithmetic.h" +#include "ImageException.h" +#include "GrayColorImageCommonImplementation.h" +#include "RectT.h" namespace NICE { @@ -325,7 +325,7 @@ class GrayColorImageCommonImplementationT : public GrayColorImageCommonImplement } // namespace //#ifdef __GNUC__ -#include "core/image/GrayColorImageCommonImplementationT.tcc" +#include "GrayColorImageCommonImplementationT.tcc" //#endif #endif diff --git a/core/image/GrayColorImageCommonImplementationT.tcc b/core/image/GrayColorImageCommonImplementationT.tcc index c139da1..559a74c 100644 --- a/core/image/GrayColorImageCommonImplementationT.tcc +++ b/core/image/GrayColorImageCommonImplementationT.tcc @@ -5,8 +5,8 @@ */ #include #include -#include "core/image/GrayColorImageCommonImplementationT.h" -#include "core/image/ImageFile.h" +#include "GrayColorImageCommonImplementationT.h" +#include "ImageFile.h" namespace NICE { diff --git a/core/image/Histogram.cpp b/core/image/Histogram.cpp index dfecf15..b8067ca 100644 --- a/core/image/Histogram.cpp +++ b/core/image/Histogram.cpp @@ -10,7 +10,7 @@ \brief Histogram class definitions */ -#include +#include "Histogram.h" namespace NICE { diff --git a/core/image/Histogram.h b/core/image/Histogram.h index 8823aeb..b5b56d1 100644 --- a/core/image/Histogram.h +++ b/core/image/Histogram.h @@ -7,13 +7,13 @@ #define LIMUN_HISTOGRAM_H -#include "core/image/ippwrapper.h" +#include "ippwrapper.h" -#include "core/image/RectT.h" -#include "core/image/ImageT.h" -#include "core/image/ColorImageT.h" +#include "RectT.h" +#include "ImageT.h" +#include "ColorImageT.h" -#include "core/vector/VectorT.h" +#include "../vector/VectorT.h" namespace NICE { diff --git a/core/image/ImageAccess.cpp b/core/image/ImageAccess.cpp index 472cdf5..d19c40c 100644 --- a/core/image/ImageAccess.cpp +++ b/core/image/ImageAccess.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "ImageAccess.h" +#include "../basics/Exception.h" namespace NICE { diff --git a/core/image/ImageAccess.h b/core/image/ImageAccess.h index 4b98fe3..9bb9bf2 100644 --- a/core/image/ImageAccess.h +++ b/core/image/ImageAccess.h @@ -7,7 +7,7 @@ #ifndef _LIMUN_BASEIMAGE_H #define _LIMUN_BASEIMAGE_H -#include +#include "MultiChannelImageAccess.h" namespace NICE { diff --git a/core/image/ImageAccessT.h b/core/image/ImageAccessT.h index 412aa7f..ede508e 100644 --- a/core/image/ImageAccessT.h +++ b/core/image/ImageAccessT.h @@ -7,7 +7,7 @@ #ifndef _LIMUN_BASEIMAGET_H #define _LIMUN_BASEIMAGET_H -#include +#include "ImageAccess.h" namespace NICE { @@ -35,7 +35,7 @@ class ImageAccessT : public ImageAccess { } // namespace //#ifdef __GNUC__ -#include "core/image/ImageAccessT.tcc" +#include "ImageAccessT.tcc" //#endif #endif diff --git a/core/image/ImageAccessT.tcc b/core/image/ImageAccessT.tcc index 2525c5a..41b0932 100644 --- a/core/image/ImageAccessT.tcc +++ b/core/image/ImageAccessT.tcc @@ -3,7 +3,7 @@ * - libimage - An ImageT library * See file License for license information. */ -#include "core/image/ImageAccessT.h" +#include "ImageAccessT.h" namespace NICE { diff --git a/core/image/ImageException.h b/core/image/ImageException.h index b8300f6..df88fb7 100644 --- a/core/image/ImageException.h +++ b/core/image/ImageException.h @@ -6,7 +6,7 @@ #ifndef _LIMUN_IMAGEEXCEPTION_H #define _LIMUN_IMAGEEXCEPTION_H -#include "core/basics/Exception.h" +#include "../basics/Exception.h" namespace NICE { diff --git a/core/image/ImageFile.cpp b/core/image/ImageFile.cpp index e33f74c..02b57ce 100644 --- a/core/image/ImageFile.cpp +++ b/core/image/ImageFile.cpp @@ -16,8 +16,8 @@ /*****************************************************************************/ #include -#include "core/image/ImageFile.h" -#include "core/image/Convert.h" +#include "ImageFile.h" +#include "Convert.h" #ifdef NICE_USELIB_LIMUN_IOCOMPRESSION #include "iocompression/pipestream.h" diff --git a/core/image/ImageFile.h b/core/image/ImageFile.h index 7e54a31..007732c 100644 --- a/core/image/ImageFile.h +++ b/core/image/ImageFile.h @@ -21,7 +21,7 @@ #include -#include +#include "../basics/types.h" #ifdef NICE_USELIB_PNG #include @@ -220,10 +220,10 @@ class ImageFile } // namespace NICE -#include +#include "GrayColorImageCommonImplementationT.h" //#ifdef __GNUC__ - #include "core/image/ImageFile.tcc" + #include "ImageFile.tcc" //#endif #endif /* _IMAGEFILE_IMAGE_H */ diff --git a/core/image/ImageFile.tcc b/core/image/ImageFile.tcc index f3f05b8..a4a8fb0 100644 --- a/core/image/ImageFile.tcc +++ b/core/image/ImageFile.tcc @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include "ImageFile.h" +#include "ImageT.h" +#include "ColorImageT.h" +#include "Convert.h" +#include "../basics/stringutils.h" #include #ifdef NICE_USELIB_LIBMAGICK diff --git a/core/image/ImageFileListReader.cpp b/core/image/ImageFileListReader.cpp index f146236..7aebb09 100644 --- a/core/image/ImageFileListReader.cpp +++ b/core/image/ImageFileListReader.cpp @@ -1,6 +1,6 @@ -#include "core/image/ImageFileListReader.h" -#include "core/image/Convert.h" -#include "core/basics/Log.h" +#include "ImageFileListReader.h" +#include "Convert.h" +#include "../basics/Log.h" #include namespace NICE { diff --git a/core/image/ImageFileListReader.h b/core/image/ImageFileListReader.h index b54dbda..a0e7004 100644 --- a/core/image/ImageFileListReader.h +++ b/core/image/ImageFileListReader.h @@ -3,8 +3,8 @@ #include #include -#include "core/basics/FileName.h" -#include "core/image/ImageInputStream.h" +#include "../basics/FileName.h" +#include "ImageInputStream.h" namespace NICE { diff --git a/core/image/ImageFileListWriter.cpp b/core/image/ImageFileListWriter.cpp index 8badd51..795d672 100644 --- a/core/image/ImageFileListWriter.cpp +++ b/core/image/ImageFileListWriter.cpp @@ -1,6 +1,6 @@ -#include "core/image/ImageFileListWriter.h" -#include "core/image/Convert.h" -#include "core/basics/FileName.h" +#include "ImageFileListWriter.h" +#include "Convert.h" +#include "../basics/FileName.h" #include namespace NICE { diff --git a/core/image/ImageFileListWriter.h b/core/image/ImageFileListWriter.h index f0bbb63..e9a5cf6 100644 --- a/core/image/ImageFileListWriter.h +++ b/core/image/ImageFileListWriter.h @@ -1,7 +1,7 @@ #ifndef _IMAGE_IMAGEFILELISTWRITER_H #define _IMAGE_IMAGEFILELISTWRITER_H -#include "core/image/ImageOutputStream.h" +#include "ImageOutputStream.h" #include #include #include diff --git a/core/image/ImageInputStream.cpp b/core/image/ImageInputStream.cpp index a8c5b96..7448454 100644 --- a/core/image/ImageInputStream.cpp +++ b/core/image/ImageInputStream.cpp @@ -3,8 +3,8 @@ * - libimage - An image library * See file License for license information. */ -#include "core/image/ImageInputStream.h" -#include "core/image/ImageException.h" +#include "ImageInputStream.h" +#include "ImageException.h" namespace NICE { diff --git a/core/image/ImageInputStream.h b/core/image/ImageInputStream.h index d6ceec4..c305125 100644 --- a/core/image/ImageInputStream.h +++ b/core/image/ImageInputStream.h @@ -7,7 +7,7 @@ #define _IMAGEINPUTSTREAM_IMAGE_H -#include "core/image/ColorImageT.h" +#include "ColorImageT.h" namespace NICE { diff --git a/core/image/ImageOperators.h b/core/image/ImageOperators.h index ebc43c2..ddc1fae 100644 --- a/core/image/ImageOperators.h +++ b/core/image/ImageOperators.h @@ -5,14 +5,14 @@ // #ifdef NICE_USELIB_LIMUN_IOCOMPRESSION // #include // #endif -#include +#include "../basics/binstream.h" -#include "core/image/ippwrapper.h" +#include "ippwrapper.h" -#include "core/image/Convert.h" -#include "core/image/ImageT.h" -#include "core/image/ImageT.h" +#include "Convert.h" +#include "ImageT.h" +#include "ImageT.h" #include diff --git a/core/image/ImageOutputStream.h b/core/image/ImageOutputStream.h index 8711770..2d62f03 100644 --- a/core/image/ImageOutputStream.h +++ b/core/image/ImageOutputStream.h @@ -7,7 +7,7 @@ #define _IMAGEOUTPUTSTREAM_IMAGE_H -#include "core/image/ColorImageT.h" +#include "ColorImageT.h" namespace NICE { diff --git a/core/image/ImageT.cpp b/core/image/ImageT.cpp index b554af3..4123493 100644 --- a/core/image/ImageT.cpp +++ b/core/image/ImageT.cpp @@ -3,9 +3,9 @@ * - libimage - An ImageT library * See file License for license information. */ -#include "core/image/Convert.h" -#include "core/image/ImageT.h" -#include "core/image/ColorImageT.h" +#include "Convert.h" +#include "ImageT.h" +#include "ColorImageT.h" #include #include diff --git a/core/image/ImageT.h b/core/image/ImageT.h index d3a5066..4ef7ecf 100644 --- a/core/image/ImageT.h +++ b/core/image/ImageT.h @@ -3,18 +3,18 @@ * - libimage - An ImageT library * See file License for license information. */ -#include +#include "Convert.h" #ifndef _LIMUN_GRAYIMAGET_H #define _LIMUN_GRAYIMAGET_H -#include +#include "ippwrapper.h" -#include -#include -#include +#include "CoordT.h" +#include "ColorT.h" +#include "Drawable.h" -#include -#include +#include "GrayColorImageCommonImplementation.h" +#include "BlockImageAccessT.h" namespace NICE { @@ -809,10 +809,10 @@ typedef ImageT FloatImage; } // namespace -#include "core/image/GrayColorImageCommonImplementationT.h" +#include "GrayColorImageCommonImplementationT.h" //#ifdef __GNUC__ -#include "core/image/ImageT.tcc" +#include "ImageT.tcc" //#endif #endif diff --git a/core/image/ImageT.tcc b/core/image/ImageT.tcc index f220237..a46cbf0 100644 --- a/core/image/ImageT.tcc +++ b/core/image/ImageT.tcc @@ -3,8 +3,8 @@ * - libimage - An ImageT library * See file License for license information. */ -#include "core/image/ImageT.h" -#include +#include "ImageT.h" +#include "../basics/tools.h" #include namespace NICE { diff --git a/core/image/ImageTools.cpp b/core/image/ImageTools.cpp index 4239a7f..c6e902f 100644 --- a/core/image/ImageTools.cpp +++ b/core/image/ImageTools.cpp @@ -1,4 +1,4 @@ -#include "core/image/ImageTools.h" +#include "ImageTools.h" #include #include #include diff --git a/core/image/ImageTools.h b/core/image/ImageTools.h index bb1fe08..6dd3958 100644 --- a/core/image/ImageTools.h +++ b/core/image/ImageTools.h @@ -7,16 +7,16 @@ #define LIMUN_IMAGETOOLS_H -#include +#include "ippwrapper.h" -#include -#include +#include "../vector/VectorT.h" +#include "../vector/MatrixT.h" -#include -#include +#include "ImageT.h" +#include "ColorImageT.h" -#include -#include +#include "Convert.h" +#include "Filter.h" namespace NICE { @@ -413,13 +413,12 @@ namespace NICE { } // namespace -#include "core/image/ImageT.h" -#include "core/image/ImageT.h" -#include "core/image/ColorImageT.h" -#include "core/image/Buffer.h" +#include "ImageT.h" +#include "ColorImageT.h" +#include "Buffer.h" //#ifdef __GNUC__ - #include + #include "ImageTools.tcc" //#endif #endif //LIMUN_IMAGETOOLS_H diff --git a/core/image/ImageTools.tcc b/core/image/ImageTools.tcc index b0165c8..e01e31d 100644 --- a/core/image/ImageTools.tcc +++ b/core/image/ImageTools.tcc @@ -1,6 +1,6 @@ -#include -#include +#include "ImageTools.h" +#include "ippwrapper.h" namespace NICE { diff --git a/core/image/Morph.cpp b/core/image/Morph.cpp index f927fe7..3e7b594 100644 --- a/core/image/Morph.cpp +++ b/core/image/Morph.cpp @@ -1,6 +1,6 @@ -#include "core/image/Morph.h" -#include "core/image/ImageTools.h" +#include "Morph.h" +#include "ImageTools.h" #include #include diff --git a/core/image/Morph.h b/core/image/Morph.h index fd2c3c1..031e3f2 100644 --- a/core/image/Morph.h +++ b/core/image/Morph.h @@ -7,17 +7,17 @@ #define LIMUN_MORPH_H -#include +#include "ippwrapper.h" -#include -#include +#include "../vector/VectorT.h" +#include "../vector/MatrixT.h" -#include -#include -#include +#include "ImageT.h" +#include "ColorImageT.h" +#include "Buffer.h" -#include -#include +#include "Histogram.h" +#include "Convert.h" namespace NICE { @@ -307,7 +307,7 @@ namespace NICE { } // namespace //#ifdef __GNUC__ - #include + #include "Morph.tcc" //#endif #endif //LIMUN_RANKING_H diff --git a/core/image/MultiChannelImage3DT.cpp b/core/image/MultiChannelImage3DT.cpp index a0a3126..24ac5a0 100644 --- a/core/image/MultiChannelImage3DT.cpp +++ b/core/image/MultiChannelImage3DT.cpp @@ -1,4 +1,4 @@ -#include "core/image/MultiChannelImage3DT.h" +#include "MultiChannelImage3DT.h" using namespace NICE; diff --git a/core/image/MultiChannelImage3DT.h b/core/image/MultiChannelImage3DT.h index eeb35a0..91ca6c6 100644 --- a/core/image/MultiChannelImage3DT.h +++ b/core/image/MultiChannelImage3DT.h @@ -1,10 +1,10 @@ #ifndef _NICE_CORE_MULTICHANNELIMAGE3DT_H #define _NICE_CORE_MULTICHANNELIMAGE3DT_H -#include -#include -#include -#include +#include "MultiChannelImageAccess3D.h" +#include "ImageT.h" +#include "MultiChannelImageT.h" +#include "Histogram.h" #include #include @@ -173,6 +173,6 @@ class MultiChannelImage3DT : public MultiChannelImageAccess3D { } // namespace -#include +#include "MultiChannelImage3DT.tcc" #endif diff --git a/core/image/MultiChannelImageT.cpp b/core/image/MultiChannelImageT.cpp index c0790fa..55b9c59 100644 --- a/core/image/MultiChannelImageT.cpp +++ b/core/image/MultiChannelImageT.cpp @@ -1,4 +1,4 @@ -#include "core/image/MultiChannelImageT.h" +#include "MultiChannelImageT.h" using namespace NICE; diff --git a/core/image/MultiChannelImageT.h b/core/image/MultiChannelImageT.h index f24c350..64f9ef8 100644 --- a/core/image/MultiChannelImageT.h +++ b/core/image/MultiChannelImageT.h @@ -1,8 +1,8 @@ #ifndef _NICE_CORE_MULTICHANNELIMAGET_H #define _NICE_CORE_MULTICHANNELIMAGET_H -#include -#include +#include "MultiChannelImageAccess.h" +#include "ImageT.h" namespace NICE { @@ -144,6 +144,6 @@ class MultiChannelImageT : public MultiChannelImageAccess { } // namespace -#include "core/image/MultiChannelImageT.tcc" +#include "MultiChannelImageT.tcc" #endif diff --git a/core/image/RectT.h b/core/image/RectT.h index c27841a..3f5d032 100644 --- a/core/image/RectT.h +++ b/core/image/RectT.h @@ -2,11 +2,11 @@ #define _IMAGE_RECT_H -#include "core/image/ippwrapper.h" +#include "ippwrapper.h" -#include "core/image/CoordT.h" +#include "CoordT.h" -#include "core/vector/VectorT.h" +#include "../vector/VectorT.h" #include @@ -182,7 +182,7 @@ class RectT { } // namespace //#ifdef __GNUC__ -#include "core/image/RectT.tcc" +#include "RectT.tcc" //#endif diff --git a/core/image/RectT.tcc b/core/image/RectT.tcc index 202af42..e78db4e 100644 --- a/core/image/RectT.tcc +++ b/core/image/RectT.tcc @@ -1,5 +1,5 @@ -#include "core/image/RectT.h" +#include "RectT.h" namespace NICE { diff --git a/core/image/ippwrapper.h b/core/image/ippwrapper.h index 307ec1f..14cb29a 100644 --- a/core/image/ippwrapper.h +++ b/core/image/ippwrapper.h @@ -259,7 +259,7 @@ #endif // !NICE_USELIB_IPP //#ifdef __GNUC__ -#include "core/image/ippwrapper.tcc" +#include "ippwrapper.tcc" //#endifö #endif diff --git a/core/image/pointerArithmetic.h b/core/image/pointerArithmetic.h index d0d67ef..8510b29 100644 --- a/core/image/pointerArithmetic.h +++ b/core/image/pointerArithmetic.h @@ -7,8 +7,8 @@ #define HELP_IPP_H -#include "core/image/ippwrapper.h" -#include "core/image/CoordT.h" +#include "ippwrapper.h" +#include "CoordT.h" namespace NICE { diff --git a/core/optimization/blackbox/CostFunction.cpp b/core/optimization/blackbox/CostFunction.cpp index b7b65ca..15420fb 100644 --- a/core/optimization/blackbox/CostFunction.cpp +++ b/core/optimization/blackbox/CostFunction.cpp @@ -6,7 +6,7 @@ // ////////////////////////////////////////////////////////////////////// -#include "core/optimization/blackbox/CostFunction.h" +#include "CostFunction.h" using namespace OPTIMIZATION; diff --git a/core/optimization/blackbox/CostFunction.h b/core/optimization/blackbox/CostFunction.h index bef44c1..7539e4b 100644 --- a/core/optimization/blackbox/CostFunction.h +++ b/core/optimization/blackbox/CostFunction.h @@ -9,8 +9,8 @@ #ifndef _COST_FUNCTION_H_ #define _COST_FUNCTION_H_ -#include "core/optimization/blackbox/Optimizable.h" -#include "core/optimization/blackbox/Definitions_core_opt.h" +#include "Optimizable.h" +#include "Definitions_core_opt.h" namespace OPTIMIZATION { diff --git a/core/optimization/blackbox/Definitions_core_opt.h b/core/optimization/blackbox/Definitions_core_opt.h index 067aab5..2372600 100644 --- a/core/optimization/blackbox/Definitions_core_opt.h +++ b/core/optimization/blackbox/Definitions_core_opt.h @@ -7,7 +7,7 @@ #define _DEFINITIONS_CORE_OPT // #include -#include +#include "../../vector/MatrixT.h" namespace OPTIMIZATION { diff --git a/core/optimization/blackbox/DimWrapperCostFunction.h b/core/optimization/blackbox/DimWrapperCostFunction.h index e9c6527..308db22 100644 --- a/core/optimization/blackbox/DimWrapperCostFunction.h +++ b/core/optimization/blackbox/DimWrapperCostFunction.h @@ -10,8 +10,8 @@ #define _DIMWRAP_COST_FUNCTION_H_ //#include "Optimizable.h" -#include "core/optimization/blackbox/CostFunction.h" -#include "core/optimization/blackbox/Definitions_core_opt.h" +#include "CostFunction.h" +#include "Definitions_core_opt.h" namespace OPTIMIZATION { diff --git a/core/optimization/blackbox/DownhillSimplexOptimizer.cpp b/core/optimization/blackbox/DownhillSimplexOptimizer.cpp index 7a0beaf..9af758c 100644 --- a/core/optimization/blackbox/DownhillSimplexOptimizer.cpp +++ b/core/optimization/blackbox/DownhillSimplexOptimizer.cpp @@ -10,8 +10,8 @@ // #include "mateigen.h" // for SVD -#include "core/optimization/blackbox/DownhillSimplexOptimizer.h" -#include "core/optimization/blackbox/Definitions_core_opt.h" +#include "DownhillSimplexOptimizer.h" +#include "Definitions_core_opt.h" using namespace OPTIMIZATION; diff --git a/core/optimization/blackbox/DownhillSimplexOptimizer.h b/core/optimization/blackbox/DownhillSimplexOptimizer.h index a86c49d..4cb6ccb 100644 --- a/core/optimization/blackbox/DownhillSimplexOptimizer.h +++ b/core/optimization/blackbox/DownhillSimplexOptimizer.h @@ -10,7 +10,7 @@ #define _DOWNHILL_SIMPLEX_OPTIMIZER_H_ #include -#include "core/optimization/blackbox/SimpleOptimizer.h" +#include "SimpleOptimizer.h" namespace OPTIMIZATION { diff --git a/core/optimization/blackbox/OptLogBase.cpp b/core/optimization/blackbox/OptLogBase.cpp index f4dbfb6..c1cc1ec 100644 --- a/core/optimization/blackbox/OptLogBase.cpp +++ b/core/optimization/blackbox/OptLogBase.cpp @@ -6,7 +6,7 @@ // ////////////////////////////////////////////////////////////////////// -#include "core/optimization/blackbox/OptLogBase.h" +#include "OptLogBase.h" #include #include diff --git a/core/optimization/blackbox/OptLogBase.h b/core/optimization/blackbox/OptLogBase.h index c268a6f..7ac8166 100644 --- a/core/optimization/blackbox/OptLogBase.h +++ b/core/optimization/blackbox/OptLogBase.h @@ -11,7 +11,7 @@ #include #include -#include "core/optimization/blackbox/Definitions_core_opt.h" +#include "Definitions_core_opt.h" namespace OPTIMIZATION { diff --git a/core/optimization/blackbox/Optimizable.cpp b/core/optimization/blackbox/Optimizable.cpp index ed38f47..24dccb8 100644 --- a/core/optimization/blackbox/Optimizable.cpp +++ b/core/optimization/blackbox/Optimizable.cpp @@ -6,7 +6,7 @@ // ////////////////////////////////////////////////////////////////////// -#include "core/optimization/blackbox/Optimizable.h" +#include "Optimizable.h" using namespace OPTIMIZATION; diff --git a/core/optimization/blackbox/Optimizable.h b/core/optimization/blackbox/Optimizable.h index 209f410..cb050bd 100644 --- a/core/optimization/blackbox/Optimizable.h +++ b/core/optimization/blackbox/Optimizable.h @@ -9,7 +9,7 @@ #ifndef _OPTIMIZABLE_H_ #define _OPTIMIZABLE_H_ -#include "core/optimization/blackbox/Definitions_core_opt.h" +#include "Definitions_core_opt.h" namespace OPTIMIZATION { diff --git a/core/optimization/blackbox/Optimizer.cpp b/core/optimization/blackbox/Optimizer.cpp index 626f36b..3acdaee 100644 --- a/core/optimization/blackbox/Optimizer.cpp +++ b/core/optimization/blackbox/Optimizer.cpp @@ -9,7 +9,7 @@ #include #include -#include "core/optimization/blackbox/Optimizer.h" +#include "Optimizer.h" using namespace OPTIMIZATION; diff --git a/core/optimization/blackbox/Optimizer.h b/core/optimization/blackbox/Optimizer.h index ab26191..1244674 100644 --- a/core/optimization/blackbox/Optimizer.h +++ b/core/optimization/blackbox/Optimizer.h @@ -8,9 +8,9 @@ #include -#include "core/optimization/blackbox/CostFunction.h" -#include "core/optimization/blackbox/OptLogBase.h" -#include "core/optimization/blackbox/Definitions_core_opt.h" +#include "CostFunction.h" +#include "OptLogBase.h" +#include "Definitions_core_opt.h" namespace OPTIMIZATION { /*! diff --git a/core/optimization/blackbox/SimpleOptProblem.cpp b/core/optimization/blackbox/SimpleOptProblem.cpp index 98114cb..1484335 100644 --- a/core/optimization/blackbox/SimpleOptProblem.cpp +++ b/core/optimization/blackbox/SimpleOptProblem.cpp @@ -18,7 +18,7 @@ Matthias Wacker */ -#include "core/optimization/blackbox/SimpleOptProblem.h" +#include "SimpleOptProblem.h" using namespace OPTIMIZATION; diff --git a/core/optimization/blackbox/SimpleOptProblem.h b/core/optimization/blackbox/SimpleOptProblem.h index 50df0ad..87e8f5a 100644 --- a/core/optimization/blackbox/SimpleOptProblem.h +++ b/core/optimization/blackbox/SimpleOptProblem.h @@ -30,9 +30,9 @@ #include -#include "core/optimization/blackbox/Definitions_core_opt.h" -#include "core/optimization/blackbox/CostFunction.h" -#include "core/optimization/blackbox/DimWrapperCostFunction.h" +#include "Definitions_core_opt.h" +#include "CostFunction.h" +#include "DimWrapperCostFunction.h" namespace OPTIMIZATION { diff --git a/core/optimization/blackbox/SimpleOptimizer.cpp b/core/optimization/blackbox/SimpleOptimizer.cpp index 359e90f..d1f3a16 100644 --- a/core/optimization/blackbox/SimpleOptimizer.cpp +++ b/core/optimization/blackbox/SimpleOptimizer.cpp @@ -8,7 +8,7 @@ #include -#include "core/optimization/blackbox/SimpleOptimizer.h" +#include "SimpleOptimizer.h" using namespace OPTIMIZATION; diff --git a/core/optimization/blackbox/SimpleOptimizer.h b/core/optimization/blackbox/SimpleOptimizer.h index 9271a8b..eeac45c 100644 --- a/core/optimization/blackbox/SimpleOptimizer.h +++ b/core/optimization/blackbox/SimpleOptimizer.h @@ -6,9 +6,9 @@ #ifndef _SIMPLEOPTIMIZER_H_ #define _SIMPLEOPTIMIZER_H_ -#include "core/optimization/blackbox/Optimizer.h" -#include "core/optimization/blackbox/SimpleOptProblem.h" -#include "core/optimization/blackbox/Definitions_core_opt.h" +#include "Optimizer.h" +#include "SimpleOptProblem.h" +#include "Definitions_core_opt.h" namespace OPTIMIZATION { diff --git a/core/optimization/gradientBased/FirstOrderRasmussen.cpp b/core/optimization/gradientBased/FirstOrderRasmussen.cpp index 1f4af3b..cc573e7 100644 --- a/core/optimization/gradientBased/FirstOrderRasmussen.cpp +++ b/core/optimization/gradientBased/FirstOrderRasmussen.cpp @@ -9,7 +9,7 @@ #include "FirstOrderRasmussen.h" -#include +#include "../../basics/Log.h" using namespace std; using namespace NICE; diff --git a/core/optimization/gradientBased/FirstOrderRasmussen.h b/core/optimization/gradientBased/FirstOrderRasmussen.h index 8716de6..b2cf1a3 100644 --- a/core/optimization/gradientBased/FirstOrderRasmussen.h +++ b/core/optimization/gradientBased/FirstOrderRasmussen.h @@ -7,8 +7,8 @@ #ifndef _NICE_FIRSTORDERRASMUSSENINCLUDE #define _NICE_FIRSTORDERRASMUSSENINCLUDE -#include "core/optimization/gradientBased/OptimizationAlgorithmFirst.h" -#include "core/optimization/gradientBased/OptimizationProblemFirst.h" +#include "OptimizationAlgorithmFirst.h" +#include "OptimizationProblemFirst.h" namespace NICE { diff --git a/core/optimization/gradientBased/FirstOrderTrustRegion.cpp b/core/optimization/gradientBased/FirstOrderTrustRegion.cpp index 8570e6e..37d3284 100644 --- a/core/optimization/gradientBased/FirstOrderTrustRegion.cpp +++ b/core/optimization/gradientBased/FirstOrderTrustRegion.cpp @@ -4,9 +4,9 @@ * See file License for license information. */ /*****************************************************************************/ -#include "core/optimization/gradientBased/FirstOrderTrustRegion.h" +#include "FirstOrderTrustRegion.h" -#include +#include "../..//basics/Log.h" namespace NICE { diff --git a/core/optimization/gradientBased/FirstOrderTrustRegion.h b/core/optimization/gradientBased/FirstOrderTrustRegion.h index f4b017a..dd23cc4 100644 --- a/core/optimization/gradientBased/FirstOrderTrustRegion.h +++ b/core/optimization/gradientBased/FirstOrderTrustRegion.h @@ -9,9 +9,9 @@ #include -#include -#include -#include +#include "../../basics/NonCopyable.h" +#include "OptimizationAlgorithmFirst.h" +#include "TrustRegionBase.h"" namespace NICE { diff --git a/core/optimization/gradientBased/OptimizationAlgorithmFirst.cpp b/core/optimization/gradientBased/OptimizationAlgorithmFirst.cpp index 70a6344..41f0dc9 100644 --- a/core/optimization/gradientBased/OptimizationAlgorithmFirst.cpp +++ b/core/optimization/gradientBased/OptimizationAlgorithmFirst.cpp @@ -4,7 +4,7 @@ * See file License for license information. */ /*****************************************************************************/ -#include "core/optimization/gradientBased/OptimizationAlgorithmFirst.h" +#include "OptimizationAlgorithmFirst.h" namespace NICE { diff --git a/core/optimization/gradientBased/OptimizationAlgorithmFirst.h b/core/optimization/gradientBased/OptimizationAlgorithmFirst.h index dad55a1..045e27a 100644 --- a/core/optimization/gradientBased/OptimizationAlgorithmFirst.h +++ b/core/optimization/gradientBased/OptimizationAlgorithmFirst.h @@ -9,9 +9,9 @@ #include -#include -#include -#include +#include "../..//basics/NonCopyable.h" +#include "OptimizationAlgorithmSecond.h" +#include "OptimizationProblemFirst.h" namespace NICE { diff --git a/core/optimization/gradientBased/OptimizationAlgorithmSecond.cpp b/core/optimization/gradientBased/OptimizationAlgorithmSecond.cpp index 3f4b182..93bcc17 100644 --- a/core/optimization/gradientBased/OptimizationAlgorithmSecond.cpp +++ b/core/optimization/gradientBased/OptimizationAlgorithmSecond.cpp @@ -4,7 +4,7 @@ * See file License for license information. */ /*****************************************************************************/ -#include "core/optimization/gradientBased/OptimizationAlgorithmSecond.h" +#include "OptimizationAlgorithmSecond.h" namespace NICE { diff --git a/core/optimization/gradientBased/OptimizationAlgorithmSecond.h b/core/optimization/gradientBased/OptimizationAlgorithmSecond.h index 8b6cd40..6d3faef 100644 --- a/core/optimization/gradientBased/OptimizationAlgorithmSecond.h +++ b/core/optimization/gradientBased/OptimizationAlgorithmSecond.h @@ -9,8 +9,8 @@ #include -#include -#include +#include "../../basics/NonCopyable.h" +#include "../../optimization/gradientBased/OptimizationProblemSecond.h" namespace NICE { diff --git a/core/optimization/gradientBased/OptimizationProblemFirst.cpp b/core/optimization/gradientBased/OptimizationProblemFirst.cpp index 8fe050c..562fe6e 100644 --- a/core/optimization/gradientBased/OptimizationProblemFirst.cpp +++ b/core/optimization/gradientBased/OptimizationProblemFirst.cpp @@ -4,8 +4,8 @@ * See file License for license information. */ /*****************************************************************************/ -#include "core/optimization/gradientBased/OptimizationProblemFirst.h" -#include +#include "OptimizationProblemFirst.h" +#include "../../basics/tools.h" namespace NICE { diff --git a/core/optimization/gradientBased/OptimizationProblemFirst.h b/core/optimization/gradientBased/OptimizationProblemFirst.h index 325e91f..5fa7c03 100644 --- a/core/optimization/gradientBased/OptimizationProblemFirst.h +++ b/core/optimization/gradientBased/OptimizationProblemFirst.h @@ -9,8 +9,8 @@ #include -#include -#include +#include "../../basics/NonCopyable.h" +#include "../../vector/VectorT.h" namespace NICE { diff --git a/core/optimization/gradientBased/OptimizationProblemSecond.cpp b/core/optimization/gradientBased/OptimizationProblemSecond.cpp index 04dddf1..4e241fd 100644 --- a/core/optimization/gradientBased/OptimizationProblemSecond.cpp +++ b/core/optimization/gradientBased/OptimizationProblemSecond.cpp @@ -4,7 +4,7 @@ * See file License for license information. */ /*****************************************************************************/ -#include "core/optimization/gradientBased/OptimizationProblemSecond.h" +#include "OptimizationProblemSecond.h" namespace NICE { diff --git a/core/optimization/gradientBased/OptimizationProblemSecond.h b/core/optimization/gradientBased/OptimizationProblemSecond.h index 9098372..2a1ba26 100644 --- a/core/optimization/gradientBased/OptimizationProblemSecond.h +++ b/core/optimization/gradientBased/OptimizationProblemSecond.h @@ -9,8 +9,8 @@ #include -#include -#include +#include "../../vector/MatrixT.h" +#include "../../optimization/gradientBased/OptimizationProblemFirst.h" namespace NICE { diff --git a/core/optimization/gradientBased/SecondOrderTrustRegion.cpp b/core/optimization/gradientBased/SecondOrderTrustRegion.cpp index d374347..1dc6708 100644 --- a/core/optimization/gradientBased/SecondOrderTrustRegion.cpp +++ b/core/optimization/gradientBased/SecondOrderTrustRegion.cpp @@ -4,15 +4,15 @@ * See file License for license information. */ /*****************************************************************************/ -#include "core/optimization/gradientBased/SecondOrderTrustRegion.h" +#include "SecondOrderTrustRegion.h" #ifdef NICE_USELIB_LINAL #include #include #endif -#include -#include +#include "../..//basics/Exception.h" +#include "../..//basics/Log.h" namespace NICE { diff --git a/core/optimization/gradientBased/SecondOrderTrustRegion.h b/core/optimization/gradientBased/SecondOrderTrustRegion.h index ab6728a..dbf15ea 100644 --- a/core/optimization/gradientBased/SecondOrderTrustRegion.h +++ b/core/optimization/gradientBased/SecondOrderTrustRegion.h @@ -9,9 +9,9 @@ #include -#include -#include -#include +#include "../../basics/NonCopyable.h" +#include "OptimizationAlgorithmSecond.h" +#include "TrustRegionBase.h" namespace NICE { diff --git a/core/optimization/gradientBased/TrustRegionBase.cpp b/core/optimization/gradientBased/TrustRegionBase.cpp index 0ffc432..36dd1b7 100644 --- a/core/optimization/gradientBased/TrustRegionBase.cpp +++ b/core/optimization/gradientBased/TrustRegionBase.cpp @@ -4,9 +4,9 @@ * See file License for license information. */ /*****************************************************************************/ -#include "core/optimization/gradientBased/TrustRegionBase.h" +#include "TrustRegionBase.h" -#include +#include "../../basics/Log.h" namespace NICE { diff --git a/core/optimization/gradientBased/TrustRegionBase.h b/core/optimization/gradientBased/TrustRegionBase.h index c349211..0001486 100644 --- a/core/optimization/gradientBased/TrustRegionBase.h +++ b/core/optimization/gradientBased/TrustRegionBase.h @@ -9,8 +9,8 @@ #include -#include -#include +#include "../../basics/NonCopyable.h" +#include "OptimizationProblemFirst.h" namespace NICE { diff --git a/core/vector/Algorithms.h b/core/vector/Algorithms.h index d17743c..5f95144 100644 --- a/core/vector/Algorithms.h +++ b/core/vector/Algorithms.h @@ -6,10 +6,10 @@ * See file License for license information. */ -#include "core/vector/ippwrapper.h" -#include "core/vector/VectorT.h" -#include "core/vector/MatrixT.h" -#include "core/vector/RowMatrixT.h" +#include "ippwrapper.h" +#include "VectorT.h" +#include "MatrixT.h" +#include "RowMatrixT.h" #include namespace NICE { @@ -257,7 +257,7 @@ inline double absoluteAngleBetweenVectorsIgnoringDirection( } // namespace //#ifdef __GNUC__ - #include + #include "Algorithms.tcc" //#endif #endif // ALGORITHMS_H diff --git a/core/vector/Algorithms.tcc b/core/vector/Algorithms.tcc index 889261a..7f9b364 100644 --- a/core/vector/Algorithms.tcc +++ b/core/vector/Algorithms.tcc @@ -3,10 +3,10 @@ * - libbasicvector - A simple vector library * See file License for license information. */ -#include "core/vector/Algorithms.h" +#include "Algorithms.h" -#include -#include +#include "../basics/Log.h" +#include "../vector/SVD.h" #ifdef NICE_USELIB_LINAL #include diff --git a/core/vector/Distance.cpp b/core/vector/Distance.cpp index ecc32fd..f761f90 100644 --- a/core/vector/Distance.cpp +++ b/core/vector/Distance.cpp @@ -1,5 +1,5 @@ -#include +#include "Distance.h" namespace NICE { diff --git a/core/vector/Distance.h b/core/vector/Distance.h index 30f94a9..35929f9 100644 --- a/core/vector/Distance.h +++ b/core/vector/Distance.h @@ -9,8 +9,8 @@ #define __VECTOR_DISTANCE_H__ -#include "core/vector/ippwrapper.h" -#include "core/vector/VectorT.h" +#include "ippwrapper.h" +#include "VectorT.h" namespace NICE { @@ -255,7 +255,7 @@ class ScalarProductDistance : public VectorDistance { } // namespace NICE //#ifdef __GNUC__ - #include + #include "Distance.tcc" //#endif #endif // __VECTOR_DISTANCE_H__ diff --git a/core/vector/Eigen.h b/core/vector/Eigen.h index d8f2e8e..0bc6f06 100644 --- a/core/vector/Eigen.h +++ b/core/vector/Eigen.h @@ -5,10 +5,10 @@ * - libbasicvector - A simple vector library * See file License for license information. */ -#include "core/vector/ippwrapper.h" -#include "core/vector/VectorT.h" -#include "core/vector/MatrixT.h" -#include "core/vector/RowMatrixT.h" +#include "ippwrapper.h" +#include "VectorT.h" +#include "MatrixT.h" +#include "RowMatrixT.h" #include namespace NICE { @@ -88,7 +88,7 @@ VectorT *Arnoldi_MGS(const MatrixT &A, size_t nr, VectorT *v=NULL) } //#ifdef __GNUC__ - #include + #include "Eigen.tcc" //#endif #endif // EIGEN_H diff --git a/core/vector/Eigen.tcc b/core/vector/Eigen.tcc index 9b61419..13dd256 100644 --- a/core/vector/Eigen.tcc +++ b/core/vector/Eigen.tcc @@ -3,7 +3,7 @@ * - libbasicvector - A simple vector library * See file License for license information. */ -#include "core/vector/Eigen.h" +#include "Eigen.h" namespace NICE { diff --git a/core/vector/MatrixT.h b/core/vector/MatrixT.h index 81a90f9..d141ac8 100644 --- a/core/vector/MatrixT.h +++ b/core/vector/MatrixT.h @@ -11,16 +11,16 @@ #include #include #include -#include -#include +#include "../basics/numerictools.h" +#include "../basics/Exception.h" //#include #ifdef NICE_USELIB_LINAL #include #include #endif -#include "core/vector/MatrixBase.h" -#include "core/vector/VectorT.h" +#include "MatrixBase.h" +#include "VectorT.h" namespace NICE { @@ -742,7 +742,7 @@ void blockwiseMultiplication ( const MatrixT & A, uint blockSize, const Vecto } //#ifdef __GNUC__ -#include "core/vector/MatrixT.tcc" +#include "MatrixT.tcc" //#endif #endif // _EMATRIX_BASICVECTOR_H diff --git a/core/vector/MatrixT.tcc b/core/vector/MatrixT.tcc index 295ae6e..fd6f957 100644 --- a/core/vector/MatrixT.tcc +++ b/core/vector/MatrixT.tcc @@ -3,10 +3,10 @@ #include #include -#include "core/basics/Exception.h" +#include "../basics/Exception.h" #define _THROW_EMatrix(string) fthrow(Exception, string) -#include "core/vector/ippwrapper.h" -#include "core/vector/MatrixT.h" +#include "ippwrapper.h" +#include "MatrixT.h" #include "vector" #include diff --git a/core/vector/RowMatrixT.h b/core/vector/RowMatrixT.h index babf7e1..e5e681a 100644 --- a/core/vector/RowMatrixT.h +++ b/core/vector/RowMatrixT.h @@ -11,13 +11,13 @@ #include #include #include -#include +#include "../basics/numerictools.h" #ifdef NICE_USELIB_LINAL #include #endif -#include "core/vector/MatrixBase.h" -#include "core/vector/VectorT.h" +#include "MatrixBase.h" +#include "VectorT.h" namespace NICE { @@ -512,7 +512,7 @@ typedef RowMatrixT CharRowMatrix; } //#ifdef __GNUC__ -#include "core/vector/RowMatrixT.tcc" +#include "RowMatrixT.tcc" //#endif #endif // _EROWMATRIX_BASICVECTOR_H diff --git a/core/vector/RowMatrixT.tcc b/core/vector/RowMatrixT.tcc index 86b3a1f..adb08f5 100644 --- a/core/vector/RowMatrixT.tcc +++ b/core/vector/RowMatrixT.tcc @@ -1,10 +1,10 @@ #include #include #include -#include "core/basics/Exception.h" +#include "../basics/Exception.h" #define _THROW_ERowMatrix(string) fthrow(Exception, string) -#include "core/vector/ippwrapper.h" -#include "core/vector/RowMatrixT.h" +#include "ippwrapper.h" +#include "RowMatrixT.h" namespace NICE { diff --git a/core/vector/SVD.h b/core/vector/SVD.h index 926b487..8aab5fd 100644 --- a/core/vector/SVD.h +++ b/core/vector/SVD.h @@ -6,9 +6,9 @@ #ifndef BASICVECTOR_SVD_H #define BASICVECTOR_SVD_H -#include "core/vector/VectorT.h" -#include "core/vector/MatrixT.h" -#include "core/vector/RowMatrixT.h" +#include "VectorT.h" +#include "MatrixT.h" +#include "RowMatrixT.h" #ifdef NICE_USELIB_LINAL #include diff --git a/core/vector/SparseVectorT.h b/core/vector/SparseVectorT.h index ad5008f..e99e3e7 100644 --- a/core/vector/SparseVectorT.h +++ b/core/vector/SparseVectorT.h @@ -12,8 +12,8 @@ #include #include -#include "core/basics/Persistent.h" -#include "core/vector/VectorT.h" +#include "../basics/Persistent.h" +#include "VectorT.h" namespace NICE { @@ -209,7 +209,7 @@ typedef SparseVectorT SparseVector; } // namespace -#include "core/vector/SparseVectorT.tcc" +#include "SparseVectorT.tcc" diff --git a/core/vector/SparseVectorT.tcc b/core/vector/SparseVectorT.tcc index e779489..31abf6f 100644 --- a/core/vector/SparseVectorT.tcc +++ b/core/vector/SparseVectorT.tcc @@ -10,7 +10,7 @@ #include -#include "core/vector/SparseVectorT.h" +#include "SparseVectorT.h" namespace NICE { template diff --git a/core/vector/VVector.h b/core/vector/VVector.h index 9b7b0e3..155a2ba 100644 --- a/core/vector/VVector.h +++ b/core/vector/VVector.h @@ -11,7 +11,7 @@ #include #include "VectorT.h" #include "MatrixT.h" -#include "core/basics/Persistent.h" +#include "../basics/Persistent.h" diff --git a/core/vector/VectorT.h b/core/vector/VectorT.h index 3ca816c..8e91f98 100644 --- a/core/vector/VectorT.h +++ b/core/vector/VectorT.h @@ -13,9 +13,9 @@ #include // needed for ptrdiff_t -#include "core/vector/ippwrapper.h" +#include "ippwrapper.h" -#include +#include "../basics/binstream.h" #ifdef NICE_USELIB_LINAL #include @@ -25,7 +25,7 @@ #include #endif -#include "core/vector/VectorBase.h" +#include "VectorBase.h" namespace NICE { @@ -950,11 +950,11 @@ inline VectorT operator* ( double s, const VectorT & x ) } // namespace -#include "core/vector/MatrixT.h" -#include "core/vector/RowMatrixT.h" +#include "MatrixT.h" +#include "RowMatrixT.h" //#ifdef __GNUC__ -#include "core/vector/VectorT.tcc" +#include "VectorT.tcc" //#endif #endif // _EVECTOR_BASICVECTOR_H diff --git a/core/vector/VectorT.tcc b/core/vector/VectorT.tcc index ec67f13..2c93e95 100644 --- a/core/vector/VectorT.tcc +++ b/core/vector/VectorT.tcc @@ -4,11 +4,11 @@ #include #include #include -#include "core/basics/Exception.h" +#include "../basics/Exception.h" #define _THROW_EVector(string) fthrow(Exception, string) -#include "core/vector/ippwrapper.h" -#include "core/vector/VectorT.h" -#include "core/vector/MatrixT.h" +#include "ippwrapper.h" +#include "VectorT.h" +#include "MatrixT.h" #include diff --git a/core/vector/ippwrapper.cpp b/core/vector/ippwrapper.cpp index f99c8f3..d9e137c 100644 --- a/core/vector/ippwrapper.cpp +++ b/core/vector/ippwrapper.cpp @@ -1,4 +1,4 @@ -#include "core/vector/ippwrapper.h" +#include "ippwrapper.h" #ifndef NICE_USELIB_IPP const char *ippGetStatusString(IppStatus status) diff --git a/core/vector/ippwrapper.h b/core/vector/ippwrapper.h index c556811..3129556 100644 --- a/core/vector/ippwrapper.h +++ b/core/vector/ippwrapper.h @@ -124,7 +124,7 @@ const char *ippGetStatusString(IppStatus status); #endif // !NICE_USELIB_IPP //#ifdef __GNUC__ - #include + #include "ippwrapper.tcc" //#endif #endif diff --git a/core/vector/ippwrapper.tcc b/core/vector/ippwrapper.tcc index 9cc7ae1..62b1743 100644 --- a/core/vector/ippwrapper.tcc +++ b/core/vector/ippwrapper.tcc @@ -1,5 +1,5 @@ -#include -#include +#include "ippwrapper.h" +#include "../basics/RoundToNearest.h" #include #include #include From 6449971e2b88dddd4f06e539ed49c83ae1d02dcf Mon Sep 17 00:00:00 2001 From: Kastor Date: Tue, 17 Jun 2014 17:10:29 +0200 Subject: [PATCH 2/2] removed define that triggred regex lib usage --- core/basics/StringTools.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/basics/StringTools.cpp b/core/basics/StringTools.cpp index 407a871..cd9acfe 100644 --- a/core/basics/StringTools.cpp +++ b/core/basics/StringTools.cpp @@ -16,8 +16,6 @@ #include "StringTools.h" -#define NICE_USELIB_REGEX - #ifdef NICE_USELIB_REGEX #include #endif