[GRASS-SVN] r72552 - grass/branches/releasebranch_7_4/imagery/i.vi

[svn_grass at osgeo.org]

Author: veroandreo
Date: 2018-03-24 04:32:54 -0700 (Sat, 24 Mar 2018)
New Revision: 72552

Modified:
   grass/branches/releasebranch_7_4/imagery/i.vi/i.vi.html
   grass/branches/releasebranch_7_4/imagery/i.vi/msavi2.c
Log:
i.vi: corrected MSAVI2 equation according to https://doi.org/10.1016/0034-4257(94)90134-1, see #3385 (trunk, r72549)

Modified: grass/branches/releasebranch_7_4/imagery/i.vi/i.vi.html
===================================================================
--- grass/branches/releasebranch_7_4/imagery/i.vi/i.vi.html	2018-03-24 11:31:02 UTC (rev 72551)
+++ grass/branches/releasebranch_7_4/imagery/i.vi/i.vi.html	2018-03-24 11:32:54 UTC (rev 72552)
@@ -179,7 +179,7 @@
 <div class="code"><pre>
 msavi2( redchan, nirchan )
 
-MSAVI2 = (1/2)*(2(NIR+1)-sqrt((2*NIR+1)^2-8(NIR-red)))
+MSAVI2 = (1/2)*(2*NIR+1-sqrt((2*NIR+1)^2-8*(NIR-red)))
 </pre></div>
 
 <p>

Modified: grass/branches/releasebranch_7_4/imagery/i.vi/msavi2.c
===================================================================
--- grass/branches/releasebranch_7_4/imagery/i.vi/msavi2.c	2018-03-24 11:31:02 UTC (rev 72551)
+++ grass/branches/releasebranch_7_4/imagery/i.vi/msavi2.c	2018-03-24 11:32:54 UTC (rev 72552)
@@ -15,7 +15,7 @@
     }
     else 
     {
-	result=0.5*(2*(nirchan+1)-sqrt((2*nirchan+1)*(2*nirchan+1)-8*(nirchan-redchan)));
+	result=0.5*(2*nirchan+1-sqrt((2*nirchan+1)*(2*nirchan+1)-8*(nirchan-redchan)));
     }
     return result;
 }