Remove merge conflict on r.cost algorithms

This commit is contained in:
Médéric RIBREUX 2016-03-19 10:05:24 +01:00
parent 5b11ba1a2b
commit eb186c4928
3 changed files with 0 additions and 41 deletions

View File

@ -1,14 +0,0 @@
r.cost
r.cost.coords - Creates a raster layer of cumulative cost of moving across a raster layer whose cell values represent cost from a list of coordinates.
Raster (r.*)
ParameterRaster|input|Unit cost layer|False
ParameterString|start_coordinates|Coordinates of starting point(s) (a list of E,N)|None|False|False
ParameterString|stop_coordinates|Coordinates of stopping point(s) (a list of E,N)|None|False|True
ParameterNumber|max_cost|Maximum cumulative cost|None|None|0.0|True
ParameterNumber|null_cost|Cost assigned to null cells. By default, null cells are excluded|None|None|None|True
*ParameterNumber|memory|Maximum memory to be used in MB|0|None|300|True
*ParameterBoolean|-k|Use the 'Knight's move'; slower, but more accurate|False
*ParameterBoolean|-n|Keep null values in output raster layer|False
OutputRaster|output|Cumulative cost
OutputRaster|nearest|Nearest start points
OutputRaster|outdir|Movement Directions

View File

@ -1,14 +0,0 @@
r.cost
r.cost.points - Creates a raster layer of cumulative cost of moving across a raster layer whose cell values represent cost from a vector point layer.
Raster (r.*)
ParameterRaster|input|Unit cost layer|False
ParameterVector|start_points|Start points|0|False
ParameterVector|stop_points|Stop points|0|True
ParameterNumber|max_cost|Maximum cumulative cost|None|None|0.0|True
ParameterNumber|null_cost|Cost assigned to null cells. By default, null cells are excluded|None|None|None|True
*ParameterNumber|memory|Maximum memory to be used in MB|0|None|300|True
*ParameterBoolean|-k|Use the 'Knight's move'; slower, but more accurate|False
*ParameterBoolean|-n|Keep null values in output raster layer|False
OutputRaster|output|Cumulative cost
OutputRaster|nearest|Nearest start points
OutputRaster|outdir|Movement Directions

View File

@ -1,13 +0,0 @@
r.cost
r.cost.rast - Creates a raster layer of cumulative cost of moving across a raster layer whose cell values represent cost from a raster of starting points.
Raster (r.*)
ParameterRaster|input|Unit cost layer|False
ParameterRaster|start_raster|Name of starting raster points map (all non-NULL cells are starting points)|False
ParameterNumber|max_cost|Maximum cumulative cost|None|None|0.0|True
ParameterNumber|null_cost|Cost assigned to null cells. By default, null cells are excluded|None|None|None|True
*ParameterNumber|memory|Maximum memory to be used in MB|0|None|300|True
*ParameterBoolean|-k|Use the 'Knight's move'; slower, but more accurate|False
*ParameterBoolean|-n|Keep null values in output raster layer|False
OutputRaster|output|Cumulative cost
OutputRaster|nearest|Nearest start points
OutputRaster|outdir|Movement Directions