Commit 77f784b12a51316aa1c28c04bcf8d62db2868ed8

Authored by Jordi Inglada
1 parent 035c16b4
Exists in master

ENH: update for use of gapfilling and modules

src/CMakeLists.txt
... ... @@ -43,7 +43,6 @@ include(${CMAKE_ROOT}/Modules/Dart.cmake)
43 43  
44 44 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
45 45  
46   -include(${OTB_SOURCE_DIR}/CMake/OTBWrapperMacros.cmake)
47 46 set(TEMP ${otb-mlv_BINARY_DIR}/Testing/Temporary)
48 47 add_subdirectory(applications)
49   -add_subdirectory(testing)
50 48 \ No newline at end of file
  49 +add_subdirectory(testing)
... ...
src/applications/BVProfileMetrics.h
... ... @@ -17,7 +17,7 @@
17 17 #include <vector>
18 18 #include <fstream>
19 19  
20   -#include "dateUtils.h"
  20 +#include "otbDateUtils.h"
21 21 #include "phenoFunctions.h"
22 22  
23 23 using PrecisionType = double;
... ... @@ -35,7 +35,7 @@ T square(T x)
35 35  
36 36 int date_to_doy(std::string& date_str)
37 37 {
38   - return pheno::doy(pheno::make_date(date_str));
  38 + return GapFilling::doy(GapFilling::make_date(date_str));
39 39 }
40 40  
41 41 std::tuple<std::vector<std::string>, VectorType, VectorType>
... ...
src/applications/CMakeLists.txt
... ... @@ -14,8 +14,8 @@
14 14  
15 15 OTB_CREATE_APPLICATION(NAME TransitionStatistics
16 16 SOURCES TransitionStatistics.cxx
17   - LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters)
  17 + LINK_LIBRARIES ${OTB_LIBRARIES})
18 18  
19 19 OTB_CREATE_APPLICATION(NAME BVProfileMetrics
20 20 SOURCES BVProfileMetrics.cxx
21   - LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters;${PHENOTB_LIBRARY})
22 21 \ No newline at end of file
  22 + LINK_LIBRARIES ${OTB_LIBRARIES};${PHENOTB_LIBRARY})
... ...
src/testing/CMakeLists.txt
... ... @@ -28,4 +28,4 @@ set(MLVTests_SRCS
28 28 mlvProfileMetricsTest.cxx)
29 29  
30 30 add_executable(otbMLVTests ${MLVTests_SRCS})
31   -target_link_libraries(otbMLVTests OTBCommon OTBIO OTBTesting ${PHENOTB_LIBRARY})
  31 +target_link_libraries(otbMLVTests ${OTB_LIBRARIES} ${PHENOTB_LIBRARY})
... ...