Migration of packages under refining (generators, metrics, models) under

tutorials

src/tutorials/java/RefiningPleiades/GroundRefining.java

@@ -37,12 +37,8 @@ import org.orekit.rugged.api.Rugged;
 import org.orekit.rugged.api.RuggedBuilder;
 import org.orekit.rugged.errors.RuggedException;
 import org.orekit.rugged.linesensor.LineSensor;
-import org.orekit.rugged.refining.generators.GroundMeasureGenerator;
 import org.orekit.rugged.refining.measures.Noise;
 import org.orekit.rugged.refining.measures.SensorToGroundMapping;
-import org.orekit.rugged.refining.metrics.DistanceTools;
-import org.orekit.rugged.refining.models.OrbitModel;
-import org.orekit.rugged.refining.models.PleiadesViewingModel;
 import org.orekit.time.AbsoluteDate;
 import org.orekit.utils.AngularDerivativesFilter;
 import org.orekit.utils.CartesianDerivativesFilter;
@@ -50,6 +46,11 @@ import org.orekit.utils.PVCoordinates;
 import org.orekit.utils.TimeStampedAngularCoordinates;
 import org.orekit.utils.TimeStampedPVCoordinates;
 
+import RefiningPleiades.generators.GroundMeasureGenerator;
+import RefiningPleiades.metrics.DistanceTools;
+import RefiningPleiades.models.OrbitModel;
+import RefiningPleiades.models.PleiadesViewingModel;
+
 /**
  * Class for testing refining (fulcrum points study)
  * with or without noisy measurements

src/tutorials/java/RefiningPleiades/InterRefining.java

@@ -39,13 +39,8 @@ import org.orekit.rugged.api.Rugged;
 import org.orekit.rugged.api.RuggedBuilder;
 import org.orekit.rugged.errors.RuggedException;
 import org.orekit.rugged.linesensor.LineSensor;
-import org.orekit.rugged.refining.generators.GroundMeasureGenerator;
-import org.orekit.rugged.refining.generators.InterMeasureGenerator;
 import org.orekit.rugged.refining.measures.Noise;
 import org.orekit.rugged.refining.measures.SensorToGroundMapping;
-import org.orekit.rugged.refining.metrics.DistanceTools;
-import org.orekit.rugged.refining.models.OrbitModel;
-import org.orekit.rugged.refining.models.PleiadesViewingModel;
 import org.orekit.time.AbsoluteDate;
 import org.orekit.utils.AngularDerivativesFilter;
 import org.orekit.utils.CartesianDerivativesFilter;
@@ -53,6 +48,12 @@ import org.orekit.utils.PVCoordinates;
 import org.orekit.utils.TimeStampedAngularCoordinates;
 import org.orekit.utils.TimeStampedPVCoordinates;
 
+import RefiningPleiades.generators.GroundMeasureGenerator;
+import RefiningPleiades.generators.InterMeasureGenerator;
+import RefiningPleiades.metrics.DistanceTools;
+import RefiningPleiades.models.OrbitModel;
+import RefiningPleiades.models.PleiadesViewingModel;
+
 /**
  * Class for testing refining (liaison points study)
  * with or without noisy measurements

src/tutorials/java/RefiningPleiades/Refining.java

@@ -28,13 +28,14 @@ import org.orekit.rugged.adjustment.AdjustmentContext;
 import org.orekit.rugged.api.Rugged;
 import org.orekit.rugged.errors.RuggedException;
 import org.orekit.rugged.errors.RuggedMessages;
-import org.orekit.rugged.refining.generators.GroundMeasureGenerator;
-import org.orekit.rugged.refining.generators.InterMeasureGenerator;
 import org.orekit.rugged.refining.measures.Noise;
 import org.orekit.rugged.refining.measures.Observables;
 import org.orekit.rugged.refining.measures.SensorToGroundMapping;
 import org.orekit.rugged.refining.measures.SensorToSensorMapping;
-import org.orekit.rugged.refining.metrics.LocalisationMetrics;
+
+import RefiningPleiades.generators.GroundMeasureGenerator;
+import RefiningPleiades.generators.InterMeasureGenerator;
+import RefiningPleiades.metrics.LocalisationMetrics;
 
 /**
  * Class for refining problems common methods

src/main/java/org/orekit/rugged/refining/generators/GroundMeasureGenerator.java → src/tutorials/java/RefiningPleiades/generators/GroundMeasureGenerator.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.generators;
+package RefiningPleiades.generators;
 
 import org.hipparchus.geometry.euclidean.threed.Vector3D;
 import org.hipparchus.random.GaussianRandomGenerator;

src/main/java/org/orekit/rugged/refining/generators/InterMeasureGenerator.java → src/tutorials/java/RefiningPleiades/generators/InterMeasureGenerator.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.generators;
+package RefiningPleiades.generators;
 
 import org.hipparchus.random.GaussianRandomGenerator;
 import org.hipparchus.random.UncorrelatedRandomVectorGenerator;
@@ -29,10 +29,11 @@ import org.orekit.rugged.linesensor.SensorPixel;
 import org.orekit.rugged.refining.measures.Noise;
 import org.orekit.rugged.refining.measures.Observables;
 import org.orekit.rugged.refining.measures.SensorToSensorMapping;
-import org.orekit.rugged.refining.metrics.DistanceTools;
 import org.orekit.rugged.utils.SpacecraftToObservedBody;
 import org.orekit.time.AbsoluteDate;
 
+import RefiningPleiades.metrics.DistanceTools;
+
 /**
  * Inter-measures generator (sensor to sensor mapping).
  * @author Jonathan Guinet

src/main/java/org/orekit/rugged/refining/generators/Measurable.java → src/tutorials/java/RefiningPleiades/generators/Measurable.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.generators;
+package RefiningPleiades.generators;
 
 import org.orekit.rugged.errors.RuggedException;
 import org.orekit.rugged.refining.measures.Noise;

src/main/java/org/orekit/rugged/refining/metrics/DistanceTools.java → src/tutorials/java/RefiningPleiades/metrics/DistanceTools.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.metrics;
+package RefiningPleiades.metrics;
 
 import org.hipparchus.geometry.euclidean.threed.Vector3D;
 import org.hipparchus.util.FastMath;
@@ -42,7 +42,7 @@ public class DistanceTools {
      * @param lat1 Latitude of first geodetic point (rad)
      * @param long2 Longitude of second geodetic point (rad)
      * @param lat2 Latitude of second geodetic point (rad)
-     * @param computeAngular if true, distance will be angular
+     * @param computeAngular if true, distance will be angular, otherwise will be in meters
      * @return distance in meters or radians if flag computeAngular is true
      */
     public static double computeDistance(final double long1, final double lat1,

src/main/java/org/orekit/rugged/refining/metrics/LocalisationMetrics.java → src/tutorials/java/RefiningPleiades/metrics/LocalisationMetrics.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.metrics;
+package RefiningPleiades.metrics;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -142,11 +142,11 @@ public class LocalisationMetrics {
 
             final GeodeticPoint esGP = rugged.directLocation(date, lineSensor.getPosition(),
                                                              lineSensor.getLOS(date,
-                                                                               (int) gtSP.getPixelNumber()));
+                                                             (int) gtSP.getPixelNumber()));
             // Compute distance
             double distance = DistanceTools.computeDistance(esGP.getLongitude(), esGP.getLatitude(),
-                                                     gtGP.getLongitude(), gtGP.getLatitude(),
-                                                     computeAngular);
+                                                            gtGP.getLongitude(), gtGP.getLatitude(),
+                                                            computeAngular);
             count += distance;
             if (distance > resMax) {
                 resMax = distance;

src/main/java/org/orekit/rugged/refining/models/OrbitModel.java → src/tutorials/java/RefiningPleiades/models/OrbitModel.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.models;
+package RefiningPleiades.models;
 
 import org.hipparchus.geometry.euclidean.threed.Rotation;
 import org.hipparchus.geometry.euclidean.threed.RotationOrder;

src/main/java/org/orekit/rugged/refining/models/PleiadesViewingModel.java → src/tutorials/java/RefiningPleiades/models/PleiadesViewingModel.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.models;
+package RefiningPleiades.models;
 
 import org.hipparchus.geometry.euclidean.threed.Rotation;
 import org.hipparchus.geometry.euclidean.threed.RotationConvention;