Skip to content

Commit 5c01d37

Browse files
lucas-bremondlucas-bremond
authored
Merge pull request #2 from open-space-collective/dev@lucas
Dev@lucas
2 parents 2c611ff + 41da5a9 commit 5c01d37

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+67987
-36337
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
################################################################################################################################################################
22

3-
# @project Library/Mathematics
3+
# @project Library/Astrodynamics
44
# @file .gitignore
55
# @author Lucas Brémond <lucas@loftorbital.com>
66
# @license TBD

‎.travis.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,20 @@ jobs:
9090

9191
deploy:
9292

93-
provider: releases
94-
api_key: ${GITHUB_API_KEY}
95-
file_glob: true
96-
file:
97-
- ./package/*
98-
skip_cleanup: true
99-
on:
100-
branch: master
101-
tags: true
93+
- provider: releases
94+
api_key: ${GITHUB_API_KEY}
95+
file_glob: true
96+
file:
97+
- ./package/*
98+
skip_cleanup: true
99+
on:
100+
branch: master
101+
tags: true
102+
103+
after_deploy:
104+
105+
- echo "Deploying Python package to PyPI..."
106+
107+
- ./tools/ci/deploy.sh
102108

103109
################################################################################################################################################################

‎CMakeLists.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,17 @@ ELSE ()
263263
MESSAGE (SEND_ERROR "[SGP4] not found.")
264264
ENDIF ()
265265

266+
### NLopt
267+
268+
FIND_PACKAGE ("NLopt" REQUIRED)
269+
270+
IF (NLopt_FOUND)
271+
INCLUDE_DIRECTORIES (${NLopt_INCLUDE_DIRS})
272+
LINK_DIRECTORIES (${NLopt_LIBRARY_DIRS})
273+
ELSE ()
274+
MESSAGE (SEND_ERROR "[NLopt] not found.")
275+
ENDIF ()
276+
266277
### Library :: Core [master]
267278

268279
FIND_PACKAGE ("LibraryCore" "0.1" REQUIRED)
@@ -311,10 +322,10 @@ IF (BUILD_SHARED_LIBRARY)
311322
TARGET_LINK_LIBRARIES (${SHARED_LIBRARY_TARGET} "pthread")
312323
TARGET_LINK_LIBRARIES (${SHARED_LIBRARY_TARGET} ${Boost_LIBRARIES})
313324
TARGET_LINK_LIBRARIES (${SHARED_LIBRARY_TARGET} ${SGP4_LIBRARIES})
325+
TARGET_LINK_LIBRARIES (${SHARED_LIBRARY_TARGET} ${NLopt_LIBRARIES})
314326
TARGET_LINK_LIBRARIES (${SHARED_LIBRARY_TARGET} ${LibraryCore_LIBRARIES})
315327
TARGET_LINK_LIBRARIES (${SHARED_LIBRARY_TARGET} ${LibraryMathematics_LIBRARIES})
316328
TARGET_LINK_LIBRARIES (${SHARED_LIBRARY_TARGET} ${LibraryPhysics_LIBRARIES})
317-
318329

319330
SET_TARGET_PROPERTIES (${SHARED_LIBRARY_TARGET} PROPERTIES VERSION ${PROJECT_VERSION_STRING} SOVERSION ${PROJECT_VERSION_MAJOR} OUTPUT_NAME ${SHARED_LIBRARY_NAME} CLEAN_DIRECT_OUTPUT 1 INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/")
320331

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,10 @@ The **Astrodynamics** library internally uses the following dependencies:
102102
| Boost | 1.67.0 | Boost Software License | [boost.org](https://www.boost.org) |
103103
| Eigen | 3.3.4 | MPL2 | [eigen.tuxfamily.org](http://eigen.tuxfamily.org/index.php) |
104104
| SGP4 | master | Apache-2.0 | [github.com/dnwrnr/sgp4](https://github.com/dnwrnr/sgp4) |
105+
| NLopt | master | LGPL | [github.com/stevengj/nlopt](https://github.com/stevengj/nlopt) |
105106
| Core | master | TBD | [github.com/open-space-collective/library-core](https://github.com/open-space-collective/library-core) |
106107
| Mathematics | master | TBD | [github.com/open-space-collective/library-mathematics](https://github.com/open-space-collective/library-mathematics) |
107-
| Physics | master | TBD | [github.com/open-space-collective/library-physic](https://github.com/open-space-collective/library-physic) |
108+
| Physics | master | TBD | [github.com/open-space-collective/library-physics](https://github.com/open-space-collective/library-physics) |
108109

109110
## Contribution
110111

‎include/Library/Astrodynamics/Access/Generator.hpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,18 @@ class Generator
5959

6060
Generator ( const Environment& anEnvironment,
6161
const std::function<bool (const AER&)>& anAerFilter,
62-
const std::function<bool (const Access&)>& anAccessFilter ) ;
62+
const std::function<bool (const Access&)>& anAccessFilter = {} ) ;
6363

6464
bool isDefined ( ) const ;
6565

6666
Array<Access> computeAccesses ( const physics::time::Interval& anInterval,
6767
const Trajectory& aFromTrajectory,
6868
const Trajectory& aToTrajectory ) const ;
6969

70+
void setStep ( const Duration& aStep ) ;
71+
72+
void setTolerance ( const Duration& aTolerance ) ;
73+
7074
void setAerFilter ( const std::function<bool (const AER&)>& anAerFilter ) ;
7175

7276
void setAccessFilter ( const std::function<bool (const Access&)>& anAccessFilter ) ;
@@ -82,6 +86,9 @@ class Generator
8286

8387
Environment environment_ ;
8488

89+
Duration step_ ;
90+
Duration tolerance_ ;
91+
8592
std::function<bool (const AER&)> aerFilter_ ;
8693
std::function<bool (const Access&)> accessFilter_ ;
8794

‎share/python/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ LINK_DIRECTORIES (${Boost_LIBRARY_DIRS})
6565

6666
SET (PYTHON_INCLUDE_DIR "/usr/include/python3.6m")
6767
SET (PYTHON_LIBRARIES "/usr/lib64/libpython3.6m.so")
68+
# SET (PYTHON_LIBRARIES "/usr/lib64/libpython3.so")
6869

6970
### NumPy
7071

0 commit comments

Comments
 (0)