Skip to content

Commit 20a8b37

Browse files
alexbruyalexbruy
committed
Merge pull request #2444 from NaturalGIS/fix_saga_212_kriging
[processing] fix SAGA 2.1.2 kriging
2 parents 0461cbd + be56358 commit 20a8b37

File tree

4 files changed

+59
-63
lines changed

4 files changed

+59
-63
lines changed

‎python/plugins/processing/algs/saga/description/2.1.2/OrdinaryKriging(Global).txt

+15-18
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
Ordinary Kriging (Global)
22
statistics_kriging
3-
ParameterVector|SHAPES|Points|0|False
4-
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
5-
ParameterBoolean|BVARIANCE |Create Variance Grid|True
3+
ParameterVector|POINTS|Points|0|False
4+
ParameterTableField|ZFIELD|Attribute|SHAPES|-1|False
65
Hardcoded|-TARGET 0
7-
ParameterSelection|MODEL|Variogram Model|[0] Spherical Model;[1] Exponential Model;[2] Gaussian Model;[3] Linear Regression;[4] Exponential Regression;[5] Power Function Regression
8-
ParameterBoolean|BLOCK |Block Kriging|True
6+
ParameterSelection|TQUALITY|Type of Quality Measure|[0] standard deviation;[1] variance
7+
ParameterBoolean|LOG|Logarithmic Transformation|True
8+
ParameterBoolean|BLOCK|Block Kriging|True
99
ParameterNumber|DBLOCK|Block Size|1|None|100
10-
ParameterBoolean|BLOG |Logarithmic Transformation|True
11-
ParameterNumber|NUGGET|Nugget|None|None|0.0
12-
ParameterNumber|SILL|Sill|None|None|0.0
13-
ParameterNumber|RANGE|Range|None|None|0.0
14-
ParameterNumber|LIN_B|Linear Regression|None|None|1.0
15-
ParameterNumber|EXP_B|Exponential Regression|None|None|0.1
16-
ParameterNumber|POW_A|Power Function - A|None|None|1.0
17-
ParameterNumber|POW_B|Power Function - B|None|None|0.5
18-
ParameterNumber|USER_CELL_SIZE|Grid Size|0|None|1.0
19-
ParameterBoolean|USER_FIT_EXTENT |Fit Extent|True
20-
Extent USER_X_EXTENT_MIN USER_X_EXTENT_MAX USER_Y_EXTENT_MIN USER_Y_EXTENT_MIN
21-
OutputRaster|GRID|Grid
22-
OutputRaster|VARIANCE|Variance
10+
ParameterNumber|VAR_MAXDIST|Maximum Distance|None|None|-1.0
11+
ParameterNumber|VAR_NCLASSES|Lag Distance Classes|1|None|100
12+
ParameterNumber|VAR_NSKIP|Skip|1|None|1
13+
ParameterString|VAR_MODEL|Variogram Model|a + b * x
14+
ParameterBoolean|USER_BVARIANCE|Create Quality Grid|True
15+
Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
16+
ParameterNumber|USER_SIZE|Grid Size|0|None|100.0
17+
ParameterSelection|USER_FIT|Search Direction|[0] nodes;[1] cells
18+
OutputRaster|USER_GRID|Grid
19+
OutputRaster|USER_VARIANCE|Variance

‎python/plugins/processing/algs/saga/description/2.1.2/OrdinaryKriging.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ParameterVector|POINTS|Points|0|False
44
ParameterTableField|ZFIELD|Attribute|POINTS|-1|False
55
Hardcoded|-TARGET 0
66
ParameterSelection|TQUALITY|Type of Quality Measure|[0] standard deviation;[1] variance
7-
ParameterBoolean|LOG |Logarithmic Transformation|True
8-
ParameterBoolean|BLOCK |Block Kriging|True
7+
ParameterBoolean|LOG|Logarithmic Transformation|True
8+
ParameterBoolean|BLOCK|Block Kriging|True
99
ParameterNumber|DBLOCK|Block Size|0|None|100
1010
ParameterNumber|VAR_MAXDIST|Maximum Distance|None|None|-1.0
1111
ParameterNumber|VAR_NCLASSES|Lag Distance Classes|1|None|100
@@ -17,9 +17,9 @@ ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of near
1717
ParameterNumber|SEARCH_POINTS_MIN|Minimum|1|None|4
1818
ParameterNumber|SEARCH_POINTS_MAX|Maximum|1|None|20
1919
ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
20-
ParameterBoolean|USER_BVARIANCE |Create Quality Grid|True
20+
ParameterBoolean|USER_BVARIANCE|Create Quality Grid|True
2121
Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
22-
ParameterNumber|USER_SIZE|Cellsize|0|None|1.0
22+
ParameterNumber|USER_SIZE|Cellsize|0|None|100.0
2323
ParameterSelection|USER_FIT|Search Direction|[0] nodes;[1] cells
2424
OutputRaster|USER_GRID|Grid
25-
OutputRaster|USER_VARIANCE|Variance
25+
OutputRaster|USER_VARIANCE|Variance

‎python/plugins/processing/algs/saga/description/2.1.2/UniversalKriging(Global).txt

+16-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
Universal Kriging (Global)
22
statistics_kriging
3-
ParameterVector|SHAPES|Points|0|False
4-
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
5-
ParameterBoolean|BVARIANCE |Create Variance Grid|True
3+
ParameterVector|POINTS|Points|0|False
4+
ParameterTableField|ZFIELD|Attribute|SHAPES|-1|False
65
Hardcoded|-TARGET 0
7-
ParameterSelection|MODEL|Variogram Model|[0] Spherical Model;[1] Exponential Model;[2] Gaussian Model;[3] Linear Regression;[4] Exponential Regression;[5] Power Function Regression
6+
ParameterSelection|TQUALITY|Type of Quality Measure|[0] standard deviation;[1] variance
7+
ParameterBoolean|LOG|Logarithmic Transformation|True
88
ParameterBoolean|BLOCK|Block Kriging|True
99
ParameterNumber|DBLOCK|Block Size|1|None|100
10-
ParameterBoolean|BLOG|Logarithmic Transformation|True
11-
ParameterNumber|NUGGET|Nugget|None|None|0.0
12-
ParameterNumber|SILL|Sill|None|None|0.0
13-
ParameterNumber|RANGE|Range|None|None|0.0
14-
ParameterNumber|LIN_B|Linear Regression|None|None|1
15-
ParameterNumber|EXP_B|Exponential Regression|None|None|0.5
16-
ParameterNumber|POW_A|Power Function - A|None|None|1.0
17-
ParameterNumber|POW_B|Power Function - B|None|None|0.1
18-
ParameterMultipleInput|GRIDS|Grids|3|False
10+
ParameterNumber|VAR_MAXDIST|Maximum Distance|None|None|-1.0
11+
ParameterNumber|VAR_NCLASSES|Lag Distance Classes|1|None|100
12+
ParameterNumber|VAR_NSKIP|Skip|1|None|1
13+
ParameterString|VAR_MODEL|Variogram Model|a + b * x
14+
ParameterMultipleInput|GRIDS|Input Grids|3|True
1915
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
20-
ParameterNumber|USER_CELL_SIZE|Grid Size|0|None|1.0
21-
ParameterBoolean|USER_FIT_EXTENT |Fit Extent|True
22-
Extent USER_X_EXTENT_MIN USER_X_EXTENT_MAX USER_Y_EXTENT_MIN USER_Y_EXTENT_MIN
23-
OutputRaster|GRID|Grid
24-
OutputRaster|VARIANCE|Variance
16+
ParameterBoolean|COORDS|Coordinates|False
17+
ParameterBoolean|USER_BVARIANCE|Create Quality Grid|True
18+
Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
19+
ParameterNumber|USER_SIZE|Grid Size|0|None|100.0
20+
ParameterSelection|USER_FIT|Search Direction|[0] nodes;[1] cells
21+
OutputRaster|USER_GRID|Grid
22+
OutputRaster|USER_VARIANCE|Variance

‎python/plugins/processing/algs/saga/description/2.1.2/UniversalKriging.txt

+23-22
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
Universal Kriging
22
statistics_kriging
3-
ParameterVector|SHAPES|Points|0|False
4-
ParameterTableField|FIELD|Attribute|SHAPES|-1|False
5-
ParameterBoolean|BVARIANCE |Create Variance Grid|True
3+
ParameterVector|POINTS|Points|0|False
4+
ParameterTableField|ZFIELD|Attribute|POINTS|-1|False
65
Hardcoded|-TARGET 0
7-
ParameterSelection|MODEL|Variogram Model|[0] Spherical Model;[1] Exponential Model;[2] Gaussian Model;[3] Linear Regression;[4] Exponential Regression;[5] Power Function Regression
8-
ParameterBoolean|BLOCK |Block Kriging|True
6+
ParameterSelection|TQUALITY|Type of Quality Measure|[0] standard deviation;[1] variance
7+
ParameterBoolean|LOG|Logarithmic Transformation|True
8+
ParameterBoolean|BLOCK|Block Kriging|True
99
ParameterNumber|DBLOCK|Block Size|0|None|100
10-
ParameterBoolean|BLOG |Logarithmic Transformation|True
11-
ParameterNumber|NUGGET|Nugget|None|None|0.0
12-
ParameterNumber|SILL|Sill|None|None|0.0
13-
ParameterNumber|RANGE|Range|None|None|0.0
14-
ParameterNumber|LIN_B|Linear Regression|None|None|1.0
15-
ParameterNumber|EXP_B|Exponential Regression|None|None|0.1
16-
ParameterNumber|POW_A|Power Function - A|None|None|1
17-
ParameterNumber|POW_B|Power Function - B|None|None|0.5
18-
ParameterMultipleInput|GRIDS|Grids|3.0|False
10+
ParameterNumber|VAR_MAXDIST|Maximum Distance|None|None|-1.0
11+
ParameterNumber|VAR_NCLASSES|Lag Distance Classes|1|None|100
12+
ParameterNumber|VAR_NSKIP|Skip|1|None|1
13+
ParameterString|VAR_MODEL|Variogram Model|a + b * x
14+
ParameterMultipleInput|GRIDS|Input Grids|3|True
1915
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
20-
ParameterNumber|NPOINTS_MIN|Min.Number of m_Points|None|None|4
21-
ParameterNumber|NPOINTS_MAX|Max. Number of m_Points|None|None|20
22-
ParameterNumber|MAXRADIUS|Maximum Search Radius (map units)|None|None|1000.0
23-
ParameterNumber|USER_CELL_SIZE|Grid Size|0|None|1.0
24-
ParameterBoolean|USER_FIT_EXTENT |Fit Extent|True
25-
Extent USER_X_EXTENT_MIN USER_X_EXTENT_MAX USER_Y_EXTENT_MIN USER_Y_EXTENT_MIN
26-
OutputRaster|GRID|Grid
27-
OutputRaster|VARIANCE|Variance
16+
ParameterBoolean|COORDS|Coordinates|False
17+
ParameterSelection|SEARCH_RANGE|Search Range|[0] local;[1] global
18+
ParameterNumber|SEARCH_RADIUS|Maximum Search Distance|0|None|1000
19+
ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance
20+
ParameterNumber|SEARCH_POINTS_MIN|Minimum|1|None|4
21+
ParameterNumber|SEARCH_POINTS_MAX|Maximum|1|None|20
22+
ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
23+
ParameterBoolean|USER_BVARIANCE|Create Quality Grid|True
24+
Extent USER_XMIN USER_XMAX USER_YMIN USER_YMAX
25+
ParameterNumber|USER_SIZE|Grid Size|0|None|100.0
26+
ParameterSelection|USER_FIT|Search Direction|[0] nodes;[1] cells
27+
OutputRaster|USER_GRID|Grid
28+
OutputRaster|USER_VARIANCE|Variance

0 commit comments

Comments
 (0)