Skip to content

Commit

Permalink
fix few SAGA modules
Browse files Browse the repository at this point in the history
  • Loading branch information
@gioman
gioman committed Sep 28, 2017
1 parent 75afe3f commit eb9f44d
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 35 deletions.
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/saga/SagaNameDecorator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def decoratedGroupName(name):
'Threshold Buffer': 'Threshold raster buffer',
'Transform Shapes': 'Transform vector layer',
'Transpose Grids': 'Transpose Raster layers',
'Union': 'Polygon uUnion',
'Union': 'Polygon Union',
'Update': 'Polygon update',
'Upslope Area': 'Upslope Area',
'Zonal Grid Statistics': 'Zonal raster statistics'}
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/saga/description/AddGridValuestoPoints.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Add Grid Values to Points
shapes_grid
ParameterVector|SHAPES|Points|0|False
ParameterMultipleInput|GRIDS|Grids|3|False
ParameterSelection|INTERPOL|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
OutputVector|RESULT|Result
AllowUnmatching
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/saga/description/AddGridValuestoShapes.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Add Grid Values to Shapes
shapes_grid
ParameterVector|SHAPES|Shapes|-1|False
ParameterMultipleInput|GRIDS|Grids|3|False
ParameterSelection|INTERPOL|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
OutputVector|RESULT|Result
AllowUnmatching
17 changes: 9 additions & 8 deletions python/plugins/processing/algs/saga/description/MultipleRegressionAnalysis(GridGrids).txt
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
Multiple Regression Analysis (Grid/Grids)
Multiple Regression Analysis (Grid and Predictor Grids)
statistics_regression
ParameterRaster|DEPENDENT|Dependent|False
ParameterMultipleInput|GRIDS|Grids|3|False
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
ParameterBoolean|COORD_X |Include X Coordinate|True
ParameterBoolean|COORD_Y |Include Y Coordinate|True
ParameterMultipleInput|PREDICTORS|Predictors|3|False
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
ParameterBoolean|COORD_X|Include X Coordinate|True
ParameterBoolean|COORD_Y|Include Y Coordinate|True
ParameterSelection|METHOD|Method|[0] include all;[1] forward;[2] backward;[3] stepwise
ParameterNumber|P_IN|P in|None|None|5
ParameterNumber|P_OUT|P out|None|None|5
ParameterNumber|P_VALUE|Significance Level|0.0|100.0|5.0
ParameterSelection|CROSSVAL|Cross Validation|[0] None;[1] leave one out;[2] 2-fold;[3] k-fold
ParameterNumber|CROSSVAL_K|Cross Validation Subsamples|2|None|10
OutputRaster|REGRESSION|Regression
OutputRaster|RESIDUALS|Residuals
OutputTable|INFO_COEFF|Details: Coefficients
OutputTable|INFO_MODEL|Details: Model
OutputTable|INFO_STEPS|Details: Steps
OutputTable|INFO_STEPS|Details: Steps
22 changes: 13 additions & 9 deletions python/plugins/processing/algs/saga/description/MultipleRegressionAnalysis(PointsGrids).txt
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
Multiple Regression Analysis (Points/Grids)
Multiple Regression Analysis (Points and Predictor Grids)
statistics_regression
ParameterMultipleInput|GRIDS|Grids|3|False
ParameterVector|SHAPES|Shapes|-1|False
ParameterTableField|ATTRIBUTE|Attribute|SHAPES|-1|False
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
ParameterBoolean|COORD_X |Include X Coordinate|True
ParameterBoolean|COORD_Y |Include Y Coordinate|True
ParameterMultipleInput|PREDICTORS|Predictors|3|False
ParameterVector|POINTS|Shapes|-1|False
ParameterTableField|ATTRIBUTE|Attribute|POINTS|-1|False
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
ParameterBoolean|COORD_X|Include X Coordinate|True
ParameterBoolean|COORD_Y|Include Y Coordinate|True
ParameterBoolean|INTERCEPT|Intercept|True
ParameterSelection|METHOD|Method|[0] include all;[1] forward;[2] backward;[3] stepwise
ParameterNumber|P_IN|P in|None|None|5
ParameterNumber|P_OUT|P out|None|None|5
ParameterNumber|P_VALUE|Significance Level|0.0|100.0|5.0
ParameterSelection|CROSSVAL|Cross Validation|[0] None;[1] leave one out;[2] 2-fold;[3] k-fold
ParameterNumber|CROSSVAL_K|Cross Validation Subsamples|2|None|10
ParameterSelection|RESIDUAL_COR|Residual Interpolation|[0] Multleve B-Spline Interpolation;[1] Inverse Distance Weighted
OutputTable|INFO_COEFF|Details: Coefficients
OutputTable|INFO_MODEL|Details: Model
OutputTable|INFO_STEPS|Details: Steps
OutputVector|RESIDUALS|Residuals
OutputRaster|REGRESSION|Regression
OutputRaster|REGRESCORR|Regression with Residual Correction
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/saga/description/OrdinaryKriging(Global).txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ ParameterNumber|SEARCH_POINTS_MIN|Minimum|1|None|4
ParameterNumber|SEARCH_POINTS_MAX|Maximum|1|None|20
ParameterSelection|SEARCH_DIRECTION|Search Direction|[0] all directions;[1] quadrants
ParameterMultipleInput|PREDICTORS|Predictors|3|True
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
ParameterBoolean|COORDS|Coordinates|False
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
ParameterBoolean|COORDS|Coordinates|False
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/saga/description/Patching.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Patching
grid_tools
ParameterRaster|ORIGINAL|Grid|False
ParameterRaster|ADDITIONAL|Patch Grid|False
ParameterSelection|INTERPOLATION|Interpolation Method|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
OutputRaster|COMPLETED|Completed Grid
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
OutputRaster|COMPLETED|Completed Grid
12 changes: 6 additions & 6 deletions python/plugins/processing/algs/saga/description/RegressionAnalysis(PointsGrid).txt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Regression analysis|Regression Analysis (Points/Grid)
Regression Analysis (Points and Predictor Grid)
statistics_regression
ParameterRaster|GRID|Grid|False
ParameterVector|SHAPES|Shapes|-1|False
ParameterTableField|ATTRIBUTE|Attribute|SHAPES|-1|False
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
ParameterRaster|PREDICTOR|Predictor|False
ParameterVector|POINTS|Shapes|-1|False
ParameterTableField|ATTRIBUTE|Attribute|POINTS|-1|False
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
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)
OutputRaster|REGRESSION|Regression
OutputVector|RESIDUAL|Residuals
OutputVector|RESIDUAL|Residuals
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/saga/description/UniversalKriging(Global).txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ParameterBoolean|COORD_Y|Include Y Coordinate|False
ParameterBoolean|INTERCEPT|Intercept|True
ParameterSelection|METHOD|Method|[0] include all;[1] forward;[2] backward;[3] stepwise|3
ParameterNumber|P_VALUE|Significance Level|0|100.0|5.0
ParameterSelection|INTERPOL|Grid Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation
ParameterSelection|SEARCH_RANGE|Search Range|[0] local;[1] global
ParameterNumber|SEARCH_RADIUS|Maximum Search Distance|0|None|1000
ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance
Expand Down
8 changes: 4 additions & 4 deletions ...essing/algs/saga/description/ZonalMultipleRegressionAnalysis(PointsandPredictorGrids).txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ statistics_regression
ParameterMultipleInput|PREDICTORS|Predictors|3|False
ParameterVector|ZONES|Zones|-1|False
ParameterVector|POINTS|Points|-1|False
ParameterTable|ATTRIBUTE|Dependent Variable|False
OutputVector|RESIDUALS|Residuals
OutputRaster|REGRESSION|Regression
ParameterTableField|ATTRIBUTE|Dependent Variable|POINTS|-1|False
ParameterSelection|RESAMPLING|Resampling|[0] Nearest Neighbour;[1] Bilinear Interpolation;[2] Bicubic Spline Interpolation;[3] B-Spline Interpolation| 3
ParameterBoolean|COORD_X|Include X Coordinate|False
ParameterBoolean|COORD_Y|Include Y Coordinate|False
ParameterBoolean|INTERCEPT|Intercept|True
ParameterSelection|METHOD|Method|[0] include all;[1] forward;[2] backward;[3] stepwise| 3
ParameterNumber|P_VALUE|Significance Level| 0.000000| 100.000000| 5.000000
ParameterNumber|P_VALUE|Significance Level| 0.000000| 100.000000| 5.000000
OutputVector|RESIDUALS|Residuals
OutputRaster|REGRESSION|Regression

0 comments on commit eb9f44d

Please sign in to comment.