Skip to content

Commit eb9f44d

Browse files
giomangioman
committedSep 28, 2017
fix few SAGA modules
·
final-2_18_28final-2_18_14
1 parent 75afe3f commit eb9f44d

10 files changed

+40
-35
lines changed
 

‎python/plugins/processing/algs/saga/SagaNameDecorator.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def decoratedGroupName(name):
155155
'Threshold Buffer': 'Threshold raster buffer',
156156
'Transform Shapes': 'Transform vector layer',
157157
'Transpose Grids': 'Transpose Raster layers',
158-
'Union': 'Polygon uUnion',
158+
'Union': 'Polygon Union',
159159
'Update': 'Polygon update',
160160
'Upslope Area': 'Upslope Area',
161161
'Zonal Grid Statistics': 'Zonal raster statistics'}

‎python/plugins/processing/algs/saga/description/AddGridValuestoPoints.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ Add Grid Values to Points
22
shapes_grid
33
ParameterVector|SHAPES|Points|0|False
44
ParameterMultipleInput|GRIDS|Grids|3|False
5-
ParameterSelection|INTERPOL|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
5+
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
66
OutputVector|RESULT|Result
77
AllowUnmatching

‎python/plugins/processing/algs/saga/description/AddGridValuestoShapes.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ Add Grid Values to Shapes
22
shapes_grid
33
ParameterVector|SHAPES|Shapes|-1|False
44
ParameterMultipleInput|GRIDS|Grids|3|False
5-
ParameterSelection|INTERPOL|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
5+
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
66
OutputVector|RESULT|Result
77
AllowUnmatching

‎python/plugins/processing/algs/saga/description/MultipleRegressionAnalysis(GridGrids).txt

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
Multiple Regression Analysis (Grid/Grids)
1+
Multiple Regression Analysis (Grid and Predictor Grids)
22
statistics_regression
33
ParameterRaster|DEPENDENT|Dependent|False
4-
ParameterMultipleInput|GRIDS|Grids|3|False
5-
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
6-
ParameterBoolean|COORD_X |Include X Coordinate|True
7-
ParameterBoolean|COORD_Y |Include Y Coordinate|True
4+
ParameterMultipleInput|PREDICTORS|Predictors|3|False
5+
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
6+
ParameterBoolean|COORD_X|Include X Coordinate|True
7+
ParameterBoolean|COORD_Y|Include Y Coordinate|True
88
ParameterSelection|METHOD|Method|[0] include all;[1] forward;[2] backward;[3] stepwise
9-
ParameterNumber|P_IN|P in|None|None|5
10-
ParameterNumber|P_OUT|P out|None|None|5
9+
ParameterNumber|P_VALUE|Significance Level|0.0|100.0|5.0
10+
ParameterSelection|CROSSVAL|Cross Validation|[0] None;[1] leave one out;[2] 2-fold;[3] k-fold
11+
ParameterNumber|CROSSVAL_K|Cross Validation Subsamples|2|None|10
1112
OutputRaster|REGRESSION|Regression
1213
OutputRaster|RESIDUALS|Residuals
1314
OutputTable|INFO_COEFF|Details: Coefficients
1415
OutputTable|INFO_MODEL|Details: Model
15-
OutputTable|INFO_STEPS|Details: Steps
16+
OutputTable|INFO_STEPS|Details: Steps

‎python/plugins/processing/algs/saga/description/MultipleRegressionAnalysis(PointsGrids).txt

+13-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
Multiple Regression Analysis (Points/Grids)
1+
Multiple Regression Analysis (Points and Predictor Grids)
22
statistics_regression
3-
ParameterMultipleInput|GRIDS|Grids|3|False
4-
ParameterVector|SHAPES|Shapes|-1|False
5-
ParameterTableField|ATTRIBUTE|Attribute|SHAPES|-1|False
6-
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
7-
ParameterBoolean|COORD_X |Include X Coordinate|True
8-
ParameterBoolean|COORD_Y |Include Y Coordinate|True
3+
ParameterMultipleInput|PREDICTORS|Predictors|3|False
4+
ParameterVector|POINTS|Shapes|-1|False
5+
ParameterTableField|ATTRIBUTE|Attribute|POINTS|-1|False
6+
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
7+
ParameterBoolean|COORD_X|Include X Coordinate|True
8+
ParameterBoolean|COORD_Y|Include Y Coordinate|True
9+
ParameterBoolean|INTERCEPT|Intercept|True
910
ParameterSelection|METHOD|Method|[0] include all;[1] forward;[2] backward;[3] stepwise
10-
ParameterNumber|P_IN|P in|None|None|5
11-
ParameterNumber|P_OUT|P out|None|None|5
11+
ParameterNumber|P_VALUE|Significance Level|0.0|100.0|5.0
12+
ParameterSelection|CROSSVAL|Cross Validation|[0] None;[1] leave one out;[2] 2-fold;[3] k-fold
13+
ParameterNumber|CROSSVAL_K|Cross Validation Subsamples|2|None|10
14+
ParameterSelection|RESIDUAL_COR|Residual Interpolation|[0] Multleve B-Spline Interpolation;[1] Inverse Distance Weighted
1215
OutputTable|INFO_COEFF|Details: Coefficients
1316
OutputTable|INFO_MODEL|Details: Model
1417
OutputTable|INFO_STEPS|Details: Steps
1518
OutputVector|RESIDUALS|Residuals
1619
OutputRaster|REGRESSION|Regression
20+
OutputRaster|REGRESCORR|Regression with Residual Correction

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ ParameterNumber|SEARCH_POINTS_MIN|Minimum|1|None|4
2323
ParameterNumber|SEARCH_POINTS_MAX|Maximum|1|None|20
2424
ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
2525
ParameterMultipleInput|PREDICTORS|Predictors|3|True
26-
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
27-
ParameterBoolean|COORDS|Coordinates|False
26+
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
27+
ParameterBoolean|COORDS|Coordinates|False

‎python/plugins/processing/algs/saga/description/Patching.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ Patching
22
grid_tools
33
ParameterRaster|ORIGINAL|Grid|False
44
ParameterRaster|ADDITIONAL|Patch Grid|False
5-
ParameterSelection|INTERPOLATION|Interpolation Method|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
6-
OutputRaster|COMPLETED|Completed Grid
5+
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
6+
OutputRaster|COMPLETED|Completed Grid

‎python/plugins/processing/algs/saga/description/RegressionAnalysis(PointsGrid).txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Regression analysis|Regression Analysis (Points/Grid)
1+
Regression Analysis (Points and Predictor Grid)
22
statistics_regression
3-
ParameterRaster|GRID|Grid|False
4-
ParameterVector|SHAPES|Shapes|-1|False
5-
ParameterTableField|ATTRIBUTE|Attribute|SHAPES|-1|False
6-
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
3+
ParameterRaster|PREDICTOR|Predictor|False
4+
ParameterVector|POINTS|Shapes|-1|False
5+
ParameterTableField|ATTRIBUTE|Attribute|POINTS|-1|False
6+
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
77
ParameterSelection|METHOD|Regression Function|[0] Y = a + b * X (linear);[1] Y = a + b / X;[2] Y = a / (b - X);[3] Y = a * X^b (power);[4] Y = a e^(b * X) (exponential);[5] Y = a + b * ln(X) (logarithmic)
88
OutputRaster|REGRESSION|Regression
9-
OutputVector|RESIDUAL|Residuals
9+
OutputVector|RESIDUAL|Residuals

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ParameterBoolean|COORD_Y|Include Y Coordinate|False
2323
ParameterBoolean|INTERCEPT|Intercept|True
2424
ParameterSelection|METHOD|Method|[0] include all;[1] forward;[2] backward;[3] stepwise|3
2525
ParameterNumber|P_VALUE|Significance Level|0|100.0|5.0
26-
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
26+
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
2727
ParameterSelection|SEARCH_RANGE|Search Range|[0] local;[1] global
2828
ParameterNumber|SEARCH_RADIUS|Maximum Search Distance|0|None|1000
2929
ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance

‎python/plugins/processing/algs/saga/description/ZonalMultipleRegressionAnalysis(PointsandPredictorGrids).txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ statistics_regression
33
ParameterMultipleInput|PREDICTORS|Predictors|3|False
44
ParameterVector|ZONES|Zones|-1|False
55
ParameterVector|POINTS|Points|-1|False
6-
ParameterTable|ATTRIBUTE|Dependent Variable|False
7-
OutputVector|RESIDUALS|Residuals
8-
OutputRaster|REGRESSION|Regression
6+
ParameterTableField|ATTRIBUTE|Dependent Variable|POINTS|-1|False
97
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbour;[1] Bilinear Interpolation;[2] Bicubic Spline Interpolation;[3] B-Spline Interpolation| 3
108
ParameterBoolean|COORD_X|Include X Coordinate|False
119
ParameterBoolean|COORD_Y|Include Y Coordinate|False
1210
ParameterBoolean|INTERCEPT|Intercept|True
1311
ParameterSelection|METHOD|Method|[0] include all;[1] forward;[2] backward;[3] stepwise| 3
14-
ParameterNumber|P_VALUE|Significance Level| 0.000000| 100.000000| 5.000000
12+
ParameterNumber|P_VALUE|Significance Level| 0.000000| 100.000000| 5.000000
13+
OutputVector|RESIDUALS|Residuals
14+
OutputRaster|REGRESSION|Regression

0 commit comments

Comments
 (0)
Please sign in to comment.