Merge branch 'validation' into develop

Makefile

@@ -78,7 +78,7 @@ FORCE_EXE = force force-cube force-higher-level force-import-modis \
             force-procmask force-pyramid force-qai-inflate force-stack \
             force-synthmix force-tabulate-grid force-tile-extent \
             force-tile-finder force-train force-level2-report force-cube-init \
-			force-init force-datacube-size force-hist
+			force-init force-datacube-size force-hist force-stratified-sample
 
 FORCE_MISC = force-level2-report.Rmd
 
@@ -118,8 +118,8 @@ cross: string_cl enum_cl cite_cl utils_cl alloc_cl brick_cl imagefuns_cl param_c
 lower: table_ll param_ll meta_ll cube_ll equi7_ll glance7_ll atc_ll sunview_ll read_ll radtran_ll topo_ll cloud_ll gas_ll brdf_ll atmo_ll aod_ll resmerge_ll coreg_ll coregfuns_ll acix_ll modwvp_ll
 higher: param_hl progress_hl tasks_hl read-aux_hl read-ard_hl quality_hl bap_hl level3_hl cso_hl tsa_hl index_hl interpolate_hl stm_hl fold_hl standardize_hl pheno_hl polar_hl trend_hl ml_hl texture_hl lsm_hl lib_hl sample_hl imp_hl cfimp_hl l2imp_hl spec-adjust_hl pyp_hl rsp_hl udf_hl
 aux: param_aux param_train_aux train_aux
-exe: force force-parameter force-qai-inflate force-tile-finder force-tabulate-grid force-l2ps force-higher-level force-train force-lut-modis force-mdcp force-stack force-import-modis force-cube-init force-hist
-.PHONY: temp all install install_ bash python external clean build check
+exe: force force-parameter force-qai-inflate force-tile-finder force-tabulate-grid force-l2ps force-higher-level force-train force-lut-modis force-mdcp force-stack force-import-modis force-cube-init force-hist force-stratified-sample
+.PHONY: temp all install install_ bash python rstats external clean build check
 
 ### TEMP
 
@@ -427,6 +427,9 @@ force-cube-init: temp cross lower  $(DA)/_init-cube.c
 force-hist: temp cross $(DA)/_hist.c
 	$(G11) $(CFLAGS) $(GDAL) $(GSL) $(CURL) -o $(TB)/force-hist $(DA)/_hist.c $(TC)/*.o $(TL)/*.o $(LDGDAL) $(LDGSL) $(LDCURL)
 
+force-stratified-sample: temp cross $(DA)/_stratified-sample.c
+	$(G11) $(CFLAGS) $(GDAL) $(GSL) $(CURL) -o $(TB)/force-stratified-sample $(DA)/_stratified-sample.c $(TC)/*.o $(TL)/*.o $(LDGDAL) $(LDGSL) $(LDCURL)
+
 ### dummy code for testing stuff  
 
 dummy: temp cross aux higher src/dummy.c
@@ -475,6 +478,8 @@ python: temp
 
 rstats: temp
 	cp $(DR)/force-level2-report.Rmd $(TM)/force-level2-report.Rmd
+	cp $(DR)/force-sample-size.r $(TB)/force-sample-size
+	cp $(DR)/force-map-accuracy.r $(TB)/force-map-accuracy
 
 install: bash python rstats external install_ clean check
 

docs/source/history/vdev.rst

@@ -68,7 +68,20 @@ Develop version
 
   - new auxilliary program `force-hist`.
     This program computes the histogram of image values (can be vrt) and writes a csv table.
-    This is intended to be used in a validation workflow (planned feature).
+    This is intended to be used in a validation workflow.
+
+  - new auxilliary program `force-sample-size`.
+    This program computes the required sample size following Olofsson et al. 2013/2014, 
+    which should be used to properly validate a classification map.
+    This is intended to be used in a validation workflow.
+
+  - new auxilliary program `force-stratified-sample`.
+    This program draws a stratified random sample based on a classification map and sample size computations.
+    This is intended to be used in a validation workflow.
+
+  - new auxilliary program `force-map-accuracy`.
+    This program computes area-adjusted accuracies following Olofsson et al. 2013/2014.
+    This is intended to be used in a validation workflow.
 
   - ``force-tabulate-grid`` has been updated to produce properly named output files.
     The default output file name is ``grid.kml``, created in the current directory, using the ``KML`` format.