Completion of Junit tests (WIP)

src/test/java/org/orekit/rugged/TestUtils.java

@@ -83,7 +83,7 @@ public class TestUtils {
      * @since 2.0
      */
     public static void clearFactories() {
-        
+
         clearFactoryMaps(CelestialBodyFactory.class);
         CelestialBodyFactory.clearCelestialBodyLoaders();
         clearFactoryMaps(FramesFactory.class);
@@ -112,7 +112,7 @@ public class TestUtils {
     /** Clean up of factory map
      * @param factoryClass
      * @since 2.0
-    */
+     */
     private static void clearFactoryMaps(Class<?> factoryClass) {
         try {
             
@@ -132,7 +132,7 @@ public class TestUtils {
      * @param factoryClass
      * @param cachedFieldsClass
      * @since 2.0
-    */
+     */
     private static void clearFactory(Class<?> factoryClass, Class<?> cachedFieldsClass) {
         try {
             
@@ -149,16 +149,15 @@ public class TestUtils {
     }
     
     
-
-    
     /**
-     * Generate satellite ephemeris
+     * Generate satellite ephemeris.
      */
     public static void addSatellitePV(TimeScale gps, Frame eme2000, Frame itrf,
                                       ArrayList<TimeStampedPVCoordinates> satellitePVList,
                                       String absDate,
                                       double px, double py, double pz, double vx, double vy, double vz)
         throws OrekitException {
+        
         AbsoluteDate ephemerisDate = new AbsoluteDate(absDate, gps);
         Vector3D position = new Vector3D(px, py, pz);
         Vector3D velocity = new Vector3D(vx, vy, vz);
@@ -170,10 +169,11 @@ public class TestUtils {
     }
 
     /**
-     * Generate satellite attitudes
+     * Generate satellite attitudes.
      */
     public static void addSatelliteQ(TimeScale gps, ArrayList<TimeStampedAngularCoordinates> satelliteQList,
                                      String absDate, double q0, double q1, double q2, double q3) {
+        
         AbsoluteDate attitudeDate = new AbsoluteDate(absDate, gps);
         Rotation rotation = new Rotation(q0, q1, q2, q3, true);
         TimeStampedAngularCoordinates pair =
@@ -181,27 +181,29 @@ public class TestUtils {
         satelliteQList.add(pair);
     }
 
-    /** Create an Earth for Junit tests
+    /** Create an Earth for Junit tests.
      * @return the Earth as the WGS84 ellipsoid
      * @throws OrekitException
      */
     public static BodyShape createEarth()
        throws OrekitException {
+        
         return new OneAxisEllipsoid(Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
                                     Constants.WGS84_EARTH_FLATTENING,
                                     FramesFactory.getITRF(IERSConventions.IERS_2010, true));
     }
 
-    /** Created a gravity field
+    /** Created a gravity field.
      * @return normalized spherical harmonics coefficients
      * @throws OrekitException
      */
     public static NormalizedSphericalHarmonicsProvider createGravityField()
         throws OrekitException {
+        
         return GravityFieldFactory.getNormalizedProvider(12, 12);
     }
 
-    /** Create an orbit
+    /** Create an orbit.
      * @param mu Earth gravitational constant
      * @return the orbit
      * @throws OrekitException
@@ -289,6 +291,7 @@ public class TestUtils {
      * @return the perfect LOS list
      */
     public static LOSBuilder createLOSPerfectLine(Vector3D center, Vector3D normal, double halfAperture, int n) {
+
         List<Vector3D> list = new ArrayList<Vector3D>(n);
         for (int i = 0; i < n; ++i) {
             double alpha = (halfAperture * (2 * i + 1 - n)) / (n - 1);
@@ -302,6 +305,7 @@ public class TestUtils {
      */
     public static TimeDependentLOS createLOSCurvedLine(Vector3D center, Vector3D normal,
                                                  double halfAperture, double sagitta, int n) {
+        
         Vector3D u = Vector3D.crossProduct(center, normal);
         List<Vector3D> list = new ArrayList<Vector3D>(n);
         for (int i = 0; i < n; ++i) {
@@ -320,15 +324,10 @@ public class TestUtils {
      * @throws OrekitException
      */
     public static List<TimeStampedPVCoordinates> orbitToPV(Orbit orbit, BodyShape earth,
-                                                     AbsoluteDate//    /** TODO GP add comments
-//                                                   */
-//                                                   public NormalizedSphericalHarmonicsProvider createGravityField() throws OrekitException {
-//                                                       
-//                                                       return GravityFieldFactory.getNormalizedProvider(12, 12);
-//                                                   }
- minDate, AbsoluteDate maxDate,
-                                                     double step)
+                                                           AbsoluteDate minDate, AbsoluteDate maxDate,
+                                                           double step) 
         throws OrekitException {
+        
         Propagator propagator = new KeplerianPropagator(orbit);
         propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
         propagator.propagate(minDate);
@@ -353,6 +352,7 @@ public class TestUtils {
                                                          AbsoluteDate minDate, AbsoluteDate maxDate,
                                                          double step)
         throws OrekitException {
+        
         Propagator propagator = new KeplerianPropagator(orbit);
         propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
         propagator.propagate(minDate);

src/test/java/org/orekit/rugged/api/RuggedBuilderTest.java

@@ -794,6 +794,7 @@ public class RuggedBuilderTest {
                                                      AbsoluteDate minDate, AbsoluteDate maxDate,
                                                      double step)
         throws OrekitException {
+        
         Propagator propagator = new KeplerianPropagator(orbit);
         propagator.setAttitudeProvider(new YawCompensation(orbit.getFrame(), new NadirPointing(orbit.getFrame(), earth)));
         propagator.propagate(minDate);

src/test/java/org/orekit/rugged/api/RuggedTest.java

@@ -1385,34 +1385,49 @@ public class RuggedTest {
 
         double[] distancesBetweenLOS = refiningTest.computeDistancesBetweenLOS(realPixelA, realPixelB);
         
-        double expectedDistanceBetweenLOS = 3.887643821673281; // 3.8880172668944164
-        double expectedDistanceToTheGround = 6368020.620436288; // 6368020.560101736
+        double expectedDistanceBetweenLOS = 1.4324023535733088; //  3.9004125582817846
+        double expectedDistanceToTheGround = 6367488.110070567; // 6368020.030898279
+
         Assert.assertEquals(expectedDistanceBetweenLOS, distancesBetweenLOS[0], 1.e-2);
         Assert.assertEquals(expectedDistanceToTheGround, distancesBetweenLOS[1], 5.e-1);
         
-        
     }
     
     @Test
-    public void testDistanceBetweenLOSDerivatives() throws RuggedException {
+    public void testDistanceBetweenLOSDerivatives() throws RuggedException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
         
-//        try {
             RefiningTest refiningTest = new RefiningTest();
             refiningTest.InitRefiningTest();
 
             final SensorPixel realPixelA = new SensorPixel(2005.015883575199, 18004.968656395424);
             final SensorPixel realPixelB = new SensorPixel(4798.487736488162, 13952.2195710654);
-            double losDistance = 3.887643821673281;
-            double earthDistance = 6368020.620436288;
+            double losDistance = 1.4324023534834665;
+            double earthDistance = 6367488.110062852;
 
-            // TODO GP a debugger
-//            DerivativeStructure[] distancesBetweenLOSwithDS = refiningTest.computeDistancesBetweenLOSDerivatives(realPixelA, realPixelB, losDistance, earthDistance);
+            DerivativeStructure[] distancesBetweenLOSwithDS = refiningTest.computeDistancesBetweenLOSDerivatives(realPixelA, realPixelB, losDistance, earthDistance);
 
-//
-//        } catch (InvocationTargetException | NoSuchMethodException |
-//                SecurityException | IllegalAccessException | IllegalArgumentException e) {
-//            Assert.fail(e.getLocalizedMessage());
-//        }
+            // Minimum distance between LOS
+            DerivativeStructure dMin = distancesBetweenLOSwithDS[0]; // [1.4324023534834665, 153938.2318141503, 679398.14124085, -12779.33148208561, -191388.29547926865, -669127.0811123198]
+            // Minimum distance to the ground
+            DerivativeStructure dCentralBody = distancesBetweenLOSwithDS[1]; // [6367488.110062852, 7018752.447074092, -1578384.972353925, -589929.2355500134, -6850070.113251391, 1958371.974455633]
+            
+            System.out.println(dMin.getValue());
+            System.out.println(dMin.getReal());
+            for (int i = 0; i < dMin.getAllDerivatives().length; i++) {
+                System.out.println("i = " + i + " : " + dMin.getAllDerivatives()[i]);
+            }
+            System.out.println(dMin.getFreeParameters());
+            System.out.println(dMin.getOrder());
+//            int[] orders = {0,0,0,0};
+//            System.out.println(dMin.getPartialDerivative(orders));
+            
+            System.out.println(dCentralBody.getValue());
+            System.out.println(dCentralBody.getReal());
+            for (int i = 0; i < dCentralBody.getAllDerivatives().length; i++) {
+                System.out.println("i = " + i + " : " + dCentralBody.getAllDerivatives()[i]);
+            }
+            System.out.println(dCentralBody.getFreeParameters());
+            System.out.println(dCentralBody.getOrder());
     }