Skip to content

Commit c483411

Browse files
alexbruyalexbruy
committed
Merge pull request #2447 from NaturalGIS/fix_saga_220_kriging
[processing] fix SAGA 2.2.0 kriging
2 parents 6b3eddd + 1937677 commit c483411

File tree

4 files changed

+37
-20
lines changed

4 files changed

+37
-20
lines changed

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

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Ordinary Kriging (Global)
1+
Universal Kriging
22
statistics_kriging
33
ParameterVector|POINTS|Points|0|False
4-
ParameterTableField|ZFIELD|Attribute|POINTS|-1|False
4+
ParameterTableField|FIELD|Attribute|POINTS|-1|False
55
ParameterSelection|TQUALITY|Type of Quality Measure|[0] standard deviation;[1] variance
66
ParameterBoolean|LOG|Logarithmic Transformation|True
77
ParameterBoolean|BLOCK|Block Kriging|True
@@ -10,9 +10,18 @@ ParameterNumber|VAR_MAXDIST|Maximum Distance|None|None|-1.0
1010
ParameterNumber|VAR_NCLASSES|Lag Distance Classes|1|None|100
1111
ParameterNumber|VAR_NSKIP|Skip|1|None|1
1212
ParameterString|VAR_MODEL|Variogram Model|a + b * x
13+
ParameterSelection|SEARCH_RANGE|Search Range|[0] local;[1] global
14+
ParameterNumber|SEARCH_RADIUS|Maximum Search Distance|0|None|1000
15+
ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance
16+
ParameterNumber|SEARCH_POINTS_MIN|Minimum|1|None|4
17+
ParameterNumber|SEARCH_POINTS_MAX|Maximum|1|None|20
18+
ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
19+
ParameterMultipleInput|PREDICTORS|Predictors|3|True
20+
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
21+
ParameterBoolean|COORDS|Coordinates|False
1322
Hardcoded|-TARGET_DEFINITION 0
1423
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
1524
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
1625
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
1726
OutputRaster|TARGET_PREDICTION|Prediction
18-
OutputRaster|TARGET_VARIANCE|Quality Measure
27+
OutputRaster|TARGET_VARIANCE|Quality Measure

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
Ordinary Kriging
22
statistics_kriging
33
ParameterVector|POINTS|Points|0|False
4-
ParameterTableField|ZFIELD|Attribute|POINTS|-1|False
5-
Hardcoded|-TARGET_DEFINITION 0
4+
ParameterTableField|FIELD|Attribute|POINTS|-1|False
65
ParameterSelection|TQUALITY|Type of Quality Measure|[0] standard deviation;[1] variance
76
ParameterBoolean|LOG|Logarithmic Transformation|True
87
ParameterBoolean|BLOCK|Block Kriging|True
@@ -17,6 +16,7 @@ ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of near
1716
ParameterNumber|SEARCH_POINTS_MIN|Minimum|1|None|4
1817
ParameterNumber|SEARCH_POINTS_MAX|Maximum|1|None|20
1918
ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
19+
Hardcoded|-TARGET_DEFINITION 0
2020
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
2121
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
2222
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells

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

+21-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
Universal Kriging (Global)
1+
Regression Kriging
22
statistics_kriging
33
ParameterVector|POINTS|Points|0|False
4-
ParameterTableField|ZFIELD|Attribute|POINTS|-1|False
4+
ParameterTableField|FIELD|Attribute|POINTS|-1|False
5+
ParameterMultipleInput|PREDICTORS|Predictors|3|False
6+
OutputRaster|REGRESSION|Regression
7+
OutputRaster|PREDICTION|Prediction
8+
OutputRaster|RESIDUALS|Residuals
9+
OutputRaster|VARIANCE|Quality Measure
510
ParameterSelection|TQUALITY|Type of Quality Measure|[0] standard deviation;[1] variance
611
ParameterBoolean|LOG|Logarithmic Transformation|True
712
ParameterBoolean|BLOCK|Block Kriging|True
@@ -10,12 +15,18 @@ ParameterNumber|VAR_MAXDIST|Maximum Distance|None|None|-1.0
1015
ParameterNumber|VAR_NCLASSES|Lag Distance Classes|1|None|100
1116
ParameterNumber|VAR_NSKIP|Skip|1|None|1
1217
ParameterString|VAR_MODEL|Variogram Model|a + b * x
13-
ParameterMultipleInput|GRIDS|Input Grids|3|True
18+
OutputTable|INFO_COEFF|Regression: Coefficients
19+
OutputTable|INFO_MODEL|Regression: Model
20+
OutputTable|INFO_STEPS|Regression: Steps
21+
ParameterBoolean|COORD_X|Include X Coordinate|False
22+
ParameterBoolean|COORD_Y|Include Y Coordinate|False
23+
ParameterBoolean|INTERCEPT|Intercept|True
24+
ParameterSelection|METHOD|Method|[0] include all;[1] forward;[2] backward;[3] stepwise|3
25+
ParameterNumber|P_VALUES|Significance Level|0|100.0|5.0
1426
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
15-
ParameterBoolean|COORDS|Coordinates|False
16-
Hardcoded|-TARGET_DEFINITION 0
17-
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
18-
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
19-
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
20-
OutputRaster|TARGET_PREDICTION|Prediction
21-
OutputRaster|TARGET_VARIANCE|Quality Measure
27+
ParameterSelection|SEARCH_RANGE|Search Range|[0] local;[1] global
28+
ParameterNumber|SEARCH_RADIUS|Maximum Search Distance|0|None|1000
29+
ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance
30+
ParameterNumber|SEARCH_POINTS_MIN|Minimum|1|None|4
31+
ParameterNumber|SEARCH_POINTS_MAX|Maximum|1|None|20
32+
ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Universal Kriging
1+
Simple Kriging
22
statistics_kriging
33
ParameterVector|POINTS|Points|0|False
4-
ParameterTableField|ZFIELD|Attribute|POINTS|-1|False
4+
ParameterTableField|FIELD|Attribute|POINTS|-1|False
55
ParameterSelection|TQUALITY|Type of Quality Measure|[0] standard deviation;[1] variance
66
ParameterBoolean|LOG|Logarithmic Transformation|True
77
ParameterBoolean|BLOCK|Block Kriging|True
@@ -10,9 +10,6 @@ ParameterNumber|VAR_MAXDIST|Maximum Distance|None|None|-1.0
1010
ParameterNumber|VAR_NCLASSES|Lag Distance Classes|1|None|100
1111
ParameterNumber|VAR_NSKIP|Skip|1|None|1
1212
ParameterString|VAR_MODEL|Variogram Model|a + b * x
13-
ParameterMultipleInput|GRIDS|Input Grids|3|True
14-
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
15-
ParameterBoolean|COORDS|Coordinates|False
1613
ParameterSelection|SEARCH_RANGE|Search Range|[0] local;[1] global
1714
ParameterNumber|SEARCH_RADIUS|Maximum Search Distance|0|None|1000
1815
ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance

0 commit comments

Comments
 (0)