Skip to content
Snippets Groups Projects
Commit a45d3361 authored by Luc Maisonobe's avatar Luc Maisonobe
Browse files

Simplified tiles cache.

parent a2dd4d53
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/org/orekit/rugged/raster/TilesCache.java
+ 29
− 295
View file @ a45d3361
...@@ -16,18 +16,11 @@ ...@@ -16,18 +16,11 @@
*/ */
package org.orekit.rugged.raster; package org.orekit.rugged.raster;
import java.io.Serializable;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.math3.util.FastMath; import org.apache.commons.math3.util.FastMath;
import org.orekit.rugged.errors.RuggedException; import org.orekit.rugged.errors.RuggedException;
import org.orekit.rugged.errors.RuggedMessages; import org.orekit.rugged.errors.RuggedMessages;
import org.orekit.rugged.raster.Tile.Location;
/** Cache for Digital Elevation Model {@link Tile tiles}. /** Cache for Digital Elevation Model {@link Tile tiles}.
* <p> * <p>
...@@ -44,14 +37,8 @@ public class TilesCache<T extends Tile> { ...@@ -44,14 +37,8 @@ public class TilesCache<T extends Tile> {
/** Updater for retrieving tiles data. */ /** Updater for retrieving tiles data. */
private final TileUpdater updater; private final TileUpdater updater;
/** Search optimized cache. */ /** Cache. */
private List<TilesStrip> searchCache; private final T[] tiles;
/** Eviction queue. */
private T[] evictionQueue;
/** Index for next tile. */
private int next;
/** Simple constructor. /** Simple constructor.
* @param factory factory for creating empty tiles * @param factory factory for creating empty tiles
...@@ -60,12 +47,10 @@ public class TilesCache<T extends Tile> { ...@@ -60,12 +47,10 @@ public class TilesCache<T extends Tile> {
*/ */
public TilesCache(final TileFactory<T> factory, final TileUpdater updater, final int maxTiles) { public TilesCache(final TileFactory<T> factory, final TileUpdater updater, final int maxTiles) {
this.factory = factory; this.factory = factory;
this.updater = updater; this.updater = updater;
this.searchCache = new ArrayList<TilesStrip>();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
final T[] array = (T[]) Array.newInstance(Tile.class, maxTiles + 1); final T[] array = (T[]) Array.newInstance(Tile.class, maxTiles);
this.evictionQueue = array; this.tiles = array;
this.next = 0;
} }
/** Get the tile covering a ground point. /** Get the tile covering a ground point.
...@@ -76,296 +61,45 @@ public class TilesCache<T extends Tile> { ...@@ -76,296 +61,45 @@ public class TilesCache<T extends Tile> {
*/ */
public T getTile(final double latitude, final double longitude) public T getTile(final double latitude, final double longitude)
throws RuggedException { throws RuggedException {
final T tile = getStrip(latitude, longitude).getTile(latitude, longitude);
if (tile.getLocation(latitude, longitude) != Tile.Location.HAS_INTERPOLATION_NEIGHBORS) {
// this should happen only if user set up an inconsistent TileUpdater
throw new RuggedException(RuggedMessages.TILE_WITHOUT_REQUIRED_NEIGHBORS_SELECTED,
FastMath.toDegrees(latitude),
FastMath.toDegrees(longitude));
}
return tile;
}
/** Create a tile covering a ground point.
* @param latitude latitude of the point
* @param longitude longitude of the point
* @return new tile covering the point
* @exception RuggedException if tile cannot be updated
*/
private T createTile(final double latitude, final double longitude)
throws RuggedException {
// create the tile and retrieve its data
final T tile = factory.createTile();
updater.updateTile(latitude, longitude, tile);
tile.tileUpdateCompleted();
return tile;
}
/** Append newly created tile at the end of the eviction queue.
* @param tile tile to append to queue
*/
private void appendToEvictionQueue(final T tile) {
evictionQueue[next] = tile;
next = (next + 1) % evictionQueue.length;
if (evictionQueue[next] != null) {
// the cache is full, we need to evict one tile
// from both the eviction cache and the search cache
for (final Iterator<TilesStrip> iterator = searchCache.iterator(); iterator.hasNext();) {
if (iterator.next().removeTile(evictionQueue[next])) {
evictionQueue[next] = null;
return;
}
}
}
}
/** Get a strip covering a ground point.
* @param latitude ground point latitude
* @param longitude ground point longitude
* @return strip covering the ground point
* @exception RuggedException if tile cannot be updated
*/
private TilesStrip getStrip(final double latitude, final double longitude)
throws RuggedException {
// look for a strip at the specified latitude
final int index = Collections.binarySearch(searchCache, new BasicLatitudeProvider(latitude),
new LatitudeComparator());
if (index >= 0) {
// rare case, the latitude is an exact maximum latitude for a strip
return searchCache.get(index);
} else {
final int insertionPoint = -(index + 1); for (int i = 0; i < tiles.length; ++i) {
final T tile = tiles[i];
if (tile != null && tile.getLocation(latitude, longitude) == Tile.Location.HAS_INTERPOLATION_NEIGHBORS) {
// we have found the tile in the cache
if (insertionPoint < searchCache.size()) { // put it on the front as it becomes the most recently used
final TilesStrip strip = searchCache.get(insertionPoint); while (i > 0) {
if (strip.covers(latitude)) { tiles[i] = tiles[i - 1];
// we have found an existing strip --i;
return strip;
} }
} tiles[0] = tile;
// no existing strip covers the specified latitude, we need to create a new one
final T tile = createTile(latitude, longitude);
final TilesStrip strip = new TilesStrip(tile);
searchCache.add(insertionPoint, strip);
appendToEvictionQueue(tile);
return strip;
}
}
/** Interface for retrieving latitude. */
private interface LatitudeProvider {
/** Get latitude.
* @return latitude
*/
double getLatitude();
}
/** Basic implementation of {@link LatitudeProvider}. */
private static class BasicLatitudeProvider implements LatitudeProvider {
/** Latitude. */
private final double latitude;
/** Simple constructor.
* @param latitude latitude
*/
public BasicLatitudeProvider(final double latitude) {
this.latitude = latitude;
}
/** {@inheritDoc} */
@Override
public double getLatitude() {
return latitude;
}
}
/** Interface for retrieving longitude. */
private interface LongitudeProvider {
/** Get longitude.
* @return longitude
*/
double getLongitude();
}
/** Basic implementation of {@link LongitudeProvider}. */
private static class BasicLongitudeProvider implements LongitudeProvider {
/** Longitude. */
private final double longitude;
/** Simple constructor.
* @param longitude longitude
*/
public BasicLongitudeProvider(final double longitude) {
this.longitude = longitude;
}
/** {@inheritDoc} */
@Override
public double getLongitude() {
return longitude;
}
}
/** Strip of tiles for a given latitude. */
private class TilesStrip implements LatitudeProvider {
/** Minimum latitude. */
private final double minLatitude;
/** Maximum latitude. */
private final double maxLatitude;
/** Tiles list. */
private final List<TileDecorator> tiles;
/** Simple constructor.
* @param tile first tile to insert in the strip
*/
public TilesStrip(final T tile) {
minLatitude = tile.getMinimumLatitude();
maxLatitude = tile.getMaximumLatitude();
tiles = new ArrayList<TileDecorator>();
tiles.add(new TileDecorator(tile));
}
/** Check if the strip covers a specified latitude.
* @param latitude latitude to check
* @return true if the strip covers the latitude
*/
public boolean covers(final double latitude) {
return (minLatitude <= latitude) && (maxLatitude >= latitude);
}
/** {@inheritDoc} */
@Override
public double getLatitude() {
return maxLatitude;
}
/** Get a tile covering a ground point.
* @param latitude ground point latitude
* @param longitude ground point longitude
* @return strip covering the ground point
* @exception RuggedException if tile cannot be updated
*/
public T getTile(final double latitude, final double longitude)
throws RuggedException {
// look for a tile at the specified longitude
final int index = Collections.binarySearch(tiles, new BasicLongitudeProvider(longitude),
new LongitudeComparator());
if (index >= 0) {
// rare case, the longitude is an exact maximum longitude for a tile
return tiles.get(index).getTile();
} else {
final int insertionPoint = -(index + 1);
if (insertionPoint < tiles.size()) {
final T tile = tiles.get(insertionPoint).getTile();
if (tile.getLocation(latitude, longitude) == Location.HAS_INTERPOLATION_NEIGHBORS) {
// we have found an existing tile
return tile;
}
}
// no existing tile covers the specified ground point, we need to create a new one
final T tile = createTile(latitude, longitude);
tiles.add(insertionPoint, new TileDecorator(tile));
appendToEvictionQueue(tile);
return tile; return tile;
}
}
/** Remove a tile from the strip.
* @param tile tile to remove
* @return true if the tile has been removed
*/
public boolean removeTile(final Tile tile) {
for (final Iterator<TileDecorator> iterator = tiles.iterator(); iterator.hasNext();) {
if (iterator.next().getTile() == tile) {
iterator.remove();
return true;
}
} }
return false;
}
}
/** Decorator for tiles, implementing {@link LongitudeProvider}. */
private class TileDecorator implements LongitudeProvider {
/** Underlying tile. */
private final T tile;
/** Simple constructor.
* @param tile tile to decorate
*/
public TileDecorator(final T tile) {
this.tile = tile;
} }
/** Get the underlying tile. // none of the tiles in the cache covers the specified points
* @return underlying tile
*/
public T getTile() {
return tile;
}
/** {@inheritDoc} */ // make some room in the cache, possibly evicting the least recently used one
@Override for (int i = tiles.length - 1; i > 0; --i) {
public double getLongitude() { tiles[i] = tiles[i - 1];
return tile.getMaximumLongitude();
} }
} // create the tile and retrieve its data
final T tile = factory.createTile();
/** Comparator for sorting with respect to latitude. */ updater.updateTile(latitude, longitude, tile);
private static class LatitudeComparator implements Comparator<LatitudeProvider>, Serializable { tile.tileUpdateCompleted();
/** Serializable UID. */
private static final long serialVersionUID = 20141212L;
/** {@inheritDoc} */ if (tile.getLocation(latitude, longitude) != Tile.Location.HAS_INTERPOLATION_NEIGHBORS) {
@Override // this should happen only if user set up an inconsistent TileUpdater
public int compare(final LatitudeProvider o1, final LatitudeProvider o2) { throw new RuggedException(RuggedMessages.TILE_WITHOUT_REQUIRED_NEIGHBORS_SELECTED,
return Double.compare(o1.getLatitude(), o2.getLatitude()); FastMath.toDegrees(latitude),
FastMath.toDegrees(longitude));
} }
} tiles[0] = tile;
return tile;
/** Comparator for sorting with respect to longitude. */
private static class LongitudeComparator implements Comparator<LongitudeProvider>, Serializable {
/** Serializable UID. */
private static final long serialVersionUID = 20141212L;
/** {@inheritDoc} */
@Override
public int compare(final LongitudeProvider o1, final LongitudeProvider o2) {
return Double.compare(o1.getLongitude(), o2.getLongitude());
}
} }
......
src/test/java/org/orekit/rugged/raster/TilesCacheTest.java
+ 7
− 0
View file @ a45d3361
...@@ -65,6 +65,13 @@ public class TilesCacheTest { ...@@ -65,6 +65,13 @@ public class TilesCacheTest {
} }
Assert.assertEquals(12, factory.getCount()); Assert.assertEquals(12, factory.getCount());
// ensure the (0.0, 0.0) tile is the least recently used one
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 3; ++j) {
cache.getTile(FastMath.toRadians(0.5 + j), FastMath.toRadians(0.5 + i));
}
}
// ask for one point outside of the covered area, to evict the (0.0, 0.0) tile // ask for one point outside of the covered area, to evict the (0.0, 0.0) tile
cache.getTile(FastMath.toRadians(20.5), FastMath.toRadians(30.5)); cache.getTile(FastMath.toRadians(20.5), FastMath.toRadians(30.5));
Assert.assertEquals(13, factory.getCount()); Assert.assertEquals(13, factory.getCount());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment