Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimization to avoid unspecialized Function3 usage #2049

Merged
merged 1 commit into from
Mar 12, 2017
Merged

Optimization to avoid unspecialized Function3 usage #2049

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 30 additions & 21 deletions ...src/main/scala/geotrellis/raster/mapalgebra/focal/hillshade/SurfacePointCalculation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ class SurfacePoint() {
abstract class SurfacePointCalculation[T](r: Tile, n: Neighborhood, analysisArea: Option[GridBounds], val cellSize: CellSize, target: TargetCell = TargetCell.All)
extends FocalCalculation[T](r, n, analysisArea, target)
{
// Use trait instead of Function3 to avoid boxing
private trait SetValue { def apply(z: Double, x: Int, y: Int): Unit }

var lastY = -1

var cellWidth = 0.0
Expand All @@ -125,25 +128,31 @@ abstract class SurfacePointCalculation[T](r: Tile, n: Neighborhood, analysisArea
*/
def setValue(x: Int, y: Int, s: SurfacePoint): Unit

val setValue: (Double, Int, Int) => Unit =
private val _setValue: SetValue =
target match {
case TargetCell.All =>
{ (_, x, y) =>
calcSurface()
setValue(x, y, s)
}
case TargetCell.Data =>
{ (z, x, y) =>
if(isData(z)) {
new SetValue {
def apply(z: Double, x: Int, y: Int): Unit = {
calcSurface()
setValue(x, y, s)
}
}
case TargetCell.Data =>
new SetValue {
def apply(z: Double, x: Int, y: Int): Unit = {
if(isData(z)) {
calcSurface()
setValue(x, y, s)
}
}
}
case TargetCell.NoData =>
{ (z, x, y) =>
if(isNoData(z)) {
calcSurface()
setValue(x, y, s)
new SetValue {
def apply(z: Double, x: Int, y: Int) = {
if(isNoData(z)) {
calcSurface()
setValue(x, y, s)
}
}
}
}
Expand Down Expand Up @@ -225,7 +234,7 @@ abstract class SurfacePointCalculation[T](r: Tile, n: Neighborhood, analysisArea
east(0) = getValSafe(colMin+1, rowMin-1, focalValue)
east(1) = r.getDouble(colMin + 1, rowMin)
east(2) = r.getDouble(colMin + 1, rowMin + 1)
setValue(focalValue, 0, 0)
_setValue(focalValue, 0, 0)

var col = colMin + 1

Expand All @@ -238,7 +247,7 @@ abstract class SurfacePointCalculation[T](r: Tile, n: Neighborhood, analysisArea
east(0) = getValSafe(col+1, rowMin-1, focalValue)
east(1) = r.getDouble(col+1, rowMin)
east(2) = r.getDouble(col+1, rowMin + 1)
setValue(focalValue, col-colMin, 0)
_setValue(focalValue, col-colMin, 0)
col += 1
}

Expand All @@ -250,7 +259,7 @@ abstract class SurfacePointCalculation[T](r: Tile, n: Neighborhood, analysisArea
east(0) = getValSafe(col+1, rowMin-1, focalValue)
east(1) = getValSafe(col+1, rowMin , focalValue)
east(2) = getValSafe(col+1, rowMin+1, focalValue)
setValue(focalValue, col-colMin, 0)
_setValue(focalValue, col-colMin, 0)

var row = rowMin + 1

Expand All @@ -267,7 +276,7 @@ abstract class SurfacePointCalculation[T](r: Tile, n: Neighborhood, analysisArea
east(0) = r.getDouble(colMin+1, row-1)
east(1) = r.getDouble(colMin+1, row)
east(2) = r.getDouble(colMin+1, row+1)
setValue(focalValue, 0, row-rowMin)
_setValue(focalValue, 0, row-rowMin)

/// Middle Middle
col = colMin + 1
Expand All @@ -276,7 +285,7 @@ abstract class SurfacePointCalculation[T](r: Tile, n: Neighborhood, analysisArea
east(0) = r.getDouble(col+1, row-1)
east(1) = r.getDouble(col+1, row)
east(2) = r.getDouble(col+1, row+1)
setValue(focalValue, col-colMin, row-rowMin)
_setValue(focalValue, col-colMin, row-rowMin)
col += 1
}

Expand All @@ -288,7 +297,7 @@ abstract class SurfacePointCalculation[T](r: Tile, n: Neighborhood, analysisArea
east(1) = getValSafe(col+1, row , focalValue)
east(2) = getValSafe(col+1, row+1, focalValue)

setValue(focalValue, col-colMin, row-rowMin)
_setValue(focalValue, col-colMin, row-rowMin)

row += 1
}
Expand All @@ -306,7 +315,7 @@ abstract class SurfacePointCalculation[T](r: Tile, n: Neighborhood, analysisArea
east(0) = r.getDouble(colMin+1, row-1)
east(1) = r.getDouble(colMin+1, row)
east(2) = getValSafe(colMin+1, row+1, focalValue)
setValue(focalValue, 0, row-rowMin)
_setValue(focalValue, 0, row-rowMin)

/// Bottom Middle
col = colMin + 1
Expand All @@ -318,7 +327,7 @@ abstract class SurfacePointCalculation[T](r: Tile, n: Neighborhood, analysisArea
east(0) = r.getDouble(col+1, row-1)
east(1) = r.getDouble(col+1, row)
east(2) = getValSafe(col+1, row+1, focalValue)
setValue(focalValue, col-colMin, row-rowMin)
_setValue(focalValue, col-colMin, row-rowMin)
col += 1
}

Expand All @@ -330,7 +339,7 @@ abstract class SurfacePointCalculation[T](r: Tile, n: Neighborhood, analysisArea
east(0) = getValSafe(col+1, row-1, focalValue)
east(1) = getValSafe(col+1, row , focalValue)
east(2) = getValSafe(col+1, row+1, focalValue)
setValue(focalValue, col-colMin, row-rowMin)
_setValue(focalValue, col-colMin, row-rowMin)

result
}
Expand Down