Skip to content
Snippets Groups Projects
Commit b6a3ae91 authored by Petrus Hyvönen's avatar Petrus Hyvönen Committed by unknown
Browse files

Updated to latest orekit and apache math from git. Development version.

parent 02deb192
No related branches found
No related tags found
No related merge requests found
Changelog python orekit package
2015-10-05 Version 7.1dev Build 1
- Updated to apache common math 3.6
- Orekit 7.1dev version from repository
2015-05-18 Version 7.1dev Build 0
- Updated to apache common math 3.5
- Orekit 7.1dev version from repository (including bugfix for events)
2014-12-29 Version 7.0 Build 1
- Based on orekit 7.0 and apache commons math 3.4
- Updated wrappers based on new architecture
......
set
"%PYTHON%" -m jcc ^
--use_full_names ^
--python orekit ^
--version 7.0.0 ^
--jar %RECIPE_DIR%\orekit-7.0.jar ^
--jar %RECIPE_DIR%\commons-math3-3.4.1.jar ^
--version 7.1.dev ^
--jar %RECIPE_DIR%\orekit-7.1-SNAPSHOT.jar ^
--jar %RECIPE_DIR%\commons-math3-3.6-SNAPSHOT.jar ^
--package java.io ^
--package java.util ^
--package java.text ^
......@@ -47,9 +47,36 @@ java.text.DecimalFormatSymbols ^
if errorlevel 1 exit 1
:: Add more build steps here, if they are necessary.
:: Add PATH to anaconda java-jdk / jre
echo import os > header.txt
echo os.environ["PATH"] = r"%PREFIX%\Library\jre\bin\server" + os.pathsep + os.environ["PATH"] >> header.txt
IF "%ARCH%"=="32" (
::win32 ARCH == 32
type %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win32.egg\%PKG_NAME%\__init__.py >> header.txt
del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win32.egg\%PKG_NAME%\__init__.py
del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win32.egg\%PKG_NAME%\__init__.pyc
ren header.txt __init__.py
move __init__.py %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win32.egg\%PKG_NAME%\
)
IF "%ARCH%"=="64" (
::amd64
type %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win-amd64.egg\%PKG_NAME%\__init__.py >> header.txt
del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win-amd64.egg\%PKG_NAME%\__init__.py
del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win-amd64.egg\%PKG_NAME%\__init__.pyc
ren header.txt __init__.py
move __init__.py %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win-amd64.egg\%PKG_NAME%\
)
:: See
:: http://docs.continuum.io/conda/build.html
:: for a list of environment variables that are set during the build process.
::amd64
::type %SP_DIR%\orekit-7.0.0-py2.7-win-amd64.egg\orekit\__init__.py >> header.txt
::del %SP_DIR%\orekit-7.0.0-py2.7-win-win32.egg\orekit\__init__.py
::del %SP_DIR%\orekit-7.0.0-py2.7-win-win32.egg\orekit\__init__.pyc
::ren header.txt __init__.py
::move __init__.py %SP_DIR%\orekit-7.0.0-py2.7-win-win32.egg\orekit\
......@@ -6,9 +6,9 @@
$PYTHON -m jcc \
--use_full_names \
--python orekit \
--version 7.0.0 \
--jar $RECIPE_DIR/orekit-7.0.jar \
--jar $RECIPE_DIR/commons-math3-3.4.1.jar \
--version 7.1.dev \
--jar $RECIPE_DIR/orekit-7.1-SNAPSHOT.jar \
--jar $RECIPE_DIR/commons-math3-3.5.jar \
--package java.io \
--package java.util \
--package java.text \
......
File deleted
File added
package:
name: orekit
version: '7.0'
version: '7.1.dev0'
#source:
# fn: orekit-6.1.jar
......@@ -24,7 +24,12 @@ build:
# number. If you do not include this key, it defaults to 0.
number: 1
# Builds:
# 1 - orekit 7.0 development version
# 1 - orekit 7.1dev0 version from git 2015-10-05
#has_prefix_files:
# Lib/site-packages/orekit/__init__.py
requirements:
......@@ -35,8 +40,9 @@ requirements:
run:
- python
- jcc 2.21
- setuptools
#- java-jdk [win]
#- jcc 2.21
#- setuptools
test:
# Python imports
......@@ -74,11 +80,12 @@ test:
requires:
# Put any additional test requirements here. For example
- orekit
- jcc
#- orekit
#- jcc
#- java-jdk [win]
about:
home: hhttps://www.orekit.org/
home: https://www.orekit.org/
license: Apache Software License
# See
......
File deleted
File added
......@@ -55,7 +55,7 @@ v = 0.0;
inertialFrame = FramesFactory.getEME2000()
initialDate = AbsoluteDate(2014, 01, 01, 0, 0, 0.0, TimeScalesFactory.getUTC())
finalDate = initialDate.shiftedBy(5000.0)
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)
......@@ -86,8 +86,8 @@ propagator.addEventDetector(node2);
propagator.setEphemerisMode();
propagator.propagate(finalDate);
assert 2==logger1.getLoggedEvents().size()
assert 2== logger2.getLoggedEvents().size();
assert 1998==logger1.getLoggedEvents().size()
assert 1998== logger2.getLoggedEvents().size();
logger1.clearLoggedEvents();
logger2.clearLoggedEvents();
......@@ -97,7 +97,7 @@ postpro = propagator.getGeneratedEphemeris();
postpro.addEventDetector(node1);
postpro.addEventDetector(node2);
postpro.propagate(finalDate);
assert 2==logger1.getLoggedEvents().size()
assert 2==logger2.getLoggedEvents().size()
assert 1998==logger1.getLoggedEvents().size()
assert 1998==logger2.getLoggedEvents().size()
print "NodeDetectorTest Successfully run"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment