Skip to content

Commit 1916a7f

Browse files
committed
[processing][saga] Fix definition of Multiple regression points/grids alg
Fixes #21146 (cherry picked from commit 4f8e231)
1 parent f5ca7b7 commit 1916a7f

22 files changed

Lines changed: 302 additions & 7 deletions

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ Multiple Regression Analysis (Points and Predictor Grids)
22
statistics_regression
33
QgsProcessingParameterMultipleLayers|PREDICTORS|Predictors|3|None|False
44
QgsProcessingParameterFeatureSource|POINTS|Points|-1|None|False
5-
QgsProcessingParameterFeatureSource|ATTRIBUTE|Dependent Variable|5|None|False
6-
QgsProcessingParameterFeatureSource|INFO_COEFF|Details: Coefficients|5|None|True
7-
QgsProcessingParameterFeatureSource|INFO_MODEL|Details: Model|5|None|True
8-
QgsProcessingParameterFeatureSource|INFO_STEPS|Details: Steps|5|None|True
9-
QgsProcessingParameterVectorDestination|RESIDUALS|Residuals
5+
QgsProcessingParameterField|ATTRIBUTE|Dependent Variable|None|POINTS|-1|False|False
6+
QgsProcessingParameterVectorDestination|INFO_COEFF|Details: Coefficients|5|None|True|True
7+
QgsProcessingParameterVectorDestination|INFO_MODEL|Details: Model|5|None|True|True
8+
QgsProcessingParameterVectorDestination|INFO_STEPS|Details: Steps|5|None|True|True
9+
QgsProcessingParameterVectorDestination|RESIDUALS|Residuals|-1|None|True|True
1010
QgsProcessingParameterRasterDestination|REGRESSION|Regression
11-
QgsProcessingParameterRasterDestination|REGRESCORR|Regression with Residual Correction
11+
QgsProcessingParameterRasterDestination|REGRESCORR|Regression with Residual Correction|None|True|True
1212
QgsProcessingParameterEnum|RESAMPLING|Resampling|[0] Nearest Neighbour;[1] Bilinear Interpolation;[2] Bicubic Spline Interpolation;[3] B-Spline Interpolation|False|3
1313
QgsProcessingParameterBoolean|COORD_X|Include X Coordinate|False
1414
QgsProcessingParameterBoolean|COORD_Y|Include Y Coordinate|False
@@ -17,4 +17,4 @@ QgsProcessingParameterEnum|METHOD|Method|[0] include all;[1] forward;[2] backwar
1717
QgsProcessingParameterNumber|P_VALUE|Significance Level|QgsProcessingParameterNumber.Double|5.000000|False|0.000000|100.000000
1818
QgsProcessingParameterEnum|CROSSVAL|Cross Validation|[0] none;[1] leave one out;[2] 2-fold;[3] k-fold|False|0
1919
QgsProcessingParameterNumber|CROSSVAL_K|Cross Validation Subsamples|QgsProcessingParameterNumber.Integer|10|False|2|None
20-
QgsProcessingParameterEnum|RESIDUAL_COR|Residual Interpolation|[0] Multleve B-Spline Interpolation;[1] Inverse Distance Weighted|False|0
20+
QgsProcessingParameterEnum|RESIDUAL_COR|Residual Interpolation|[0] Multleve B-Spline Interpolation;[1] Inverse Distance Weighted|False|0
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
UTF-8
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<SAGA_METADATA>
3+
<HISTORY saga-version="2.3.1">
4+
<MODULE library="statistics_regression" id="1" name="Multiple Regression Analysis (Points and Predictor Grids)">
5+
<OPTION type="grid_system" id="PARAMETERS_GRID_SYSTEM" name="Grid system">
6+
<CELLSIZE>0.0001</CELLSIZE>
7+
<XMIN>18.666347944200002</XMIN>
8+
<XMAX>18.7035479442</XMAX>
9+
<YMIN>45.7767514376</YMIN>
10+
<YMAX>45.8116514376</YMAX>
11+
</OPTION>
12+
<OPTION type="table_field" id="ATTRIBUTE" name="Dependent Variable" index="1">rvalue_1</OPTION>
13+
<OPTION type="choice" id="RESAMPLING" name="Resampling" index="3">B-Spline Interpolation</OPTION>
14+
<OPTION type="boolean" id="COORD_X" name="Include X Coordinate">FALSE</OPTION>
15+
<OPTION type="boolean" id="COORD_Y" name="Include Y Coordinate">FALSE</OPTION>
16+
<OPTION type="boolean" id="INTERCEPT" name="Intercept">TRUE</OPTION>
17+
<OPTION type="choice" id="METHOD" name="Method" index="3">stepwise</OPTION>
18+
<OPTION type="double" id="P_VALUE" name="Significance Level">5.000000</OPTION>
19+
<OPTION type="choice" id="CROSSVAL" name="Cross Validation" index="0">none</OPTION>
20+
<OPTION type="choice" id="RESIDUAL_COR" name="Residual Interpolation" index="0">Multleve B-Spline Interpolation</OPTION>
21+
<INPUT_LIST type="grid_list" id="PREDICTORS" name="Predictors" system="PARAMETERS_GRID_SYSTEM">
22+
<dem type="grid_list" id="PREDICTORS" name="Predictors" system="PARAMETERS_GRID_SYSTEM">
23+
<FILE>/tmp/processing_158a4797a951407ca275f957a94862a4/e678b6f2c3484cf9b60adafa5e69b1d6/dem.sgrd</FILE>
24+
</dem>
25+
</INPUT_LIST>
26+
<INPUT type="shapes" id="POINTS" name="Points">
27+
<FILE>/tmp/processing_158a4797a951407ca275f957a94862a4/f2045b740e8e466293cb61f78c148a83/POINTS.shp</FILE>
28+
</INPUT>
29+
<OUTPUT type="table" id="INFO_COEFF" name="Details: Coefficients">MLRA Coefficients</OUTPUT>
30+
</MODULE>
31+
</HISTORY>
32+
<SOURCE>
33+
<FILE>/home/nyall/dev/QGIS/python/plugins/processing/tests/testdata/expected/saga/multiple_regression_points_grids_coef.dbf</FILE>
34+
<DATABASE>
35+
<FIELDS>
36+
<FIELD TYPE="INTEGER">VAR_ID</FIELD>
37+
<FIELD TYPE="STRING">VAR_NAME</FIELD>
38+
<FIELD TYPE="DOUBLE">REGCOEFF</FIELD>
39+
<FIELD TYPE="DOUBLE">R</FIELD>
40+
<FIELD TYPE="DOUBLE">R2</FIELD>
41+
<FIELD TYPE="DOUBLE">R2_ADJ</FIELD>
42+
<FIELD TYPE="DOUBLE">STD_ERROR</FIELD>
43+
<FIELD TYPE="DOUBLE">T</FIELD>
44+
<FIELD TYPE="DOUBLE">SIG</FIELD>
45+
<FIELD TYPE="DOUBLE">P</FIELD>
46+
</FIELDS>
47+
</DATABASE>
48+
<PROJECTION></PROJECTION>
49+
</SOURCE>
50+
<DESCRIPTION></DESCRIPTION>
51+
</SAGA_METADATA>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]

0 commit comments

Comments
 (0)