Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2098 from NaturalGIS/fix_several_modules
[processing] fix several SAGA and GRASS modules
- Loading branch information
Showing
29 changed files
with
231 additions
and
208 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 13 additions & 12 deletions
25
...ocessing/algs/saga/description/2.1.3/GeographicallyWeightedMultipleRegression(Points).txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,16 @@ | ||
| Geographically Weighted Multiple Regression (Points) | ||
| GWR for Multiple Predictors | ||
| statistics_regression | ||
| ParameterVector|POINTS|Points|-1|False | ||
| ParameterTableField|DEPENDENT|Dependent Variable|POINTS|-1|False | ||
| ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting | ||
| ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|1 | ||
| ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET |Inverse Distance Offset|True | ||
| ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0 | ||
| ParameterSelection|RANGE|Search Range|[0] search radius (local);[1] no search radius (global) | ||
| ParameterNumber|RADIUS|Search Radius|None|None|100 | ||
| ParameterSelection|MODE|Search Mode|[0] all directions;[1] quadrants | ||
| ParameterSelection|NPOINTS|Number of Points|[0] maximum number of observations;[1] all points | ||
| ParameterNumber|MAXPOINTS|Maximum Number of Observations|None|None|10 | ||
| ParameterNumber|MINPOINTS|Minimum Number of Observations|None|None|4 | ||
| OutputVector|REGRESSION|Regression | ||
| ParameterTableField|PREDICTORS|Predictor|POINTS|-1|False | ||
| ParameterSelection|DW_WEIGHTING|Weighting Function|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting | ||
| ParameterNumber|DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1 | ||
| ParameterBoolean|DW_IDW_OFFSET|Inverse Distance Offset|True | ||
| ParameterNumber|DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1 | ||
| ParameterSelection|SEARCH_RANGE|Search Range|[0] search radius (local);[1] no search radius (global) | ||
| ParameterNumber|SEARCH_RADIUS|Search Radius|None|None|100 | ||
| ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance | ||
| 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 | ||
| OutputVector|REGRESSION|Regression |
26 changes: 13 additions & 13 deletions
26
...ing/algs/saga/description/2.1.3/GeographicallyWeightedMultipleRegression(PointsGrids).txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| Geographically Weighted Multiple Regression (Points/Grids) | ||
| GWR for Multiple Predictor Grids | ||
| statistics_regression | ||
| ParameterMultipleInput|PREDICTORS|Predictors|3.0|False | ||
| ParameterBoolean|PARAMETERS |Output of Regression Parameters|True | ||
| ParameterVector|POINTS|Points|0|False | ||
| ParameterTableField|DEPENDENT|Dependent Variable|POINTS|-1|False | ||
| ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting | ||
| ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|1 | ||
| ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET |Inverse Distance Offset|True | ||
| ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0 | ||
| ParameterSelection|RANGE|Search Range|[0] search radius (local);[1] no search radius (global) | ||
| ParameterNumber|RADIUS|Search Radius|None|None|100 | ||
| ParameterSelection|MODE|Search Mode|[0] all directions;[1] quadrants | ||
| ParameterSelection|NPOINTS|Number of Points|[0] maximum number of observations;[1] all points | ||
| ParameterNumber|MAXPOINTS|Maximum Number of Observations|None|None|10 | ||
| ParameterNumber|MINPOINTS|Minimum Number of Observations|None|None|4 | ||
| ParameterSelection|RESOLUTION|Model Resolution|[0] same as predictors;[1] user defined|1 | ||
| ParameterNumber|RESOLUTION_VAL|Resolution|0|None|1 | ||
| ParameterSelection|DW_WEIGHTING|Weighting Function|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting | ||
| ParameterNumber|DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1 | ||
| ParameterBoolean|DW_IDW_OFFSET|Inverse Distance Offset|True | ||
| ParameterNumber|DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1 | ||
| ParameterSelection|SEARCH_RANGE|Search Range|[0] search radius (local);[1] no search radius (global) | ||
| ParameterNumber|SEARCH_RADIUS|Search Radius|None|None|100 | ||
| ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance | ||
| 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 | ||
| OutputRaster|REGRESSION|Regression | ||
| OutputRaster|QUALITY|Coefficient of Determination | ||
| OutputRaster|SLOPES|Regression Parameters | ||
| OutputVector|RESIDUALS|Residuals |
35 changes: 19 additions & 16 deletions
35
...ugins/processing/algs/saga/description/2.1.3/GeographicallyWeightedMultipleRegression.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,24 @@ | ||
| Geographically Weighted Multiple Regression | ||
| GWR for Multiple Predictors (Gridded Model Output) | ||
| statistics_regression | ||
| ParameterVector|POINTS|Points|0|False | ||
| ParameterTableField|DEPENDENT|Dependent Variable|POINTS|-1|False | ||
| ParameterTableField|PREDICTORS|Predictor|POINTS|-1|False | ||
| Hardcoded|-TARGET_DEFINITION 0 | ||
| ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting | ||
| ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|1 | ||
| ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET |Inverse Distance Offset|True | ||
| ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1 | ||
| ParameterSelection|RANGE|Search Range|[0] search radius (local);[1] no search radius (global) | ||
| ParameterNumber|RADIUS|Search Radius|None|None|100 | ||
| ParameterSelection|MODE|Search Mode|[0] all directions;[1] quadrants | ||
| ParameterSelection|NPOINTS|Number of Points|[0] maximum number of observations;[1] all points | ||
| ParameterNumber|MAXPOINTS|Maximum Number of Observations|None|None|10 | ||
| ParameterNumber|MINPOINTS|Minimum Number of Observations|None|None|4 | ||
| ParameterSelection|DW_WEIGHTING|Weighting Function|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting | ||
| ParameterNumber|DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1 | ||
| ParameterBoolean|DW_IDW_OFFSET|Inverse Distance Offset|True | ||
| ParameterNumber|DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1 | ||
| ParameterSelection|SEARCH_RANGE|Search Range|[0] search radius (local);[1] no search radius (global) | ||
| ParameterNumber|SEARCH_RADIUS|Search Radius|None|None|100 | ||
| ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance | ||
| 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 | ||
| Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX | ||
| ParameterNumber|USER_SIZE|Cellsize|None|None|100.0 | ||
| OutputRaster|USER_QUALITY|Quality | ||
| OutputRaster|USER_INTERCEPT|Intercept | ||
| OutputRaster|GRID_QUALITY|Quality | ||
| OutputRaster|GRID_INTERCEPT|Intercept | ||
| ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0 | ||
| ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells | ||
| ParameterRaster|TARGET_TEMPLATE|Target System|True | ||
| OutputVector|REGRESSION|Regression | ||
| OutputRaster|SLOPES|Slopes | ||
| OutputRaster|TARGET_INTERCEPT|Intercept | ||
| OutputRaster|TARGET_QUALITY|Quality |
22 changes: 11 additions & 11 deletions
22
...s/processing/algs/saga/description/2.1.3/GeographicallyWeightedRegression(PointsGrid).txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 18 additions & 16 deletions
34
python/plugins/processing/algs/saga/description/2.1.3/GeographicallyWeightedRegression.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,24 @@ | ||
| Geographically Weighted Regression | ||
| GWR for Single Predictor (Gridded Model Output) | ||
| statistics_regression | ||
| ParameterVector|POINTS|Points|0|False | ||
| ParameterTableField|DEPENDENT|Dependent Variable|POINTS|-1|False | ||
| ParameterTableField|PREDICTOR|Predictor|POINTS|-1|False | ||
| Hardcoded|-TARGET_DEFINITION 0 | ||
| ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting | ||
| ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|0 | ||
| ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET |Inverse Distance Offset|True | ||
| ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|0.0 | ||
| ParameterSelection|RANGE|Search Range|[0] search radius (local);[1] no search radius (global) | ||
| ParameterNumber|RADIUS|Search Radius|None|None|100 | ||
| ParameterSelection|MODE|Search Mode|[0] all directions;[1] quadrants | ||
| ParameterSelection|NPOINTS|Number of Points|[0] maximum number of observations;[1] all points | ||
| ParameterNumber|MAXPOINTS|Maximum Number of Observations|None|None|10 | ||
| ParameterNumber|MINPOINTS|Minimum Number of Observations|None|None|4 | ||
| ParameterSelection|DW_WEIGHTING|Weighting Function|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting | ||
| ParameterNumber|DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1 | ||
| ParameterBoolean|DW_IDW_OFFSET|Inverse Distance Offset|True | ||
| ParameterNumber|DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1 | ||
| ParameterSelection|SEARCH_RANGE|Search Range|[0] search radius (local);[1] no search radius (global) | ||
| ParameterNumber|SEARCH_RADIUS|Search Radius|None|None|100 | ||
| ParameterSelection|SEARCH_POINTS_ALL|Number of Points|[0] maximum number of nearest points;[1] all points within search distance | ||
| 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 | ||
| Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX | ||
| ParameterNumber|USER_SIZE|Cellsize|None|None|100.0 | ||
| OutputRaster|USER_GRID|Grid | ||
| OutputRaster|USER_QUALITY|Quality | ||
| OutputRaster|USER_INTERCEPT|Intercept | ||
| OutputRaster|USER_SLOPE|Slope | ||
| ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0 | ||
| ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells | ||
| ParameterRaster|TARGET_TEMPLATE|Target System|True | ||
| OutputRaster|TARGET_OUT_GRID|Grid | ||
| OutputRaster|TARGET_INTERCEPT|Intercept | ||
| OutputRaster|TARGET_SLOPE|Slope | ||
| OutputRaster|TARGET_QUALITY|Quality |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 6 additions & 3 deletions
9
...gins/processing/algs/saga/description/2.1.3/MultilevelB-SplineInterpolation(fromGrid).txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,14 @@ | ||
| Multilevel B-Spline Interpolation (from Grid) | ||
| grid_spline | ||
| ParameterRaster|GRIDPOINTS|Grid|False | ||
| ParameterRaster|GRID|Grid|False | ||
| Hardcoded|-TARGET_DEFINITION 0 | ||
| ParameterSelection|METHOD|Method|[0] without B-spline refinement;[1] with B-spline refinement | ||
| ParameterNumber|EPSILON|Threshold Error|None|None|0.0001 | ||
| ParameterNumber|LEVEL_MAX|Maximum Level|None|None|11.0 | ||
| ParameterNumber|EPSILON|Threshold Error|0|None|0.0001 | ||
| ParameterNumber|LEVEL_MAX|Maximum Level|1|14|11.0 | ||
| ParameterBoolean|UPDATE|Update View|False | ||
| ParameterSelection|DATATYPE|Data Type|[0] same as input grid;[1] floating point | ||
| Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX | ||
| ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0 | ||
| ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells | ||
| ParameterRaster|TARGET_TEMPLATE|Target System|True | ||
| OutputRaster|TARGET_OUT_GRID|Grid |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.