From 0c3ae789aa208424fa37fcd2df482aba0ec3164b Mon Sep 17 00:00:00 2001 From: remicres <remi.cresson@teledetection.fr> Date: Tue, 6 Sep 2016 13:32:23 +0000 Subject: [PATCH] DOC: update TODOs and other comments --- app/otbLSGRM.cxx | 4 +--- include/lsgrmController.txx | 8 +------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/otbLSGRM.cxx b/app/otbLSGRM.cxx index 245ba4e..f3c0bdc 100644 --- a/app/otbLSGRM.cxx +++ b/app/otbLSGRM.cxx @@ -217,9 +217,7 @@ private: void DoExecute() { /* - To add: - the output directory in case the global graph cannot fit in memory - TODO: It seems to be a cast-related bug when changing the output pixel type (e.g. uint16) ! + TODO: the output directory in case the global graph cannot fit in memory (lsgrmController.txx) */ // Input image diff --git a/include/lsgrmController.txx b/include/lsgrmController.txx index c5a8708..48a7b45 100644 --- a/include/lsgrmController.txx +++ b/include/lsgrmController.txx @@ -47,7 +47,7 @@ void Controller<TSegmenter>::RunSegmentation() { this->GetAutomaticConfiguration(); } - else if (m_TilingMode == LSGRM_TILING_USER) + else // m_TilingMode is LSGRM_TILING_USER { m_NbTilesX = std::floor(m_InputImage->GetLargestPossibleRegion().GetSize()[0] / m_TileWidth); m_NbTilesY = std::floor(m_InputImage->GetLargestPossibleRegion().GetSize()[1] / m_TileHeight); @@ -99,14 +99,12 @@ void Controller<TSegmenter>::RunSegmentation() isFusion); #ifdef OTB_USE_MPI - // Gathering useful variables GatherUsefulVariables(accumulatedMemory, isFusion); #endif // Time monitoring ShowTime(t); - while(accumulatedMemory > m_Memory && isFusion) { isFusion = false; @@ -122,11 +120,7 @@ void Controller<TSegmenter>::RunSegmentation() m_InputImage->GetNumberOfComponentsPerPixel(), isFusion); - std::cout << "accumulatedMemory=" << accumulatedMemory << std::endl; - - #ifdef OTB_USE_MPI - // Gathering useful variables GatherUsefulVariables(accumulatedMemory, isFusion); #endif -- GitLab