Commit 4620a2592feeb86b6e4c5a29720fcb2338c61ebf

Authored by Arthur Vincent
2 parents eb3f7fdf 1cb789b9

REFAC : pull merge conflict in iota2FeatureExtraction.h

Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
include/iota2FeatureExtraction.h
... ... @@ -116,10 +116,10 @@ public:
116 116 auto red = *(inIt+m_RedIndex-1);
117 117 auto nir = *(inIt+m_NIRIndex-1);
118 118 auto swir = *(inIt+m_SWIRIndex-1);
119   - auto ndvi = std::fabs(nir-red)<10e-6?ValueType{0}:(nir-red)/(nir+red);
120   - auto ndwi = std::fabs(nir-red)<10e-6?ValueType{0}:(swir-nir)/(swir+nir);
121   - //auto ndvi = std::fabs(nir-red)<10e-6?ValueType{0}:std::fabs(nir+red)<10e-6?ValueType{0}(nir-red)/(nir+red);
122   - //auto ndwi = std::fabs(swir-nir)<10e-6?ValueType{0}:std::fabs(swir+nir)<10e-6?ValueType{0}(swir-nir)/(swir+nir);
  119 + auto ndvi = std::fabs(nir+red)<10e-6?
  120 + ValueType{0}:(nir-red)/(nir+red);
  121 + auto ndwi = std::fabs(swir+nir)<10e-6?
  122 + ValueType{0}:(swir-nir)/(swir+nir);
123 123 decltype(inVec) tmpVec(m_ComponentsPerDate);
124 124 std::transform(inIt, inIt+m_ComponentsPerDate,tmpVec.begin(),
125 125 [](decltype(*inIt)x){ return x*x;});
... ...