From 20893540b81bb16cb3c14231d32dcf74b77a9e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Jonglez?= <clement@jonglez.space>
Date: Wed, 20 Mar 2024 19:39:03 +0100
Subject: [PATCH] unit tests: change orekit_jpype references to orekit
---
test-in-development/PythonDocstringTest.py | 6 ++---
test-in-development/TLEConverterTest.py | 6 ++---
test/AltitudeDetectorTest.py | 6 ++---
test/BackAndForthDetectorTest.py | 12 +++++-----
test/BrouwerLyddanePropagatorTest.py | 8 +++----
test/Context.py | 2 +-
test/EstimationTestUtils.py | 4 ++--
test/EventDetectorTest.py | 8 +++----
test/EventHandlerTest.py | 6 ++---
test/FieldStopOnDecreasingTest.py | 4 ++--
test/GroundFieldOfViewDetectorTest.py | 6 ++---
test/ImpulseManeuverTest.py | 18 +++++++--------
test/InterSatDirectViewDetectorTest.py | 6 ++---
test/IodGibbsTest.py | 2 +-
test/IodLaplaceTest.py | 6 ++---
test/KeplerianConverterTest.py | 26 +++++++++++-----------
test/KlobucharModelTest.py | 4 ++--
test/MeasurementCreator.py | 2 +-
test/NodeDetectorTest.py | 6 ++---
test/OrekitStepHandlerTest.py | 4 ++--
test/PVMeasurementCreator.py | 2 +-
test/SmallManeuverAnalyticalModelTest.py | 6 ++---
test/SpinStabilizedTest.py | 4 ++--
test/TransformTest.py | 6 ++---
tests-in-development/GroundPointingTest.py | 8 +++----
25 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/test-in-development/PythonDocstringTest.py b/test-in-development/PythonDocstringTest.py
index 48761d8..e48569e 100644
--- a/test-in-development/PythonDocstringTest.py
+++ b/test-in-development/PythonDocstringTest.py
@@ -23,9 +23,9 @@ Python version translated from Java by Petrus Hyvönen, SSC 2016
"""
-import orekit_jpype
+import orekit
-orekit_jpype.initVM()
+orekit.initVM()
from org.orekit.frames import FramesFactory, TopocentricFrame
from org.orekit.bodies import OneAxisEllipsoid, GeodeticPoint
@@ -43,7 +43,7 @@ import math
import unittest
import sys
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir("resources")
diff --git a/test-in-development/TLEConverterTest.py b/test-in-development/TLEConverterTest.py
index b4ed0a5..dd291df 100644
--- a/test-in-development/TLEConverterTest.py
+++ b/test-in-development/TLEConverterTest.py
@@ -25,10 +25,10 @@ Java version translated to Python by Petrus Hyvönen, SSC 2017
# TODO: This is outdated use of TLE converter and should be updated.
-import orekit_jpype
+import orekit
-orekit_jpype.initVM()
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+orekit.initVM()
+from orekit.pyhelpers import setup_orekit_curdir
from org.orekit.orbits import PositionAngle
from org.orekit.propagation.conversion import FiniteDifferencePropagatorConverter
diff --git a/test/AltitudeDetectorTest.py b/test/AltitudeDetectorTest.py
index 2f86fb7..71ef211 100644
--- a/test/AltitudeDetectorTest.py
+++ b/test/AltitudeDetectorTest.py
@@ -24,9 +24,9 @@ Python version translated from Java by Petrus Hyvönen, SSC 2014
"""
#Python orekit specifics
-import orekit_jpype
-orekit_jpype.initVM()
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+import orekit
+orekit.initVM()
+from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir('resources')
import unittest
import sys
diff --git a/test/BackAndForthDetectorTest.py b/test/BackAndForthDetectorTest.py
index 50ec150..1501857 100644
--- a/test/BackAndForthDetectorTest.py
+++ b/test/BackAndForthDetectorTest.py
@@ -23,9 +23,9 @@ Python version translated from Java by Petrus Hyvönen, SSC 2014
"""
-import orekit_jpype
-orekit_jpype.initVM()
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+import orekit
+orekit.initVM()
+from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir("resources")
from org.orekit.bodies import GeodeticPoint
@@ -51,7 +51,7 @@ from jpype import JImplements, JOverride, shutdownJVM
@JImplements(EventHandler)
class Visibility(object): # implements EventHandler<ElevationDetector> {
-
+
def __init__(self):
self._visiNb = 0
@@ -70,7 +70,7 @@ class Visibility(object): # implements EventHandler<ElevationDetector> {
@JOverride
def resetState(self, detector, oldState):
return oldState
-
+
class BackAndForthDetectorTest(unittest.TestCase):
def testBackAndForth(self):
@@ -104,7 +104,7 @@ class BackAndForthDetectorTest(unittest.TestCase):
# Detector
visi = Visibility() #.of_(ElevationDetector);
- det = ElevationDetector(stationFrame).withConstantElevation(math.radians(10.0)).withHandler(visi)
+ det = ElevationDetector(stationFrame).withConstantElevation(math.radians(10.0)).withHandler(visi)
propagator.addEventDetector(det)
# Forward propagation (AOS + LOS)
diff --git a/test/BrouwerLyddanePropagatorTest.py b/test/BrouwerLyddanePropagatorTest.py
index ca186db..c86dd7d 100644
--- a/test/BrouwerLyddanePropagatorTest.py
+++ b/test/BrouwerLyddanePropagatorTest.py
@@ -6,9 +6,9 @@ Python version translated from Java orekit 11.1 by Petrus Hyvönen, SSC 2022
"""
-import orekit_jpype as orekit
+import orekit as orekit
orekit.initVM()
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+from orekit.pyhelpers import setup_orekit_curdir
from org.hipparchus.geometry.euclidean.threed import Vector3D
from org.hipparchus.ode.nonstiff import DormandPrince853Integrator
@@ -33,7 +33,7 @@ from org.orekit.forces.gravity import HolmesFeatherstoneAttractionModel
from org.orekit.propagation.analytical import BrouwerLyddanePropagator
from org.hipparchus.util import FastMath, MathUtils
-from orekit_jpype import JArray_double
+from orekit import JArray_double
import unittest
import sys
@@ -77,7 +77,7 @@ class BrouwerLyddanePropagatorTest(unittest.TestCase):
inertialFrame = FramesFactory.getEME2000()
initDate = AbsoluteDate.J2000_EPOCH.shiftedBy(584.)
- timeshift = 60000.0
+ timeshift = 60000.0
# Initial orbit
a = 24396159.0 # semi major axis in meters
diff --git a/test/Context.py b/test/Context.py
index c5a9e1b..a398aeb 100644
--- a/test/Context.py
+++ b/test/Context.py
@@ -27,7 +27,7 @@ import sys
import unittest
# Python orekit specifics
-import orekit_jpype as orekit
+import orekit as orekit
orekit.initVM()
diff --git a/test/EstimationTestUtils.py b/test/EstimationTestUtils.py
index a4cf4fd..4bbf3e9 100644
--- a/test/EstimationTestUtils.py
+++ b/test/EstimationTestUtils.py
@@ -24,11 +24,11 @@ import unittest
import sys
# Python orekit specifics
-import orekit_jpype as orekit
+import orekit as orekit
orekit.initVM()
-from orekit_jpype import JArray_double
+from orekit import JArray_double
from org.orekit.data import DataProvidersManager, ZipJarCrawler, DataContext, DirectoryCrawler
from java.util import Arrays, HashMap
from java.io import File
diff --git a/test/EventDetectorTest.py b/test/EventDetectorTest.py
index f81e76e..ee51aac 100644
--- a/test/EventDetectorTest.py
+++ b/test/EventDetectorTest.py
@@ -22,10 +22,10 @@
"""
-import orekit_jpype
+import orekit
-orekit_jpype.initVM()
-# orekit_jpype.initVM(vmargs='-Xcheck:jni,-verbose:jni,-verbose:class,-XX:+UnlockDiagnosticVMOptions')
+orekit.initVM()
+# orekit.initVM(vmargs='-Xcheck:jni,-verbose:jni,-verbose:class,-XX:+UnlockDiagnosticVMOptions')
from org.orekit.frames import FramesFactory, TopocentricFrame
from org.orekit.bodies import OneAxisEllipsoid, GeodeticPoint
@@ -48,7 +48,7 @@ import sys
import logging
logging.basicConfig(level=logging.DEBUG)
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir("resources")
from jpype import JImplements, JOverride, JFloat, JDouble
diff --git a/test/EventHandlerTest.py b/test/EventHandlerTest.py
index a6e77b0..54c0148 100644
--- a/test/EventHandlerTest.py
+++ b/test/EventHandlerTest.py
@@ -23,8 +23,8 @@ Python version translated from Java by Petrus Hyvönen, SSC 2014
"""
-import orekit_jpype
-orekit_jpype.initVM()
+import orekit
+orekit.initVM()
from org.orekit.frames import FramesFactory, TopocentricFrame
from org.orekit.bodies import OneAxisEllipsoid, GeodeticPoint
@@ -46,7 +46,7 @@ import sys
import jpype
#%% Setup Orekit
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir("resources")
from jpype import JImplements, JOverride
diff --git a/test/FieldStopOnDecreasingTest.py b/test/FieldStopOnDecreasingTest.py
index b86126b..06c69f5 100644
--- a/test/FieldStopOnDecreasingTest.py
+++ b/test/FieldStopOnDecreasingTest.py
@@ -27,9 +27,9 @@ import sys
import unittest
# Python orekit specifics
-import orekit_jpype
+import orekit
-orekit_jpype.initVM()
+orekit.initVM()
from org.orekit.frames import FramesFactory
from org.orekit.propagation import FieldSpacecraftState
diff --git a/test/GroundFieldOfViewDetectorTest.py b/test/GroundFieldOfViewDetectorTest.py
index 1a6b64f..8c328a8 100644
--- a/test/GroundFieldOfViewDetectorTest.py
+++ b/test/GroundFieldOfViewDetectorTest.py
@@ -23,9 +23,9 @@ Python version translated from Java by Petrus Hyvönen, SSC 2016
"""
-import orekit_jpype
+import orekit
-orekit_jpype.initVM()
+orekit.initVM()
from org.orekit.frames import FramesFactory, TopocentricFrame
from org.orekit.bodies import OneAxisEllipsoid, GeodeticPoint
@@ -44,7 +44,7 @@ import math
import unittest
import sys
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir("resources")
diff --git a/test/ImpulseManeuverTest.py b/test/ImpulseManeuverTest.py
index 788d836..5e9c84f 100644
--- a/test/ImpulseManeuverTest.py
+++ b/test/ImpulseManeuverTest.py
@@ -24,9 +24,9 @@ Python version translated from Java by Petrus Hyvönen, SSC 2014
"""
#Python orekit specifics
-import orekit_jpype
-orekit_jpype.initVM()
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+import orekit
+orekit.initVM()
+from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir("resources")
from org.hipparchus.geometry.euclidean.threed import Vector3D
@@ -48,7 +48,7 @@ import sys
import math
class ImpulseManeuverTest(unittest.TestCase):
-
+
def testInclinationManeuver(self):
initialOrbit = KeplerianOrbit(24532000.0,
0.72,
@@ -73,20 +73,20 @@ class ImpulseManeuverTest(unittest.TestCase):
propagator = KeplerianPropagator(initialOrbit,
LofOffset(initialOrbit.getFrame(), LOFType.VVLH))
- det = ImpulseManeuver(NodeDetector(initialOrbit,
+ det = ImpulseManeuver(NodeDetector(initialOrbit,
FramesFactory.getEME2000() ),
Vector3D(dv, Vector3D.PLUS_J), 400.0)
# det = det.of_(NodeDetector)
-
+
propagator.addEventDetector(det)
-
+
propagated = propagator.propagate(initialOrbit.getDate().shiftedBy(8000.0))
self.assertAlmostEqual(0.0028257, propagated.getI(), delta=1.0e-6)
-
+
if __name__ == '__main__':
#unittest.main()
-
+
suite = unittest.TestLoader().loadTestsFromTestCase(ImpulseManeuverTest)
ret = not unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
sys.exit(ret)
diff --git a/test/InterSatDirectViewDetectorTest.py b/test/InterSatDirectViewDetectorTest.py
index db6b132..61caa90 100644
--- a/test/InterSatDirectViewDetectorTest.py
+++ b/test/InterSatDirectViewDetectorTest.py
@@ -25,10 +25,10 @@ Python version translated from Java by Petrus Hyvönen, SSC 2019
import sys
import unittest
-import orekit_jpype
+import orekit
-orekit_jpype.initVM()
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+orekit.initVM()
+from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir("resources") # orekit-data.zip shall be in current dir
diff --git a/test/IodGibbsTest.py b/test/IodGibbsTest.py
index bf21cb4..d0c679e 100644
--- a/test/IodGibbsTest.py
+++ b/test/IodGibbsTest.py
@@ -27,7 +27,7 @@ import sys
import unittest
# Python orekit specifics
-import orekit_jpype as orekit
+import orekit as orekit
orekit.initVM()
from org.orekit.data import DataProvidersManager, ZipJarCrawler, DataContext
diff --git a/test/IodLaplaceTest.py b/test/IodLaplaceTest.py
index 6ce549a..7767e71 100644
--- a/test/IodLaplaceTest.py
+++ b/test/IodLaplaceTest.py
@@ -27,10 +27,10 @@ import sys
import unittest
# Python orekit specifics
-import orekit_jpype as orekit
+import orekit as orekit
orekit.initVM()
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+from orekit.pyhelpers import setup_orekit_curdir
from org.orekit.data import DataProvidersManager, ZipJarCrawler, DataContext
@@ -65,7 +65,7 @@ from PVMeasurementCreator import PVMeasurementCreator
from org.orekit.estimation.iod import IodLaplace
from org.orekit.utils import IERSConventions, Constants, AbsolutePVCoordinates
from org.orekit.bodies import OneAxisEllipsoid, GeodeticPoint
-from orekit_jpype import JArray_double
+from orekit import JArray_double
#from .EstimationTestUtils import EstimationTestUtils
diff --git a/test/KeplerianConverterTest.py b/test/KeplerianConverterTest.py
index 0ca5ba1..c92b96c 100644
--- a/test/KeplerianConverterTest.py
+++ b/test/KeplerianConverterTest.py
@@ -23,9 +23,9 @@ Python version translated from Java by Petrus Hyvönen, SSC 2014
"""
-import orekit_jpype
-orekit_jpype.initVM()
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+import orekit
+orekit.initVM()
+from orekit.pyhelpers import setup_orekit_curdir
from org.orekit.frames import FramesFactory
from org.orekit.propagation.analytical import KeplerianPropagator
@@ -44,7 +44,7 @@ from java.util import Arrays
class KeplerianConverterTest(unittest.TestCase):
-
+
position = Vector3D(7.0e6, 1.0e6, 4.0e6)
velocity = Vector3D(-500.0, 8000.0, 1000.0)
mu = 3.9860047e14
@@ -56,15 +56,15 @@ class KeplerianConverterTest(unittest.TestCase):
positionOnly,
expectedRMS,
*args):
-
+
p = KeplerianPropagator(orbit)
-
+
sample = []
dt = 0.0
while dt < duration:
sample.append(p.propagate(orbit.getDate().shiftedBy(dt)))
dt += stepSize
-
+
builder = KeplerianPropagatorBuilder(OrbitType.KEPLERIAN.convertType(orbit),
PositionAngleType.MEAN,
@@ -73,7 +73,7 @@ class KeplerianConverterTest(unittest.TestCase):
fitter = FiniteDifferencePropagatorConverter(builder, threshold, 1000)
fitter.convert(Arrays.asList(sample), positionOnly, [])
-
+
self.assertAlmostEqual(fitter.getRMS(), 0.01 * expectedRMS, delta=expectedRMS)
prop = fitter.getAdaptedPropagator() #(KeplerianPropagator)
@@ -81,7 +81,7 @@ class KeplerianConverterTest(unittest.TestCase):
eps = 1.0e-12
self.assertAlmostEqual(orbit.getPVCoordinates().getPosition().getX(),
- fitted.getPVCoordinates().getPosition().getX(),
+ fitted.getPVCoordinates().getPosition().getX(),
delta = eps * orbit.getPVCoordinates().getPosition().getX())
self.assertAlmostEqual(orbit.getPVCoordinates().getPosition().getY(),
fitted.getPVCoordinates().getPosition().getY(),
@@ -102,14 +102,14 @@ class KeplerianConverterTest(unittest.TestCase):
def testConversionPositionVelocity(self):
self.checkFit(self.orbit, 86400, 300, 1.0e-3, False, 1.89e-8)
-
+
def testConversionPositionOnly(self):
self.checkFit(self.orbit, 86400, 300, 1.0e-3, True, 2.90e-8)
-
+
# #@Test(expected = OrekitException.class)
-# def testConversionWithFreeParameter(self):
+# def testConversionWithFreeParameter(self):
# self.checkFit(self.orbit, 86400, 300, 1.0e-3, True, 2.65e-8, "toto");
-
+
def setUp(self):
setup_orekit_curdir("resources")
diff --git a/test/KlobucharModelTest.py b/test/KlobucharModelTest.py
index 3d879bd..6db22ef 100644
--- a/test/KlobucharModelTest.py
+++ b/test/KlobucharModelTest.py
@@ -24,8 +24,8 @@
"""
# Python orekit specifics
-import orekit_jpype
-orekit_jpype.initVM()
+import orekit
+orekit.initVM()
from org.orekit.models.earth.ionosphere import KlobucharIonoModel, IonosphericModel
diff --git a/test/MeasurementCreator.py b/test/MeasurementCreator.py
index 2cb1479..1d0e0f7 100644
--- a/test/MeasurementCreator.py
+++ b/test/MeasurementCreator.py
@@ -23,7 +23,7 @@ import sys
import unittest
# Python orekit specifics
-import orekit_jpype as orekit
+import orekit as orekit
orekit.initVM()
#from org.orekit.estimation.measurements
diff --git a/test/NodeDetectorTest.py b/test/NodeDetectorTest.py
index 737c841..118e375 100644
--- a/test/NodeDetectorTest.py
+++ b/test/NodeDetectorTest.py
@@ -24,14 +24,14 @@ Python version translated from Java by Petrus Hyvönen, SSC 2014
"""
# Python orekit specifics
-import orekit_jpype
+import orekit
-orekit_jpype.initVM()
+orekit.initVM()
import sys
import unittest
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir("resources")
diff --git a/test/OrekitStepHandlerTest.py b/test/OrekitStepHandlerTest.py
index 9bdccb5..beec0b9 100644
--- a/test/OrekitStepHandlerTest.py
+++ b/test/OrekitStepHandlerTest.py
@@ -27,9 +27,9 @@ from collections import deque
import threading
import time
-import orekit_jpype
+import orekit
-jcc = orekit_jpype.initVM()
+jcc = orekit.initVM()
from jpype import JImplements, JOverride
diff --git a/test/PVMeasurementCreator.py b/test/PVMeasurementCreator.py
index 03953ba..955af76 100644
--- a/test/PVMeasurementCreator.py
+++ b/test/PVMeasurementCreator.py
@@ -23,7 +23,7 @@ import sys
import unittest
# Python orekit specifics
-import orekit_jpype as orekit
+import orekit as orekit
orekit.initVM()
from MeasurementCreator import MeasurementCreator
diff --git a/test/SmallManeuverAnalyticalModelTest.py b/test/SmallManeuverAnalyticalModelTest.py
index a1aa380..12283d7 100644
--- a/test/SmallManeuverAnalyticalModelTest.py
+++ b/test/SmallManeuverAnalyticalModelTest.py
@@ -22,10 +22,10 @@
Python version translated from Java by Petrus Hyvönen, SSC 2015
"""
-import orekit_jpype
-orekit_jpype.initVM()
+import orekit
+orekit.initVM()
-from orekit_jpype.pyhelpers import setup_orekit_curdir
+from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir("resources")
from org.orekit.forces.maneuvers import SmallManeuverAnalyticalModel, ConstantThrustManeuver
diff --git a/test/SpinStabilizedTest.py b/test/SpinStabilizedTest.py
index ce4d89b..a00e34b 100644
--- a/test/SpinStabilizedTest.py
+++ b/test/SpinStabilizedTest.py
@@ -27,8 +27,8 @@ import sys
import unittest
# Python orekit specifics
-import orekit_jpype
-orekit_jpype.initVM()
+import orekit
+orekit.initVM()
from org.orekit.data import DataProvidersManager, ZipJarCrawler, DataContext, DirectoryCrawler
from java.io import File
diff --git a/test/TransformTest.py b/test/TransformTest.py
index 57e1357..8082bf3 100644
--- a/test/TransformTest.py
+++ b/test/TransformTest.py
@@ -23,10 +23,10 @@ Python version translated from Java by Petrus Hyvönen, SSC 2019
"""
-import orekit_jpype
+import orekit
-orekit_jpype.initVM()
-from orekit_jpype.pyhelpers import setup_orekit_curdir, datetime_to_absolutedate
+orekit.initVM()
+from orekit.pyhelpers import setup_orekit_curdir, datetime_to_absolutedate
setup_orekit_curdir("resources")
diff --git a/tests-in-development/GroundPointingTest.py b/tests-in-development/GroundPointingTest.py
index f3ec787..e8e62b2 100644
--- a/tests-in-development/GroundPointingTest.py
+++ b/tests-in-development/GroundPointingTest.py
@@ -1,13 +1,13 @@
# Python orekit specifics
import sys
-import orekit_jpype
-orekit_jpype.initVM()
+import orekit
+orekit.initVM()
import unittest
from org.orekit.data import DataProvidersManager, ZipJarCrawler, DataContext, DirectoryCrawler
from java.io import File
-from orekit_jpype.pyhelpers import absolutedate_to_datetime
+from orekit.pyhelpers import absolutedate_to_datetime
from org.hipparchus import CalculusFieldElement
from org.hipparchus.analysis.differentiation import GradientField, UnivariateDerivative1, UnivariateDerivative2
from org.hipparchus.complex import ComplexField
@@ -42,7 +42,7 @@ class GroundPointingTest(unittest.TestCase):
EARTH_FIXED_FRAME = None
def setUp(self):
-
+
DM = DataContext.getDefault().getDataProvidersManager()
datafile = File('../test/resources')
if not datafile.exists():
--
GitLab