Skip to content
Snippets Groups Projects
Commit fb5df235 authored by sesteves's avatar sesteves
Browse files

minor

parent 1c408b23
No related branches found
No related tags found
No related merge requests found
...@@ -100,7 +100,6 @@ public class MultiLayerModel implements AtmosphericRefraction { ...@@ -100,7 +100,6 @@ public class MultiLayerModel implements AtmosphericRefraction {
(1 - FastMath.pow(FastMath.cos(theta1), 2))); (1 - FastMath.pow(FastMath.cos(theta1), 2)));
double b = a * FastMath.cos(theta1) - FastMath.cos(theta2); double b = a * FastMath.cos(theta1) - FastMath.cos(theta2);
los = new Vector3D(a, los, b, zenith); los = new Vector3D(a, los, b, zenith);
System.out.println("LOS: " + los);
theta1 = theta2; theta1 = theta2;
} }
...@@ -114,8 +113,6 @@ public class MultiLayerModel implements AtmosphericRefraction { ...@@ -114,8 +113,6 @@ public class MultiLayerModel implements AtmosphericRefraction {
gp = ellipsoid.pointOnGround(pos, los, 0.0); gp = ellipsoid.pointOnGround(pos, los, 0.0);
gp = new NormalizedGeodeticPoint(gp.getLatitude(), gp.getLongitude(), entry.getKey(), 0.0); gp = new NormalizedGeodeticPoint(gp.getLatitude(), gp.getLongitude(), entry.getKey(), 0.0);
System.out.println("GP: " + gp);
pos = ellipsoid.transform(gp); pos = ellipsoid.transform(gp);
zenith = gp.getZenith(); zenith = gp.getZenith();
...@@ -123,13 +120,10 @@ public class MultiLayerModel implements AtmosphericRefraction { ...@@ -123,13 +120,10 @@ public class MultiLayerModel implements AtmosphericRefraction {
} }
gp = new NormalizedGeodeticPoint(gp.getLatitude(), gp.getLongitude(), 17, 0.0); // gp = new NormalizedGeodeticPoint(gp.getLatitude(), gp.getLongitude(), 16, 0.0);
NormalizedGeodeticPoint newGeodeticPoint = tile.cellIntersection(gp, los, NormalizedGeodeticPoint newGeodeticPoint = tile.cellIntersection(gp, los,
tile.getFloorLatitudeIndex(gp.getLatitude()), tile.getFloorLongitudeIndex(gp.getLongitude())); tile.getFloorLatitudeIndex(gp.getLatitude()), tile.getFloorLongitudeIndex(gp.getLongitude()));
System.out.println("latitude and longitude indexes: " + tile.getFloorLatitudeIndex(gp.getLatitude()) + ", " +
tile.getFloorLongitudeIndex(gp.getLongitude()));
return newGeodeticPoint; return newGeodeticPoint;
} }
} }
...@@ -57,13 +57,6 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest { ...@@ -57,13 +57,6 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
// locate the entry tile along the line-of-sight // locate the entry tile along the line-of-sight
Tile tile = cache.getTile(intersection.getLatitude(), intersection.getLongitude()); Tile tile = cache.getTile(intersection.getLatitude(), intersection.getLongitude());
System.out.println("TILE: minlat: " + tile.getMinimumLatitude() + ", maxlat: " + tile.getMaximumLatitude() +
", minlon: " + tile.getMinimumLongitude() + ", maxlon: " + tile.getMaximumLongitude());
System.out.println("IS IT NULL? " +
(tile.cellIntersection(intersection, los, tile.getFloorLatitudeIndex(intersection.getLatitude()),
tile.getFloorLongitudeIndex(intersection.getLongitude())) == null));
MultiLayerModel model = new MultiLayerModel(); MultiLayerModel model = new MultiLayerModel();
GeodeticPoint gp = model.getPointOnGround(position, los, intersection.getZenith(), intersection.getAltitude(), GeodeticPoint gp = model.getPointOnGround(position, los, intersection.getZenith(), intersection.getAltitude(),
...@@ -71,8 +64,6 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest { ...@@ -71,8 +64,6 @@ public class MultiLayerModelTest extends AbstractAlgorithmTest {
Assert.assertNotNull(gp); Assert.assertNotNull(gp);
System.out.println("Distance: " + Vector3D.distance(intersection.getWest(), gp.getWest()));
} }
@Override @Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment