From 60ffe84812f52701cc5efdaaf7d353d7b792d5a5 Mon Sep 17 00:00:00 2001 From: Guylaine Prat <guylaine.prat@c-s.fr> Date: Thu, 2 Nov 2017 12:07:14 +0100 Subject: [PATCH] Move adjustment.measurements.Noise under tutorials --- src/tutorials/java/RefiningPleiades/GroundRefining.java | 2 +- src/tutorials/java/RefiningPleiades/InterRefining.java | 2 +- src/tutorials/java/RefiningPleiades/Refining.java | 2 +- .../RefiningPleiades/generators/GroundMeasurementGenerator.java | 1 - .../RefiningPleiades/generators/InterMeasurementGenerator.java | 1 - src/tutorials/java/RefiningPleiades/generators/Measurable.java | 1 - .../java/RefiningPleiades/generators}/Noise.java | 2 +- 7 files changed, 4 insertions(+), 7 deletions(-) rename src/{main/java/org/orekit/rugged/adjustment/measurements => tutorials/java/RefiningPleiades/generators}/Noise.java (98%) diff --git a/src/tutorials/java/RefiningPleiades/GroundRefining.java b/src/tutorials/java/RefiningPleiades/GroundRefining.java index 132c3910..4a0bb5d5 100644 --- a/src/tutorials/java/RefiningPleiades/GroundRefining.java +++ b/src/tutorials/java/RefiningPleiades/GroundRefining.java @@ -37,7 +37,6 @@ 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.adjustment.measurements.Noise; import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping; import org.orekit.time.AbsoluteDate; import org.orekit.utils.AngularDerivativesFilter; @@ -47,6 +46,7 @@ import org.orekit.utils.TimeStampedAngularCoordinates; import org.orekit.utils.TimeStampedPVCoordinates; import RefiningPleiades.generators.GroundMeasurementGenerator; +import RefiningPleiades.generators.Noise; import RefiningPleiades.metrics.DistanceTools; import RefiningPleiades.models.OrbitModel; import RefiningPleiades.models.PleiadesViewingModel; diff --git a/src/tutorials/java/RefiningPleiades/InterRefining.java b/src/tutorials/java/RefiningPleiades/InterRefining.java index a342d080..14d85445 100644 --- a/src/tutorials/java/RefiningPleiades/InterRefining.java +++ b/src/tutorials/java/RefiningPleiades/InterRefining.java @@ -39,7 +39,6 @@ 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.adjustment.measurements.Noise; import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping; import org.orekit.time.AbsoluteDate; import org.orekit.utils.AngularDerivativesFilter; @@ -50,6 +49,7 @@ import org.orekit.utils.TimeStampedPVCoordinates; import RefiningPleiades.generators.GroundMeasurementGenerator; import RefiningPleiades.generators.InterMeasurementGenerator; +import RefiningPleiades.generators.Noise; import RefiningPleiades.metrics.DistanceTools; import RefiningPleiades.models.OrbitModel; import RefiningPleiades.models.PleiadesViewingModel; diff --git a/src/tutorials/java/RefiningPleiades/Refining.java b/src/tutorials/java/RefiningPleiades/Refining.java index ee3c8fae..314be8b3 100644 --- a/src/tutorials/java/RefiningPleiades/Refining.java +++ b/src/tutorials/java/RefiningPleiades/Refining.java @@ -28,13 +28,13 @@ 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.adjustment.measurements.Noise; import org.orekit.rugged.adjustment.measurements.Observables; import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping; import org.orekit.rugged.adjustment.measurements.SensorToSensorMapping; import RefiningPleiades.generators.GroundMeasurementGenerator; import RefiningPleiades.generators.InterMeasurementGenerator; +import RefiningPleiades.generators.Noise; import RefiningPleiades.metrics.LocalisationMetrics; /** diff --git a/src/tutorials/java/RefiningPleiades/generators/GroundMeasurementGenerator.java b/src/tutorials/java/RefiningPleiades/generators/GroundMeasurementGenerator.java index c7a7d95c..71176c31 100644 --- a/src/tutorials/java/RefiningPleiades/generators/GroundMeasurementGenerator.java +++ b/src/tutorials/java/RefiningPleiades/generators/GroundMeasurementGenerator.java @@ -26,7 +26,6 @@ import org.orekit.rugged.api.Rugged; import org.orekit.rugged.errors.RuggedException; import org.orekit.rugged.linesensor.LineSensor; import org.orekit.rugged.linesensor.SensorPixel; -import org.orekit.rugged.adjustment.measurements.Noise; import org.orekit.rugged.adjustment.measurements.Observables; import org.orekit.rugged.adjustment.measurements.SensorToGroundMapping; import org.orekit.time.AbsoluteDate; diff --git a/src/tutorials/java/RefiningPleiades/generators/InterMeasurementGenerator.java b/src/tutorials/java/RefiningPleiades/generators/InterMeasurementGenerator.java index 152f413f..589610c6 100644 --- a/src/tutorials/java/RefiningPleiades/generators/InterMeasurementGenerator.java +++ b/src/tutorials/java/RefiningPleiades/generators/InterMeasurementGenerator.java @@ -26,7 +26,6 @@ import org.orekit.rugged.errors.RuggedExceptionWrapper; import org.orekit.rugged.errors.RuggedMessages; import org.orekit.rugged.linesensor.LineSensor; import org.orekit.rugged.linesensor.SensorPixel; -import org.orekit.rugged.adjustment.measurements.Noise; import org.orekit.rugged.adjustment.measurements.Observables; import org.orekit.rugged.adjustment.measurements.SensorToSensorMapping; import org.orekit.rugged.utils.SpacecraftToObservedBody; diff --git a/src/tutorials/java/RefiningPleiades/generators/Measurable.java b/src/tutorials/java/RefiningPleiades/generators/Measurable.java index 8f30c415..cfcf213b 100644 --- a/src/tutorials/java/RefiningPleiades/generators/Measurable.java +++ b/src/tutorials/java/RefiningPleiades/generators/Measurable.java @@ -17,7 +17,6 @@ package RefiningPleiades.generators; import org.orekit.rugged.errors.RuggedException; -import org.orekit.rugged.adjustment.measurements.Noise; /** For measurements generator. * @author Lucie Labat-Allee diff --git a/src/main/java/org/orekit/rugged/adjustment/measurements/Noise.java b/src/tutorials/java/RefiningPleiades/generators/Noise.java similarity index 98% rename from src/main/java/org/orekit/rugged/adjustment/measurements/Noise.java rename to src/tutorials/java/RefiningPleiades/generators/Noise.java index 74a7bfbf..4ca4d0ae 100644 --- a/src/main/java/org/orekit/rugged/adjustment/measurements/Noise.java +++ b/src/tutorials/java/RefiningPleiades/generators/Noise.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.orekit.rugged.adjustment.measurements; +package RefiningPleiades.generators; /** Class for adding a noise to measurements. -- GitLab