Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add departure epoch loop #2

Merged
merged 7 commits into from
Mar 10, 2016
Merged

Add departure epoch loop #2

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a61139
Add departure epoch loop to lambertScanner
ennehekma Mar 8, 2016
1798b7f
Add departure epoch loop to lambert_scanner mode. Associated test has…
ennehekma Mar 9, 2016
cda34a7
Correct blank lines
ennehekma Mar 9, 2016
c703fe8
Correct blank lines
ennehekma Mar 9, 2016
d11d5ee
Change variable naming to be consistent with the rest
ennehekma Mar 9, 2016
e76ef32
Add loop to scan map plot script to generate scanmap for each departu…
ennehekma Mar 9, 2016
0a97391
Fix small formatting issues and update Panda version in requirements.
ennehekma Mar 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config/lambert_scanner.json.empty
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
// If departure_epoch array is left empty, the TLE epoch for the departure object is assumed.
"departure_epoch" : [],

// Set departure epoch grid: [range (s), # of steps]
"departure_epoch_grid" : [,],

// Set time-of-flight grid: [min (s), max (s), # of steps].
"time_of_flight_grid" : [,,],

Expand Down
42 changes: 27 additions & 15 deletions include/D2D/lambertScanner.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,26 @@ struct LambertScannerInput
* Constructs data struct based on verified input parameters.
*
* @sa checkLambertScannerInput, executeLambertScanner
* @param[in] aCatalogPath Path to TLE catalog
* @param[in] aDatabasePath Path to SQLite database
* @param[in] aDepartureEpoch Departure epoch for all transfers
* @param[in] aTimeOfFlightMinimum Minimum time-of-flight [s]
* @param[in] aTimeOfFlightMaximum Maximum time-of-flight [s]
* @param[in] someTimeOfFlightSteps Number of steps to take in time-of-flight grid
* @param[in] aTimeOfFlightStepSize Time-of-flight step size (derived parameter) [s]
* @param[in] progradeFlag Flag indicating if prograde transfer should be computed
* (false = retrograde)
* @param[in] aRevolutionsMaximum Maximum number of revolutions
* @param[in] aShortlistLength Number of transfers to include in shortlist
* @param[in] aShortlistPath Path to shortlist file
* @param[in] aCatalogPath Path to TLE catalog
* @param[in] aDatabasePath Path to SQLite database
* @param[in] aDepartureEpochInitial Departure epoch grid initial epoch
* @param[in] aDepartureEpochSteps Number of steps to take in departure epoch grid
* @param[in] aDepartureEpochStepSize Departure epoch grid step size (derived parameter) [s]
* @param[in] aTimeOfFlightMinimum Minimum time-of-flight [s]
* @param[in] aTimeOfFlightMaximum Maximum time-of-flight [s]
* @param[in] someTimeOfFlightSteps Number of steps to take in time-of-flight grid
* @param[in] aTimeOfFlightStepSize Time-of-flight step size (derived parameter) [s]
* @param[in] progradeFlag Flag indicating if prograde transfer should be computed
* (false = retrograde)
* @param[in] aRevolutionsMaximum Maximum number of revolutions
* @param[in] aShortlistLength Number of transfers to include in shortlist
* @param[in] aShortlistPath Path to shortlist file
*/
LambertScannerInput( const std::string& aCatalogPath,
const std::string& aDatabasePath,
const DateTime& aDepartureEpoch,
const DateTime& aDepartureEpochInitial,
const double aDepartureEpochSteps,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ennehekma To be consistent with the time-of-flight variable, can you change this to:

someDepartureEpochSteps

const double aDepartureEpochStepSize,
const double aTimeOfFlightMinimum,
const double aTimeOfFlightMaximum,
const double someTimeOfFlightSteps,
Expand All @@ -78,7 +82,9 @@ struct LambertScannerInput
const std::string& aShortlistPath )
: catalogPath( aCatalogPath ),
databasePath( aDatabasePath ),
departureEpoch( aDepartureEpoch ),
departureEpochInitial( aDepartureEpochInitial ),
departureEpochSteps( aDepartureEpochSteps ),
departureEpochStepSize( aDepartureEpochStepSize ),
timeOfFlightMinimum( aTimeOfFlightMinimum ),
timeOfFlightMaximum( aTimeOfFlightMaximum ),
timeOfFlightSteps( someTimeOfFlightSteps ),
Expand All @@ -96,7 +102,13 @@ struct LambertScannerInput
const std::string databasePath;

//! Departure epoch.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ennehekma Can you change this to say:

//! Initial departure epoch.

const DateTime departureEpoch;
const DateTime departureEpochInitial;

//! Number of departure epoch steps.
const double departureEpochSteps;

//! Departure epoch grid step size.
const double departureEpochStepSize;

//! Minimum time-of-flight [s].
const double timeOfFlightMinimum;
Expand Down
Loading