Skip to content

Commit

Permalink
re-enable some disabled test and fix broken r.describe algorithm
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbruy authored and nyalldawson committed Jul 15, 2019
1 parent 2ba112f commit f3dd208
Show file tree
Hide file tree
Showing 14 changed files with 15,405 additions and 391 deletions.
Expand Up @@ -4,7 +4,6 @@ Raster (r.*)
QgsProcessingParameterRasterLayer|map|input raster layer|None|False
QgsProcessingParameterString|null_value|String representing NULL value|*|False|True
QgsProcessingParameterNumber|nsteps|Number of quantization steps|QgsProcessingParameterNumber.Integer|255|True|1|None
QgsProcessingParameterEnum|sort|Sort output by distance|asc;desc|False|0|True
QgsProcessingParameterBoolean|-r|Only print the range of the data|False
QgsProcessingParameterBoolean|-n|Suppress reporting of any NULLs|False
QgsProcessingParameterBoolean|-d|Use the current region|False
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

188 changes: 0 additions & 188 deletions python/plugins/processing/tests/testdata/expected/grass7/r.stats.txt

This file was deleted.

This file was deleted.

@@ -0,0 +1,71 @@
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head><body><p>
</br>+------------------------------------------------------------------------------+
</br>| COINCIDENCE TABULATION REPORT |
</br>|------------------------------------------------------------------------------|
</br>| Location: temp_location Mapset: PERMANENT Date: Mon Jul 15 10:21:14 |
</br>| |
</br>| Layer 1: rast_5d2c296a54-- |
</br>| Layer 2: rast_5d2c296a54-- |
</br>| Mask: none |
</br>| |
</br>| Units: percent cover |
</br>|------------------------------------------------------------------------------|
</br>| Window: North: 6693700 |
</br>| West: 344500 East: 358400 |
</br>| South: 6682800 |
</br>+------------------------------------------------------------------------------+
</br>
</br>Panel #1 of 2
</br>+--------------------------------------------------------------------+
</br>| | rast_5d2c296a5499012 | Panel Row Total |
</br>| cat# | 1 | 2 | 3 | w cat 0 | w/o cat 0 |
</br>|--------------------------------------------------------------------|
</br>|r 1 | 0.29 | 1.55 | 5.10 | 6.94 | 6.94 |
</br>|a 2 | 0.12 | 0.69 | 2.36 | 3.17 | 3.17 |
</br>|s 3 | 0.28 | 1.39 | 5.50 | 7.17 | 7.17 |
</br>|t 4 | 0.36 | 2.20 | 8.22 | 10.78 | 10.78 |
</br>|_ 5 | 0.30 | 1.35 | 5.04 | 6.69 | 6.69 |
</br>|5 6 | 0.61 | 3.89 | 12.91 | 17.42 | 17.42 |
</br>|--------------------------------------------------------------------|
</br>|Total | | | | | |
</br>|with 0 | 1.96 | 11.08 | 39.13 | 52.17 | 52.17 |
</br>|--------------------------------------------------------------------|
</br>|w/o 0 | 1.96 | 11.08 | 39.13 | 52.17 | 52.17 |
</br>+--------------------------------------------------------------------+
</br>
</br>Panel #2 of 2
</br>+--------------------------------------------+
</br>| | rast_5d2c296a5499012| Panel Row Total |
</br>| cat# | 4 | w cat 0 | w/o cat 0 |
</br>|--------------------------------------------|
</br>|r 1 | 6.14 | 6.14 | 6.14 |
</br>|a 2 | 2.81 | 2.81 | 2.81 |
</br>|s 3 | 6.59 | 6.59 | 6.59 |
</br>|t 4 | 8.86 | 8.86 | 8.86 |
</br>|_ 5 | 6.14 | 6.14 | 6.14 |
</br>|5 6 | 15.31 | 15.31 | 15.31 |
</br>|--------------------------------------------|
</br>|Total | | | |
</br>|with 0 | 45.85 | 45.85 | 45.85 |
</br>|--------------------------------------------|
</br>|w/o 0 | 45.85 | 45.85 | 45.85 |
</br>+--------------------------------------------+
</br>
</br>+--------------------------------+
</br>| | Table Row Total |
</br>| cat# | w cat 0 | w/o cat 0 |
</br>|--------------------------------|
</br>|r 1 | 13.08 | 13.08 |
</br>|a 2 | 5.98 | 5.98 |
</br>|s 3 | 13.75 | 13.75 |
</br>|t 4 | 19.64 | 19.64 |
</br>|_ 5 | 12.83 | 12.83 |
</br>|5 6 | 32.73 | 32.73 |
</br>|--------------------------------|
</br>|Total | | |
</br>|with 0 | 98.02 | 98.02 |
</br>|--------------------------------|
</br>|w/o 0 | 98.02 | 98.02 |
</br>+--------------------------------+
</br>
</br></p></body></html>
@@ -0,0 +1,5 @@
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head><body><p>N = 14743
</br>1.000000 0.018635 -0.000101
</br>0.018635 1.000000 -0.012230
</br>-0.000101 -0.012230 1.000000
</br></p></body></html>
@@ -0,0 +1 @@
0 1-6
@@ -0,0 +1,34 @@
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head><body><p> +----------------------------------------------------------------------------+
</br> | Map: rast_5d2c2bb6a52ed3 Date: Mon Jul 15 10:31:02 2019 |
</br> | Mapset: PERMANENT Login of Creator: alex |
</br> | Location: temp_location |
</br> | DataBase: /tmp/processing_196bdf4c941d49fd9a8ac7a1b15bb07d/grassdata |
</br> | Title: |
</br> | Timestamp: none |
</br> |----------------------------------------------------------------------------|
</br> | |
</br> | Type of Map: GDAL-link Number of Categories: 0 |
</br> | Data Type: FCELL |
</br> | Rows: 109 |
</br> | Columns: 139 |
</br> | Total Cells: 15151 |
</br> | Projection: unnamed |
</br> | N: 6693700 S: 6682800 Res: 100 |
</br> | E: 358400 W: 344500 Res: 100 |
</br> | Range of data: min = -303 max = 14847 |
</br> | |
</br> | Data Source: |
</br> | /home/alex/devel/qgis/python/plugins/processing/tests/testdata/custom/g |
</br> | |
</br> | |
</br> | Data Description: |
</br> | generated by r.external |
</br> | |
</br> | Comments: |
</br> | r.external --overwrite -o input="/home/alex/devel/qgis/python/plugin\ |
</br> | s/processing/tests/testdata/custom/grass7/float_raster.tif" output="\ |
</br> | rast_5d2c2bb6a52ed3" band=1 |
</br> | |
</br> +----------------------------------------------------------------------------+
</br>
</br></p></body></html>

0 comments on commit f3dd208

Please sign in to comment.