Skip to content
Permalink
Browse files

[processing][SAGA] Resync kriging parameters with saga manual

And remove duplicate kriging algorithms, add tests

Fixes #18191
  • Loading branch information
nyalldawson committed Jun 4, 2018
1 parent 268aa17 commit 1bc1790b7bcb550819af1d5dec860174239db2eb

This file was deleted.

@@ -5,20 +5,20 @@ QgsProcessingParameterField|FIELD|Attribute|None|POINTS|-1|False|False
QgsProcessingParameterEnum|TQUALITY|Type of Quality Measure|[0] standard deviation;[1] variance
QgsProcessingParameterBoolean|LOG|Logarithmic Transformation|True
QgsProcessingParameterBoolean|BLOCK|Block Kriging|True
QgsProcessingParameterNumber|DBLOCK|Block Size|QgsProcessingParameterNumber.Integer|100|False|0|None
QgsProcessingParameterNumber|VAR_MAXDIST|Maximum Distance|QgsProcessingParameterNumber.Integer|-1.0|False|None|None
QgsProcessingParameterNumber|DBLOCK|Block Size|QgsProcessingParameterNumber.Double|100|False|0|None
QgsProcessingParameterNumber|VAR_MAXDIST|Maximum Distance|QgsProcessingParameterNumber.Double|-1.0|False|None|None
QgsProcessingParameterNumber|VAR_NCLASSES|Lag Distance Classes|QgsProcessingParameterNumber.Integer|100|False|1|None
QgsProcessingParameterNumber|VAR_NSKIP|Skip|QgsProcessingParameterNumber.Integer|1|False|1|None
QgsProcessingParameterString|VAR_MODEL|Variogram Model|a + b * x
Hardcoded|-TARGET_DEFINITION 0
QgsProcessingParameterExtent|TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX|Output extent|None|True
QgsProcessingParameterNumber|TARGET_USER_SIZE|Cellsize|QgsProcessingParameterNumber.Double|100.0|False|None|None
QgsProcessingParameterNumber|TARGET_USER_SIZE|Cellsize|QgsProcessingParameterNumber.Double|1.0|False|0|None
QgsProcessingParameterEnum|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
QgsProcessingParameterRasterDestination|PREDICTION|Prediction
QgsProcessingParameterRasterDestination|VARIANCE|Quality Measure
QgsProcessingParameterRasterDestination|VARIANCE|Quality Measure|None|True
QgsProcessingParameterEnum|SEARCH_RANGE|Search Range|[0] local;[1] global
QgsProcessingParameterNumber|SEARCH_RADIUS|Maximum Search Distance|QgsProcessingParameterNumber.Integer|1000|False|0|None
QgsProcessingParameterNumber|SEARCH_RADIUS|Maximum Search Distance|QgsProcessingParameterNumber.Double|1000|False|0|None
QgsProcessingParameterEnum|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance
QgsProcessingParameterNumber|SEARCH_POINTS_MIN|Minimum|QgsProcessingParameterNumber.Integer|4|False|1|None
QgsProcessingParameterNumber|SEARCH_POINTS_MIN|Minimum|QgsProcessingParameterNumber.Integer|16|False|1|None
QgsProcessingParameterNumber|SEARCH_POINTS_MAX|Maximum|QgsProcessingParameterNumber.Integer|20|False|1|None
QgsProcessingParameterEnum|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
@@ -5,19 +5,19 @@ QgsProcessingParameterField|FIELD|Attribute|None|POINTS|-1|False|False
QgsProcessingParameterMultipleLayers|PREDICTORS|Predictors|3|None|False
QgsProcessingParameterRasterDestination|REGRESSION|Regression
QgsProcessingParameterRasterDestination|PREDICTION|Prediction
QgsProcessingParameterRasterDestination|RESIDUALS|Residuals
QgsProcessingParameterRasterDestination|VARIANCE|Quality Measure
QgsProcessingParameterRasterDestination|RESIDUALS|Residuals|None|True
QgsProcessingParameterRasterDestination|VARIANCE|Quality Measure|None|True
QgsProcessingParameterVectorDestination|INFO_COEFF|Regression: Coefficients|0|None|True
QgsProcessingParameterVectorDestination|INFO_MODEL|Regression: Model|0|None|True
QgsProcessingParameterVectorDestination|INFO_STEPS|Regression: Steps|0|None|True
QgsProcessingParameterEnum|TQUALITY|Type of Quality Measure|[0] standard deviation;[1] variance|False|0
QgsProcessingParameterBoolean|LOG|Logarithmic Transformation|False
QgsProcessingParameterBoolean|BLOCK|Block Kriging|False
QgsProcessingParameterNumber|DBLOCK|Block Size|QgsProcessingParameterNumber.Double|100.000000|False|0.000000|None
QgsProcessingParameterNumber|VAR_MAXDIST|Maximum Distance|QgsProcessingParameterNumber.Integer|-1.000000|False|None|None
QgsProcessingParameterNumber|VAR_MAXDIST|Maximum Distance|QgsProcessingParameterNumber.Double|-1.000000|False|None|None
QgsProcessingParameterNumber|VAR_NCLASSES|Lag Distance Classes|QgsProcessingParameterNumber.Integer|100|False|1|None
QgsProcessingParameterNumber|VAR_NSKIP|Skip|QgsProcessingParameterNumber.Integer|1|False|1|None
QgsProcessingParameterString|VAR_MODEL|Variogram Model
QgsProcessingParameterFeatureSource|INFO_COEFF|Regression: Coefficients|5|None|True
QgsProcessingParameterFeatureSource|INFO_MODEL|Regression: Model|5|None|True
QgsProcessingParameterFeatureSource|INFO_STEPS|Regression: Steps|5|None|True
QgsProcessingParameterString|VAR_MODEL|Variogram Model|a + b * x
QgsProcessingParameterBoolean|COORD_X|Include X Coordinate|False
QgsProcessingParameterBoolean|COORD_Y|Include Y Coordinate|False
QgsProcessingParameterBoolean|INTERCEPT|Intercept|True
@@ -6,17 +6,17 @@ QgsProcessingParameterEnum|TQUALITY|Type of Quality Measure|[0] standard deviati
QgsProcessingParameterBoolean|LOG|Logarithmic Transformation|False
QgsProcessingParameterBoolean|BLOCK|Block Kriging|False
QgsProcessingParameterNumber|DBLOCK|Block Size|QgsProcessingParameterNumber.Double|100.000000|False|0.000000|None
QgsProcessingParameterNumber|VAR_MAXDIST|Maximum Distance|QgsProcessingParameterNumber.Integer|-1.000000|False|None|None
QgsProcessingParameterNumber|VAR_MAXDIST|Maximum Distance|QgsProcessingParameterNumber.Double|-1.000000|False|None|None
QgsProcessingParameterNumber|VAR_NCLASSES|Lag Distance Classes|QgsProcessingParameterNumber.Integer|100|False|1|None
QgsProcessingParameterNumber|VAR_NSKIP|Skip|QgsProcessingParameterNumber.Integer|1|False|1|None
QgsProcessingParameterString|VAR_MODEL|Model
QgsProcessingParameterString|VAR_MODEL|Model|a + b * x
Hardcoded|-TARGET_DEFINITION 0
QgsProcessingParameterExtent|TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX|Output extent|None|True
QgsProcessingParameterNumber|TARGET_USER_SIZE|Cellsize|QgsProcessingParameterNumber.Double|100.0|False|None|None
QgsProcessingParameterEnum|TARGET_USER_FITS|Fit|[0] nodes;[1] cells|False|0
QgsProcessingParameterRasterLayer|TARGET_TEMPLATE|Target System|None|True
QgsProcessingParameterRasterDestination|PREDICTION|Prediction
QgsProcessingParameterRasterDestination|VARIANCE|Quality Measure
QgsProcessingParameterRasterDestination|VARIANCE|Quality Measure|None|True
QgsProcessingParameterEnum|SEARCH_RANGE|Search Range|[0] local;[1] global|False|0
QgsProcessingParameterNumber|SEARCH_RADIUS|Maximum Search Distance|QgsProcessingParameterNumber.Double|1000.000000|False|0.000000|None
QgsProcessingParameterEnum|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance|False|0

This file was deleted.

@@ -1,24 +1,24 @@
Simple Kriging
Universal Kriging
statistics_kriging
QgsProcessingParameterFeatureSource|POINTS|Points|0|None|False
QgsProcessingParameterField|FIELD|Attribute|None|POINTS|-1|False|False
QgsProcessingParameterEnum|TQUALITY|Type of Quality Measure|[0] standard deviation;[1] variance
QgsProcessingParameterBoolean|LOG|Logarithmic Transformation|True
QgsProcessingParameterBoolean|BLOCK|Block Kriging|True
QgsProcessingParameterNumber|DBLOCK|Block Size|QgsProcessingParameterNumber.Integer|100|False|0|None
QgsProcessingParameterNumber|VAR_MAXDIST|Maximum Distance|QgsProcessingParameterNumber.Integer|-1.0|False|None|None
QgsProcessingParameterNumber|DBLOCK|Block Size|QgsProcessingParameterNumber.Double|100|False|0|None
QgsProcessingParameterNumber|VAR_MAXDIST|Maximum Distance|QgsProcessingParameterNumber.Double|-1.0|False|None|None
QgsProcessingParameterNumber|VAR_NCLASSES|Lag Distance Classes|QgsProcessingParameterNumber.Integer|100|False|1|None
QgsProcessingParameterNumber|VAR_NSKIP|Skip|QgsProcessingParameterNumber.Integer|1|False|1|None
QgsProcessingParameterString|VAR_MODEL|Variogram Model|a + b * x
Hardcoded|-TARGET_DEFINITION 0
QgsProcessingParameterExtent|TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX|Output extent|None|True
QgsProcessingParameterNumber|TARGET_USER_SIZE|Cellsize|QgsProcessingParameterNumber.Double|100.0|False|None|None
QgsProcessingParameterNumber|TARGET_USER_SIZE|Cellsize|QgsProcessingParameterNumber.Double|1.0|False|0|None
QgsProcessingParameterEnum|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
QgsProcessingParameterRasterDestination|PREDICTION|Prediction
QgsProcessingParameterRasterDestination|VARIANCE|Quality Measure
QgsProcessingParameterRasterDestination|VARIANCE|Quality Measure|None|True
QgsProcessingParameterEnum|SEARCH_RANGE|Search Range|[0] local;[1] global
QgsProcessingParameterNumber|SEARCH_RADIUS|Maximum Search Distance|QgsProcessingParameterNumber.Integer|1000|False|0|None
QgsProcessingParameterNumber|SEARCH_RADIUS|Maximum Search Distance|QgsProcessingParameterNumber.Double|1000|False|0|None
QgsProcessingParameterEnum|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance
QgsProcessingParameterNumber|SEARCH_POINTS_MIN|Minimum|QgsProcessingParameterNumber.Integer|4|False|1|None
QgsProcessingParameterNumber|SEARCH_POINTS_MIN|Minimum|QgsProcessingParameterNumber.Integer|16|False|1|None
QgsProcessingParameterNumber|SEARCH_POINTS_MAX|Maximum|QgsProcessingParameterNumber.Integer|20|False|1|None
QgsProcessingParameterEnum|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
QgsProcessingParameterEnum|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
@@ -127,3 +127,97 @@ tests:
RESULT:
hash: a11f159696f5726eedaa16e872fd2582cf8a88c8c1d84d72560e4647
type: rasterhash

- algorithm: saga:simplekriging
name: Simple kriging
params:
BLOCK: true
DBLOCK: 1.0
FIELD: elev
LOG: false
POINTS:
name: pointsz.gml
type: vector
SEARCH_DIRECTION: 0
SEARCH_POINTS_ALL: 0
SEARCH_POINTS_MAX: 10
SEARCH_POINTS_MIN: 3
SEARCH_RADIUS: 5.0
SEARCH_RANGE: 0
TARGET_USER_FITS: 0
TARGET_USER_SIZE: 1.0
TQUALITY: 0
VAR_MAXDIST: -1.0
VAR_MODEL: a + b * x
VAR_NCLASSES: 100
VAR_NSKIP: 1
results:
PREDICTION:
hash: a1f5a1d369cef86332a914442c444d1c0753e471523cb838d0b2bc09
type: rasterhash
VARIANCE:
hash: 4f0378da7f0ff16326b6c404a202b004b66dbffcda38f42544a11490
type: rasterhash

- algorithm: saga:ordinarykriging
name: Ordinary Kriging
params:
BLOCK: true
DBLOCK: 1.0
FIELD: elev
LOG: true
POINTS:
name: pointsz.gml
type: vector
SEARCH_DIRECTION: 0
SEARCH_POINTS_ALL: 0
SEARCH_POINTS_MAX: 10
SEARCH_POINTS_MIN: 3
SEARCH_RADIUS: 5.0
SEARCH_RANGE: 0
TARGET_USER_FITS: 0
TARGET_USER_SIZE: 1.0
TQUALITY: 0
VAR_MAXDIST: -1.0
VAR_MODEL: a + b * x
VAR_NCLASSES: 100
VAR_NSKIP: 1
results:
PREDICTION:
hash: 0fff15c98a1c5af9eab6c242559a5f4484a7a40f5be399899b24fd39
type: rasterhash
VARIANCE:
hash: ec7b708609178533ac2b89cd575140415ef93c70396fa630d1c15b67
type: rasterhash

- algorithm: saga:universalkriging
name: Universal Kriging
params:
BLOCK: true
DBLOCK: 1.0
FIELD: elev
LOG: true
POINTS:
name: pointsz.gml
type: vector
SEARCH_DIRECTION: 0
SEARCH_POINTS_ALL: 0
SEARCH_POINTS_MAX: 10
SEARCH_POINTS_MIN: 3
SEARCH_RADIUS: 5.0
SEARCH_RANGE: 0
TARGET_USER_FITS: 0
TARGET_USER_SIZE: 1.0
TQUALITY: 0
VAR_MAXDIST: -1.0
VAR_MODEL: a + b * x
VAR_NCLASSES: 100
VAR_NSKIP: 1
results:
PREDICTION:
hash: 0fff15c98a1c5af9eab6c242559a5f4484a7a40f5be399899b24fd39
type: rasterhash
VARIANCE:
hash: ec7b708609178533ac2b89cd575140415ef93c70396fa630d1c15b67
type: rasterhash

0 comments on commit 1bc1790

Please sign in to comment.
You can’t perform that action at this time.