From 3c7f3feedc11dfb610206231992eac946864b626 Mon Sep 17 00:00:00 2001
From: petrush <petrus.hyvonen@sscspace.com>
Date: Fri, 6 Jan 2017 19:01:08 +0100
Subject: [PATCH] Updates for future potential python 3 version
---
orekit-conda-recipe/meta.yaml | 26 +++----
orekit-conda-recipe/pyhelpers.py | 14 ++--
orekit-conda-recipe/run_test.sh | 12 ++++
.../test/AbstractDetectorTest.py | 8 +--
.../test/AltitudeDetectorTest.py | 46 ++++++------
.../test/BackAndForthDetectorTest.py | 6 +-
orekit-conda-recipe/test/EventDetectorTest.py | 4 +-
orekit-conda-recipe/test/EventHandlerTest.py | 5 +-
.../test/GroundFieldOfViewDetectorTest.py | 2 +-
.../test/ImpulseManeuverTest.py | 56 +++++++--------
.../test/KeplerianConverterTest.py | 42 +++++------
orekit-conda-recipe/test/NodeDetectorTest.py | 70 +++++++++----------
.../test/SmallManeuverAnalyticalModelTest.py | 6 +-
13 files changed, 150 insertions(+), 147 deletions(-)
create mode 100644 orekit-conda-recipe/run_test.sh
diff --git a/orekit-conda-recipe/meta.yaml b/orekit-conda-recipe/meta.yaml
index a7dae07..aab71ed 100644
--- a/orekit-conda-recipe/meta.yaml
+++ b/orekit-conda-recipe/meta.yaml
@@ -15,23 +15,24 @@ build:
# 0 - orekit 8.0 release version of orekit 2016-07-03
#has_prefix_files:
# Lib/site-packages/orekit/__init__.py
- rpaths:
- - lib/
- - jre/lib/amd64/
- - jre/lib/amd64/server/
+
+ rpaths: #[linux]
+ - lib/ #[linux]
+ - jre/lib/amd64/ #[linux]
+ - jre/lib/amd64/server/ #[linux]
requirements:
build:
- - jcc 2.21
+ - jcc >=2.21
- python
- setuptools
- - java-jdk #[linux]
+ - java-jdk #[linux or win]
run:
- python
- - java-jdk [linux]
+ - java-jdk #[linux or win]
#- jcc 2.21
#- setuptools
@@ -57,16 +58,7 @@ test:
commands:
# You can put test commands to be run here. Use this to test that the
# entry points work.
- - python AltitudeDetectorTest.py
- - python NodeDetectorTest.py
- - python ImpulseManeuverTest.py
- - python BackAndForthDetectorTest.py
- - python KeplerianConverterTest.py
- - python EventHandlerTest.py
- - python AbstractDetectorTest.py
- - python EventDetectorTest.py
- - python SmallManeuverAnalyticalModelTest.py
- - python GroundFieldOfViewDetectorTest.py
+
# You can also put a file called run_test.py in the recipe that will be run
# at test time.
diff --git a/orekit-conda-recipe/pyhelpers.py b/orekit-conda-recipe/pyhelpers.py
index 0e2064d..ab0cc43 100644
--- a/orekit-conda-recipe/pyhelpers.py
+++ b/orekit-conda-recipe/pyhelpers.py
@@ -31,7 +31,7 @@ from datetime import datetime
def setup_orekit_curdir():
- '''Setup the java engine with orekit.
+ """Setup the java engine with orekit.
This functionsand loads the orekit-data.zip from the current directory
and sets up the orekit DataProviders to access it.
@@ -40,12 +40,12 @@ def setup_orekit_curdir():
orekit.initVM()
- '''
+ """
DM = DataProvidersManager.getInstance()
datafile = File('orekit-data.zip')
if not datafile.exists():
- print 'File :', datafile.absolutePath, ' not found'
+ print('File :', datafile.absolutePath, ' not found')
crawler = ZipJarCrawler(datafile)
DM.clearProviders()
@@ -53,8 +53,8 @@ def setup_orekit_curdir():
def absolutedate_to_datetime(orekit_absolutedate):
- ''' Converts between orekit.AbsoluteDate objects
- and python datetime objects (utc)'''
+ """ Converts between orekit.AbsoluteDate objects
+ and python datetime objects (utc)"""
utc = TimeScalesFactory.getUTC()
or_comp = orekit_absolutedate.getComponents(utc)
@@ -70,14 +70,14 @@ def absolutedate_to_datetime(orekit_absolutedate):
int(1000000.0 * (seconds - math.floor(seconds))))
def datetime_to_absolutedate(dt_date):
- ''' Converts between orekit.AbsoluteDate objects
+ """ Converts between orekit.AbsoluteDate objects
and python datetime objects (utc)
Args:
dt_date (datetime): python datetime object to convert
Returns:
- AbsoluteDate: time in orekit format'''
+ AbsoluteDate: time in orekit format"""
utc = TimeScalesFactory.getUTC()
return AbsoluteDate(dt_date.year,
diff --git a/orekit-conda-recipe/run_test.sh b/orekit-conda-recipe/run_test.sh
new file mode 100644
index 0000000..a966a92
--- /dev/null
+++ b/orekit-conda-recipe/run_test.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+cd test
+python AltitudeDetectorTest.py
+python NodeDetectorTest.py
+python ImpulseManeuverTest.py
+python BackAndForthDetectorTest.py
+python KeplerianConverterTest.py
+python EventHandlerTest.py
+python AbstractDetectorTest.py
+python EventDetectorTest.py
+python SmallManeuverAnalyticalModelTest.py
+python GroundFieldOfViewDetectorTest.py
\ No newline at end of file
diff --git a/orekit-conda-recipe/test/AbstractDetectorTest.py b/orekit-conda-recipe/test/AbstractDetectorTest.py
index a683b68..cf99943 100644
--- a/orekit-conda-recipe/test/AbstractDetectorTest.py
+++ b/orekit-conda-recipe/test/AbstractDetectorTest.py
@@ -34,7 +34,7 @@ class PassCounter(PythonEventHandler):
return EventHandler.Action.CONTINUE
def resetState(self, detector, oldState):
- return oldState;
+ return oldState
class MyElevationDetector(PythonAbstractDetector):
@@ -46,7 +46,7 @@ class MyElevationDetector(PythonAbstractDetector):
dmax = float(PythonAbstractDetector.DEFAULT_MAXCHECK)
dthresh = float(PythonAbstractDetector.DEFAULT_THRESHOLD)
dmaxiter = PythonAbstractDetector.DEFAULT_MAX_ITER
- if handler == None:
+ if handler is None:
handler = StopOnEvent().of_(MyElevationDetector)
super(MyElevationDetector, self).__init__(dmax, dthresh, dmaxiter, handler) #super(maxCheck, threshold, maxIter, handler);
@@ -71,7 +71,7 @@ class AbstractDetectorTest(unittest.TestCase):
def testOwnElevationDetector(self):
- initialDate = AbsoluteDate(2014, 01, 01, 23, 30, 00.000, TimeScalesFactory.getUTC())
+ initialDate = AbsoluteDate(2014, 1, 1, 23, 30, 00.000, TimeScalesFactory.getUTC())
inertialFrame = FramesFactory.getEME2000() # inertial frame for orbit definition
position = Vector3D(-6142438.668, 3492467.560, -25767.25680)
velocity = Vector3D(505.8479685, 942.7809215, 7435.922231)
@@ -106,7 +106,7 @@ class AbstractDetectorTest(unittest.TestCase):
finalState = kepler.propagate(initialDate.shiftedBy(60*60*24.0*15))
- print mycounter.passes
+ print(mycounter.passes)
self.assertEquals(52, mycounter.passes)
if __name__ == '__main__':
diff --git a/orekit-conda-recipe/test/AltitudeDetectorTest.py b/orekit-conda-recipe/test/AltitudeDetectorTest.py
index f2d8214..28177b5 100644
--- a/orekit-conda-recipe/test/AltitudeDetectorTest.py
+++ b/orekit-conda-recipe/test/AltitudeDetectorTest.py
@@ -30,31 +30,31 @@ from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir() # orekit-data.zip shall be in current dir
#from math import abs
-from org.hipparchus.util import FastMath;
-from org.orekit.bodies import CelestialBodyFactory;
-from org.orekit.bodies import OneAxisEllipsoid;
-from org.orekit.frames import FramesFactory;
-from org.orekit.orbits import KeplerianOrbit;
-from org.orekit.orbits import PositionAngle;
-from org.orekit.propagation import SpacecraftState;
-from org.orekit.propagation.analytical import KeplerianPropagator;
-from org.orekit.propagation.events.handlers import StopOnEvent;
-from org.orekit.time import AbsoluteDate;
-from org.orekit.time import TimeScalesFactory;
+from org.hipparchus.util import FastMath
+from org.orekit.bodies import CelestialBodyFactory
+from org.orekit.bodies import OneAxisEllipsoid
+from org.orekit.frames import FramesFactory
+from org.orekit.orbits import KeplerianOrbit
+from org.orekit.orbits import PositionAngle
+from org.orekit.propagation import SpacecraftState
+from org.orekit.propagation.analytical import KeplerianPropagator
+from org.orekit.propagation.events.handlers import StopOnEvent
+from org.orekit.time import AbsoluteDate
+from org.orekit.time import TimeScalesFactory
from org.orekit.propagation.events import AltitudeDetector
-EME2000 = FramesFactory.getEME2000();
-initialDate = AbsoluteDate(2009,1,1,TimeScalesFactory.getUTC());
-a = 8000000.0;
-e = 0.1;
-earthRadius = 6378137.0;
-earthF = 1.0 / 298.257223563;
-apogee = a*(1+e);
-alt = apogee - earthRadius - 500;
+EME2000 = FramesFactory.getEME2000()
+initialDate = AbsoluteDate(2009,1,1,TimeScalesFactory.getUTC())
+a = 8000000.0
+e = 0.1
+earthRadius = 6378137.0
+earthF = 1.0 / 298.257223563
+apogee = a*(1+e)
+alt = apogee - earthRadius - 500
#// initial state is at apogee
initialOrbit = KeplerianOrbit(a,e,0.0,0.0,0.0,FastMath.PI,PositionAngle.MEAN,EME2000,
- initialDate,CelestialBodyFactory.getEarth().getGM());
+ initialDate,CelestialBodyFactory.getEarth().getGM())
initialState = SpacecraftState(initialOrbit)
kepPropagator = KeplerianPropagator(initialOrbit)
altDetector = AltitudeDetector(alt,
@@ -69,9 +69,9 @@ assert abs(finalState.getPVCoordinates().getPosition().getNorm()-earthRadius -al
assert abs(44.079 - finalState.getDate().durationFrom(initialDate))< 1.0e-3
#// propagation to the past
-kepPropagator.resetInitialState(initialState);
-finalState = kepPropagator.propagate(initialDate.shiftedBy(-1000.0));
+kepPropagator.resetInitialState(initialState)
+finalState = kepPropagator.propagate(initialDate.shiftedBy(-1000.0))
assert abs(finalState.getPVCoordinates().getPosition().getNorm()-earthRadius - alt)< 1e-5
assert abs(-44.079 - finalState.getDate().durationFrom(initialDate))< 1.0e-3
-print "AltitudeDetectorTest successfully run"
\ No newline at end of file
+print("AltitudeDetectorTest successfully run")
diff --git a/orekit-conda-recipe/test/BackAndForthDetectorTest.py b/orekit-conda-recipe/test/BackAndForthDetectorTest.py
index 87a260c..cfb053c 100644
--- a/orekit-conda-recipe/test/BackAndForthDetectorTest.py
+++ b/orekit-conda-recipe/test/BackAndForthDetectorTest.py
@@ -87,11 +87,11 @@ class BackAndForthDetectorTest(unittest.TestCase):
propagator = KeplerianPropagator(iniOrb)
# Station
- stationPosition = GeodeticPoint(math.radians(0.), math.radians(100.), 110.);
+ stationPosition = GeodeticPoint(math.radians(0.), math.radians(100.), 110.)
earth = OneAxisEllipsoid(Constants.WGS84_EARTH_EQUATORIAL_RADIUS,
Constants.WGS84_EARTH_FLATTENING,
- FramesFactory.getITRF(IERSConventions.IERS_2010, True));
-
+ FramesFactory.getITRF(IERSConventions.IERS_2010, True))
+
stationFrame = TopocentricFrame(earth, stationPosition, "")
# Detector
diff --git a/orekit-conda-recipe/test/EventDetectorTest.py b/orekit-conda-recipe/test/EventDetectorTest.py
index 50aa8a3..fc9e199 100644
--- a/orekit-conda-recipe/test/EventDetectorTest.py
+++ b/orekit-conda-recipe/test/EventDetectorTest.py
@@ -89,7 +89,7 @@ class EventDetectorTest(unittest.TestCase):
def testOwnElevationDetector(self):
- initialDate = AbsoluteDate(2014, 01, 01, 23, 30, 00.000, TimeScalesFactory.getUTC())
+ initialDate = AbsoluteDate(2014, 1, 1, 23, 30, 00.000, TimeScalesFactory.getUTC())
inertialFrame = FramesFactory.getEME2000() # inertial frame for orbit definition
position = Vector3D(-6142438.668, 3492467.560, -25767.25680)
velocity = Vector3D(505.8479685, 942.7809215, 7435.922231)
@@ -120,7 +120,7 @@ class EventDetectorTest(unittest.TestCase):
finalState = kepler.propagate(initialDate.shiftedBy(60*60*24.0*15))
- print detector.passes
+ print(detector.passes)
self.assertEquals(52, detector.passes)
if __name__ == '__main__':
diff --git a/orekit-conda-recipe/test/EventHandlerTest.py b/orekit-conda-recipe/test/EventHandlerTest.py
index 4956660..8681a73 100644
--- a/orekit-conda-recipe/test/EventHandlerTest.py
+++ b/orekit-conda-recipe/test/EventHandlerTest.py
@@ -53,7 +53,7 @@ setup_orekit_curdir()
class EventHandlerTest(unittest.TestCase):
def testOwnContinueOnEvent(self):
- initialDate = AbsoluteDate(2014, 01, 01, 23, 30, 00.000, TimeScalesFactory.getUTC())
+ initialDate = AbsoluteDate(2014, 1, 1, 23, 30, 00.000, TimeScalesFactory.getUTC())
inertialFrame = FramesFactory.getEME2000() # inertial frame for orbit definition
position = Vector3D(-6142438.668, 3492467.560, -25767.25680)
velocity = Vector3D(505.8479685, 942.7809215, 7435.922231)
@@ -87,8 +87,7 @@ class EventHandlerTest(unittest.TestCase):
return EventHandler.Action.CONTINUE
def resetState(self, detector, oldState):
- return oldState;
-
+ return oldState
#%% detectors
detector = ElevationDetector(sta1Frame).withConstantElevation(elevation)
diff --git a/orekit-conda-recipe/test/GroundFieldOfViewDetectorTest.py b/orekit-conda-recipe/test/GroundFieldOfViewDetectorTest.py
index 4a809a3..c8967bc 100644
--- a/orekit-conda-recipe/test/GroundFieldOfViewDetectorTest.py
+++ b/orekit-conda-recipe/test/GroundFieldOfViewDetectorTest.py
@@ -98,7 +98,7 @@ class GroundFieldOfViewDetectorTest(unittest.TestCase):
self.assertEquals(2, expected.size())
self.assertEquals(2, actual.size())
- for i in xrange(0, 1):
+ for i in range(0, 1):
expectedDate = expected.get(i).getState().getDate()
actualDate = actual.get(i).getState().getDate()
# same event times to within 1s.
diff --git a/orekit-conda-recipe/test/ImpulseManeuverTest.py b/orekit-conda-recipe/test/ImpulseManeuverTest.py
index 8c69688..4ea6228 100644
--- a/orekit-conda-recipe/test/ImpulseManeuverTest.py
+++ b/orekit-conda-recipe/test/ImpulseManeuverTest.py
@@ -29,19 +29,19 @@ orekit.initVM()
from orekit.pyhelpers import setup_orekit_curdir
setup_orekit_curdir()
-from org.hipparchus.geometry.euclidean.threed import Vector3D;
-from org.hipparchus.util import FastMath;
-from org.orekit.attitudes import LofOffset;
-from org.orekit.frames import FramesFactory;
-from org.orekit.frames import LOFType;
-from org.orekit.orbits import KeplerianOrbit;
-from org.orekit.orbits import PositionAngle;
-from org.orekit.propagation.analytical import KeplerianPropagator;
-from org.orekit.propagation.events import NodeDetector;
-from org.orekit.time import AbsoluteDate;
-from org.orekit.time import DateComponents;
-from org.orekit.time import TimeComponents;
-from org.orekit.time import TimeScalesFactory;
+from org.hipparchus.geometry.euclidean.threed import Vector3D
+from org.hipparchus.util import FastMath
+from org.orekit.attitudes import LofOffset
+from org.orekit.frames import FramesFactory
+from org.orekit.frames import LOFType
+from org.orekit.orbits import KeplerianOrbit
+from org.orekit.orbits import PositionAngle
+from org.orekit.propagation.analytical import KeplerianPropagator
+from org.orekit.propagation.events import NodeDetector
+from org.orekit.time import AbsoluteDate
+from org.orekit.time import DateComponents
+from org.orekit.time import TimeComponents
+from org.orekit.time import TimeScalesFactory
from org.orekit.forces.maneuvers import ImpulseManeuver
import unittest
import sys
@@ -58,30 +58,30 @@ class ImpulseManeuverTest(unittest.TestCase):
2.0,
PositionAngle.MEAN,
FramesFactory.getEME2000(),
- AbsoluteDate(DateComponents(2008, 06, 23),
+ AbsoluteDate(DateComponents(2008, 6, 23),
TimeComponents(14, 18, 37.0),
TimeScalesFactory.getUTC()),
- 3.986004415e14);
-
- a = initialOrbit.getA();
- e = initialOrbit.getE();
- i = initialOrbit.getI();
- mu = initialOrbit.getMu();
- vApo = math.sqrt(mu * (1 - e) / (a * (1 + e)));
- dv = 0.99 * math.tan(i) * vApo;
-
+ 3.986004415e14)
+
+ a = initialOrbit.getA()
+ e = initialOrbit.getE()
+ i = initialOrbit.getI()
+ mu = initialOrbit.getMu()
+ vApo = math.sqrt(mu * (1 - e) / (a * (1 + e)))
+ dv = 0.99 * math.tan(i) * vApo
+
propagator = KeplerianPropagator(initialOrbit,
- LofOffset(initialOrbit.getFrame(), LOFType.VVLH));
-
+ LofOffset(initialOrbit.getFrame(), LOFType.VVLH))
+
det = ImpulseManeuver(NodeDetector(initialOrbit,
FramesFactory.getEME2000() ),
- Vector3D(dv, Vector3D.PLUS_J), 400.0);
+ Vector3D(dv, Vector3D.PLUS_J), 400.0)
det = det.of_(NodeDetector)
propagator.addEventDetector(det)
- propagated = propagator.propagate(initialOrbit.getDate().shiftedBy(8000.0));
-
+ propagated = propagator.propagate(initialOrbit.getDate().shiftedBy(8000.0))
+
self.assertAlmostEqual(0.0028257, propagated.getI(), delta=1.0e-6)
if __name__ == '__main__':
diff --git a/orekit-conda-recipe/test/KeplerianConverterTest.py b/orekit-conda-recipe/test/KeplerianConverterTest.py
index 1d3f671..885dff7 100644
--- a/orekit-conda-recipe/test/KeplerianConverterTest.py
+++ b/orekit-conda-recipe/test/KeplerianConverterTest.py
@@ -27,14 +27,14 @@ import orekit
orekit.initVM()
from orekit.pyhelpers import setup_orekit_curdir
-from org.orekit.frames import FramesFactory;
-from org.orekit.propagation.analytical import KeplerianPropagator;
-from org.orekit.time import AbsoluteDate;
+from org.orekit.frames import FramesFactory
+from org.orekit.propagation.analytical import KeplerianPropagator
+from org.orekit.time import AbsoluteDate
from org.hipparchus.geometry.euclidean.threed import Vector3D
from org.orekit.orbits import EquinoctialOrbit
-from org.orekit.orbits import Orbit;
-from org.orekit.orbits import OrbitType;
-from org.orekit.orbits import PositionAngle;
+from org.orekit.orbits import Orbit
+from org.orekit.orbits import OrbitType
+from org.orekit.orbits import PositionAngle
from org.orekit.utils import PVCoordinates
from org.orekit.propagation.conversion import FiniteDifferencePropagatorConverter
from org.orekit.propagation.conversion import KeplerianPropagatorBuilder
@@ -45,10 +45,10 @@ 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;
-
+ position = Vector3D(7.0e6, 1.0e6, 4.0e6)
+ velocity = Vector3D(-500.0, 8000.0, 1000.0)
+ mu = 3.9860047e14
+
def checkFit(self, orbit,
duration,
stepSize,
@@ -76,29 +76,29 @@ class KeplerianConverterTest(unittest.TestCase):
self.assertAlmostEqual(fitter.getRMS(), 0.01 * expectedRMS, delta=expectedRMS)
- prop = fitter.getAdaptedPropagator(); #(KeplerianPropagator)
- fitted = prop.getInitialState().getOrbit();
+ prop = fitter.getAdaptedPropagator() #(KeplerianPropagator)
+ fitted = prop.getInitialState().getOrbit()
- eps = 1.0e-12;
+ eps = 1.0e-12
self.assertAlmostEqual(orbit.getPVCoordinates().getPosition().getX(),
fitted.getPVCoordinates().getPosition().getX(),
delta = eps * orbit.getPVCoordinates().getPosition().getX())
self.assertAlmostEqual(orbit.getPVCoordinates().getPosition().getY(),
fitted.getPVCoordinates().getPosition().getY(),
- delta = eps * orbit.getPVCoordinates().getPosition().getY());
+ delta = eps * orbit.getPVCoordinates().getPosition().getY())
self.assertAlmostEqual(orbit.getPVCoordinates().getPosition().getZ(),
fitted.getPVCoordinates().getPosition().getZ(),
- delta = eps * orbit.getPVCoordinates().getPosition().getZ());
+ delta = eps * orbit.getPVCoordinates().getPosition().getZ())
self.assertAlmostEqual(orbit.getPVCoordinates().getVelocity().getX(),
fitted.getPVCoordinates().getVelocity().getX(),
- delta = -eps * orbit.getPVCoordinates().getVelocity().getX());
+ delta = -eps * orbit.getPVCoordinates().getVelocity().getX())
self.assertAlmostEqual(orbit.getPVCoordinates().getVelocity().getY(),
fitted.getPVCoordinates().getVelocity().getY(),
- delta = eps * orbit.getPVCoordinates().getVelocity().getY());
+ delta = eps * orbit.getPVCoordinates().getVelocity().getY())
self.assertAlmostEqual(orbit.getPVCoordinates().getVelocity().getZ(),
fitted.getPVCoordinates().getVelocity().getZ(),
- delta = eps * orbit.getPVCoordinates().getVelocity().getZ());
+ delta = eps * orbit.getPVCoordinates().getVelocity().getZ())
def testConversionPositionVelocity(self):
self.checkFit(self.orbit, 86400, 300, 1.0e-3, False, 1.89e-8)
@@ -113,10 +113,10 @@ class KeplerianConverterTest(unittest.TestCase):
def setUp(self):
setup_orekit_curdir()
- self.initDate = AbsoluteDate.J2000_EPOCH.shiftedBy(584.);
+ self.initDate = AbsoluteDate.J2000_EPOCH.shiftedBy(584.)
self.orbit = EquinoctialOrbit(PVCoordinates(self.position, self.velocity),
- FramesFactory.getEME2000(), self.initDate, self.mu);
-
+ FramesFactory.getEME2000(), self.initDate, self.mu)
+
if __name__ == '__main__':
diff --git a/orekit-conda-recipe/test/NodeDetectorTest.py b/orekit-conda-recipe/test/NodeDetectorTest.py
index 75038b2..7c7b139 100644
--- a/orekit-conda-recipe/test/NodeDetectorTest.py
+++ b/orekit-conda-recipe/test/NodeDetectorTest.py
@@ -32,29 +32,29 @@ setup_orekit_curdir() # orekit-data.zip shall be in current dir
from org.orekit.propagation.events import EventsLogger
from org.orekit.propagation.events import NodeDetector
-from org.hipparchus.ode.nonstiff import DormandPrince853Integrator;
-from org.hipparchus.util import FastMath;
-from org.orekit.frames import FramesFactory;
-from org.orekit.orbits import KeplerianOrbit;
-from org.orekit.orbits import PositionAngle;
-from org.orekit.propagation import SpacecraftState;
-from org.orekit.propagation.events.handlers import ContinueOnEvent;
-from org.orekit.propagation.numerical import NumericalPropagator;
-from org.orekit.time import AbsoluteDate;
-from org.orekit.time import TimeScalesFactory;
-from org.orekit.utils import Constants;
+from org.hipparchus.ode.nonstiff import DormandPrince853Integrator
+from org.hipparchus.util import FastMath
+from org.orekit.frames import FramesFactory
+from org.orekit.orbits import KeplerianOrbit
+from org.orekit.orbits import PositionAngle
+from org.orekit.propagation import SpacecraftState
+from org.orekit.propagation.events.handlers import ContinueOnEvent
+from org.orekit.propagation.numerical import NumericalPropagator
+from org.orekit.time import AbsoluteDate
+from org.orekit.time import TimeScalesFactory
+from org.orekit.utils import Constants
from orekit import JArray_double
# Floats are needed to be specific in the orekit interface
-a = 800000.0 + Constants.WGS84_EARTH_EQUATORIAL_RADIUS;
-e = 0.0001;
-i = FastMath.toRadians(98.0);
-w = -90.0;
-raan = 0.0;
-v = 0.0;
+a = 800000.0 + Constants.WGS84_EARTH_EQUATORIAL_RADIUS
+e = 0.0001
+i = FastMath.toRadians(98.0)
+w = -90.0
+raan = 0.0
+v = 0.0
inertialFrame = FramesFactory.getEME2000()
-initialDate = AbsoluteDate(2014, 01, 01, 0, 0, 0.0, TimeScalesFactory.getUTC())
+initialDate = AbsoluteDate(2014, 1, 1, 0, 0, 0.0, TimeScalesFactory.getUTC())
finalDate = initialDate.shiftedBy(70*24*60*60.0)
initialOrbit = KeplerianOrbit(a, e, i, w, raan, v, PositionAngle.TRUE, inertialFrame, initialDate, Constants.WGS84_EARTH_MU)
initialState = SpacecraftState(initialOrbit, 1000.0)
@@ -66,38 +66,38 @@ integrator = DormandPrince853Integrator(0.001, 1000.0,
JArray_double.cast_(tol[0]),
JArray_double.cast_(tol[1]))
-propagator = NumericalPropagator(integrator);
-propagator.setInitialState(initialState);
+propagator = NumericalPropagator(integrator)
+propagator.setInitialState(initialState)
# Define 2 instances of NodeDetector:
rawDetector = NodeDetector(1e-6,
initialState.getOrbit(),
initialState.getFrame()).withHandler(ContinueOnEvent().of_(NodeDetector))
-logger1 = EventsLogger();
-node1 = logger1.monitorDetector(rawDetector);
-logger2 = EventsLogger();
-node2 = logger2.monitorDetector(rawDetector);
+logger1 = EventsLogger()
+node1 = logger1.monitorDetector(rawDetector)
+logger2 = EventsLogger()
+node2 = logger2.monitorDetector(rawDetector)
-propagator.addEventDetector(node1);
-propagator.addEventDetector(node2);
+propagator.addEventDetector(node1)
+propagator.addEventDetector(node2)
# First propagation
-propagator.setEphemerisMode();
-propagator.propagate(finalDate);
+propagator.setEphemerisMode()
+propagator.propagate(finalDate)
assert 1998==logger1.getLoggedEvents().size()
assert 1998== logger2.getLoggedEvents().size();
-logger1.clearLoggedEvents();
-logger2.clearLoggedEvents();
+logger1.clearLoggedEvents()
+logger2.clearLoggedEvents()
-postpro = propagator.getGeneratedEphemeris();
+postpro = propagator.getGeneratedEphemeris()
# Post-processing
-postpro.addEventDetector(node1);
-postpro.addEventDetector(node2);
-postpro.propagate(finalDate);
+postpro.addEventDetector(node1)
+postpro.addEventDetector(node2)
+postpro.propagate(finalDate)
assert 1998==logger1.getLoggedEvents().size()
assert 1998==logger2.getLoggedEvents().size()
-print "NodeDetectorTest Successfully run"
+print("NodeDetectorTest Successfully run")
diff --git a/orekit-conda-recipe/test/SmallManeuverAnalyticalModelTest.py b/orekit-conda-recipe/test/SmallManeuverAnalyticalModelTest.py
index f33445b..2c9713c 100644
--- a/orekit-conda-recipe/test/SmallManeuverAnalyticalModelTest.py
+++ b/orekit-conda-recipe/test/SmallManeuverAnalyticalModelTest.py
@@ -68,7 +68,7 @@ class SmallManeuverAnalyticalModelTest(unittest.TestCase):
radians(123.456),
0.0, PositionAngle.MEAN,
FramesFactory.getEME2000(),
- AbsoluteDate(DateComponents(2004, 01, 01),
+ AbsoluteDate(DateComponents(2004, 1, 1),
TimeComponents(23, 30, 00.000),
TimeScalesFactory.getUTC()),
Constants.EIGEN5C_EARTH_MU)
@@ -111,7 +111,7 @@ class SmallManeuverAnalyticalModelTest(unittest.TestCase):
radians(123.456),
0.0, PositionAngle.MEAN,
FramesFactory.getEME2000(),
- AbsoluteDate(DateComponents(2004, 01, 01),
+ AbsoluteDate(DateComponents(2004, 1, 1),
TimeComponents(23, 30, 00.000),
TimeScalesFactory.getUTC()),
Constants.EIGEN5C_EARTH_MU)
@@ -153,7 +153,7 @@ class SmallManeuverAnalyticalModelTest(unittest.TestCase):
radians(123.456),
radians(1.23456), PositionAngle.MEAN,
FramesFactory.getEME2000(),
- AbsoluteDate(DateComponents(2004, 01, 01),
+ AbsoluteDate(DateComponents(2004, 1, 1),
TimeComponents(23, 30, 00.000),
TimeScalesFactory.getUTC()),
Constants.EIGEN5C_EARTH_MU)
--
GitLab