sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-15 00:02:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix bugs in fuzzify() methods and create processing tests

Browse Source
This commit is contained in:
root676 2019-11-05 23:50:40 +01:00 committed by Nyall Dawson
parent 18ff21951a
commit d159014179
2 changed files with 116 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
python/plugins/processing/tests/testdata/qgis_algorithm_tests2.yaml vendored
View File

@ -264,6 +264,120 @@ tests:
fields: fields:
fid: skip fid: skip
- algorithm: native:fuzzifyrasterlinearmembership
name: Test (native:fuzzifyrasterlinearmembership)
params:
BAND: 1
FUZZYHIGHBOUND: 100.0
FUZZYLOWBOUND: 200.0
INPUT:
name: dem.tif
type: raster
results:
OUTPUT:
hash: ed9591139fed080e0b5b789052b881c8fddb25c106ff14e89cbb06c5
type: rasterhash
- algorithm: native:fuzzifyrasterlinearmembership
name: Test (native:fuzzifyrasterlinearmembership)
params:
BAND: 1
FUZZYHIGHBOUND: 200.0
FUZZYLOWBOUND: 100.0
INPUT:
name: dem.tif
type: raster
results:
OUTPUT:
hash: 980df1d095601a885a7518038cdb327d83366db6f33a3fe307eab149
type: rasterhash
- algorithm: native:fuzzifyrasterpowermembership
name: Test (native:fuzzifyrasterpowermembership)
params:
BAND: 1
FUZZYEXPONENT: 2.0
FUZZYHIGHBOUND: 100.0
FUZZYLOWBOUND: 200.0
INPUT:
name: dem.tif
type: raster
results:
OUTPUT:
hash: d18f956cb94d09a449a62299408e442973f4391415a9005d4d6850dc
type: rasterhash
- algorithm: native:fuzzifyrasterpowermembership
name: Test (native:fuzzifyrasterpowermembership)
params:
BAND: 1
FUZZYEXPONENT: 2.0
FUZZYHIGHBOUND: 200.0
FUZZYLOWBOUND: 100.0
INPUT:
name: dem.tif
type: raster
results:
OUTPUT:
hash: 782bcc1851b9e73b8c962d4850e356c3dab11999ee41dce9dd2aea5f
type: rasterhash
- algorithm: native:fuzzifyrasterlargemembership
name: Test (native:fuzzifyrasterlargemembership)
params:
BAND: 1
FUZZYMIDPOINT: 100.0
FUZZYSPREAD: 5.0
INPUT:
name: dem.tif
type: raster
results:
OUTPUT:
hash: d4479a5077235cffe4586f40a7c867139a50347f8312fd443c130ccb
type: rasterhash
- algorithm: native:fuzzifyrastersmallmembership
name: Test (native:fuzzifyrastersmallmembership)
params:
BAND: 1
FUZZYMIDPOINT: 100.0
FUZZYSPREAD: 5.0
INPUT:
name: dem.tif
type: raster
results:
OUTPUT:
hash: 31569e93dbdd82c85cbf72c4ceb521015bd143e2106968a413a4ec6c
type: rasterhash
- algorithm: native:fuzzifyrastergaussianmembership
name: Test (native:fuzzifyrastergaussianmembership)
params:
BAND: 1
FUZZYMIDPOINT: 100.0
FUZZYSPREAD: 0.01
INPUT:
name: dem.tif
type: raster
results:
OUTPUT:
hash: e51532915836f3e77695fb8d650a2d1e0984a5be8e8bbf4df677d160
type: rasterhash
- algorithm: native:fuzzifyrasternearmembership
name: Test (native:fuzzifyrasternearmembership)
params:
BAND: 1
FUZZYMIDPOINT: 100.0
FUZZYSPREAD: 0.01
INPUT:
name: dem.tif
type: raster
results:
OUTPUT:
hash: 71aecb383a686d78ea0e677901a8a93f822b9897d7a9e23ba4ebf24d
type: rasterhash
- algorithm: qgis:geometrybyexpression - algorithm: qgis:geometrybyexpression
name: Geometry by expression (point) name: Geometry by expression (point)
params: params:

4
src/analysis/processing/qgsalgorithmfuzzifyraster.cpp
View File

@ -288,7 +288,7 @@ bool QgsFuzzifyRasterPowerMembershipAlgorithm::prepareAlgorithmFuzzificationPara
Q_UNUSED( feedback ) Q_UNUSED( feedback )
mFuzzifyHighBound = parameterAsDouble( parameters, QStringLiteral("FUZZYHIGHBOUND"), context); mFuzzifyHighBound = parameterAsDouble( parameters, QStringLiteral("FUZZYHIGHBOUND"), context);
mFuzzifyLowBound = parameterAsDouble( parameters, QStringLiteral("FUZZYLOWBOUND"), context); mFuzzifyLowBound = parameterAsDouble( parameters, QStringLiteral("FUZZYLOWBOUND"), context);
mFuzzifyExponent = parameterAsDouble( parameters, QStringLiteral("FUZZIFYEXPONENT"), context); mFuzzifyExponent = parameterAsDouble( parameters, QStringLiteral("FUZZYEXPONENT"), context);
return true; return true;
} }
@ -551,7 +551,7 @@ bool QgsFuzzifyRasterNearMembershipAlgorithm::prepareAlgorithmFuzzificationParam
double QgsFuzzifyRasterNearMembershipAlgorithm::fuzzify( double &value ) double QgsFuzzifyRasterNearMembershipAlgorithm::fuzzify( double &value )
{ {
return 1/ ( 1 + mFuzzifySpread * std::pow( value - mFuzzifySpread, 2 ) ); return 1 / ( 1 + mFuzzifySpread * std::pow( value - mFuzzifyMidpoint, 2 ) );
} }