From b35379b995f1ba9337a34c84ea9db62b1d3c6c26 Mon Sep 17 00:00:00 2001 From: Dominic Dirkx Date: Wed, 22 Jan 2025 16:25:53 +0100 Subject: [PATCH] More reductions --- tudatpy/CMakeLists.txt | 2 +- .../kernel/expose_numerical_simulation.cpp | 490 +++++++++--------- .../expose_estimation_setup.cpp | 94 ++-- 3 files changed, 293 insertions(+), 293 deletions(-) diff --git a/tudatpy/CMakeLists.txt b/tudatpy/CMakeLists.txt index aca877b3..b16d48fc 100644 --- a/tudatpy/CMakeLists.txt +++ b/tudatpy/CMakeLists.txt @@ -94,7 +94,7 @@ YACMA_PYTHON_MODULE(kernel # kernel/expose_numerical_simulation/expose_environment.cpp # kernel/expose_numerical_simulation/expose_estimation.cpp - kernel/expose_numerical_simulation/expose_environment_setup.cpp +# kernel/expose_numerical_simulation/expose_environment_setup.cpp # kernel/expose_numerical_simulation/expose_environment_setup/expose_aerodynamic_coefficient_setup.cpp # kernel/expose_numerical_simulation/expose_environment_setup/expose_atmosphere_setup.cpp # kernel/expose_numerical_simulation/expose_environment_setup/expose_ephemeris_setup.cpp diff --git a/tudatpy/kernel/expose_numerical_simulation.cpp b/tudatpy/kernel/expose_numerical_simulation.cpp index 7f550b0c..2400c521 100644 --- a/tudatpy/kernel/expose_numerical_simulation.cpp +++ b/tudatpy/kernel/expose_numerical_simulation.cpp @@ -60,251 +60,251 @@ void expose_numerical_simulation(py::module &m) { // auto estimation_setup_submodule = m.def_submodule("estimation_setup"); estimation_setup::expose_estimation_setup(estimation_setup_submodule); - - m.def("get_integrated_type_and_body_list", - &tp::getIntegratedTypeAndBodyList, - py::arg("propagator_settings") ); - - m.def("get_single_integration_size", - &tp::getSingleIntegrationSize, - py::arg("state_type") ); - - m.def("create_dynamics_simulator", - &tss::createDynamicsSimulator, - py::arg("bodies"), - py::arg("propagator_settings"), - py::arg("simulate_dynamics_on_creation") = true, - get_docstring("create_dynamics_simulator").c_str() ); - - py::class_< - tudat::Time >( - m,"Time", get_docstring("Time").c_str()) - .def(py::init< - const int, - const long double>(), - py::arg("full_periods"), - py::arg("seconds_into_full_period") ) - .def(py::init< - const double>(), - py::arg("seconds_into_full_period") ) - .def("to_float", - &tudat::Time::getSeconds< double >, - get_docstring("Time.to_float").c_str() ) - .def(py::self + py::self) - .def(py::self + double()) - .def(double() + py::self) - .def(py::self += py::self) - .def(py::self += double()) - .def(py::self - py::self) - .def(py::self - double()) - .def(py::self -= py::self) - .def(py::self -= double()) - .def(double() - py::self) - .def(py::self * double()) - .def(double() * py::self) - .def(py::self *= double()) - .def(py::self / double()) - .def(py::self /= double()) - .def(py::self == py::self) - .def(double() == py::self) - .def(py::self == double()) - .def(py::self != py::self) - .def(py::self != double()) - .def(double() != py::self) - .def(py::self < py::self) - .def(py::self < double()) - .def(double() < py::self) - .def(py::self > py::self) - .def(py::self > double()) - .def(double() > py::self) - .def(py::self <= py::self) - .def(py::self <= double()) - .def(double() <= py::self) - .def(py::self >= py::self) - .def(double() >= py::self) - .def(py::self >= double()); - - - - m.def("create_variational_equations_solver", - &tss::createVariationalEquationsSolver, - py::arg("bodies"), - py::arg("propagator_settings"), - py::arg("parameters_to_estimate"), - py::arg("simulate_dynamics_on_creation") = true, - get_docstring("create_dynamics_simulator").c_str() ); - - - - py::class_< - tp::DynamicsSimulator, - std::shared_ptr>>( - m,"DynamicsSimulator", get_docstring("DynamicsSimulator").c_str()); - - py::class_< - tp::SingleArcDynamicsSimulator, - std::shared_ptr>, - tp::DynamicsSimulator< STATE_SCALAR_TYPE, TIME_TYPE> >( - m,"SingleArcSimulator", get_docstring("SingleArcSimulator").c_str()) - .def(py::init< - const tudat::simulation_setup::SystemOfBodies &, - const std::shared_ptr>, - const std::shared_ptr>, - const bool, - const bool, - const bool, - const bool, - const bool, - const bool>(), - py::arg("bodies"), - py::arg("integrator_settings"), - py::arg("propagator_settings"), - py::arg("are_equations_of_motion_to_be_integrated") = true, - py::arg("clear_numerical_solutions") = false, - py::arg("set_integrated_result") = false, - py::arg("print_number_of_function_evaluations") = false, - py::arg("print_dependent_variable_data") = true, - py::arg("print_state_data") = true) - .def_property_readonly("bodies", - &tp::SingleArcDynamicsSimulator::getSystemOfBodies) - .def_property_readonly("state_history", - &tp::SingleArcDynamicsSimulator::getEquationsOfMotionNumericalSolution) - .def_property_readonly("unprocessed_state_history", - &tp::SingleArcDynamicsSimulator::getEquationsOfMotionNumericalSolutionRaw) - .def_property_readonly("dependent_variable_history", - &tp::SingleArcDynamicsSimulator::getDependentVariableHistory) - .def_property_readonly("cumulative_computation_time_history", - &tp::SingleArcDynamicsSimulator::getCumulativeComputationTimeHistory) - .def_property_readonly("cumulative_number_of_function_evaluations", - &tp::SingleArcDynamicsSimulator::getCumulativeNumberOfFunctionEvaluations) - .def_property_readonly("integrator_settings", - &tp::SingleArcDynamicsSimulator::getIntegratorSettings, - get_docstring("SingleArcSimulator.integrator_settings").c_str()) - .def_property_readonly("state_derivative_function", - &tp::SingleArcDynamicsSimulator::getStateDerivativeFunction, - get_docstring("SingleArcSimulator.state_derivative_function").c_str()) - .def_property_readonly("environment_updater", - &tp::SingleArcDynamicsSimulator::getEnvironmentUpdater, - get_docstring("SingleArcSimulator.environment_updater").c_str()) - .def_property_readonly("propagation_results", - &tp::SingleArcDynamicsSimulator::getPropagationResults, - get_docstring("SingleArcSimulator.propagation_results").c_str()) - .def_property_readonly("propagation_termination_details", - &tp::SingleArcDynamicsSimulator::getPropagationTerminationReason) - .def_property_readonly("integration_completed_successfully", - &tp::SingleArcDynamicsSimulator::integrationCompletedSuccessfully); - - py::class_< - tp::MultiArcDynamicsSimulator, - std::shared_ptr>, - tp::DynamicsSimulator< STATE_SCALAR_TYPE, TIME_TYPE>>( - m,"MultiArcDynamicsSimulator", get_docstring("MultiArcDynamicsSimulator").c_str()) - .def_property_readonly("propagation_results", - &tp::MultiArcDynamicsSimulator::getMultiArcPropagationResults, - get_docstring("MultiArcDynamicsSimulator.propagation_results").c_str()); - - py::class_< - tp::HybridArcDynamicsSimulator, - std::shared_ptr>, - tp::DynamicsSimulator< STATE_SCALAR_TYPE, TIME_TYPE>>( - m,"HybridArcDynamicsSimulator", get_docstring("HybridArcDynamicsSimulator").c_str()) - .def_property_readonly("propagation_results", - &tp::HybridArcDynamicsSimulator::getHybridArcPropagationResults, - get_docstring("HybridArcDynamicsSimulator.propagation_results").c_str()); - - - //TODO: Remove variationalOnlyIntegratorSettings - py::class_< - tp::SingleArcVariationalEquationsSolver, - std::shared_ptr>>(m, "SingleArcVariationalSimulator", - get_docstring("SingleArcVariationalSimulator").c_str() ) - .def(py::init< - const tudat::simulation_setup::SystemOfBodies&, - const std::shared_ptr< tudat::numerical_integrators::IntegratorSettings>, - const std::shared_ptr< tp::PropagatorSettings>, - const std::shared_ptr< tep::EstimatableParameterSet< STATE_SCALAR_TYPE > >, - const bool, - const std::shared_ptr< tudat::numerical_integrators::IntegratorSettings< double > >, - const bool, - const bool, - const bool, - const bool>(), - py::arg("bodies"), - py::arg("integrator_settings"), - py::arg("propagator_settings"), - py::arg("estimated_parameters"), - py::arg("integrate_equations_concurrently") = true, - py::arg("variational_only_integrator_settings") = std::shared_ptr< tudat::numerical_integrators::IntegratorSettings< TIME_TYPE > >( ), - py::arg("clear_numerical_solutions") = false, - py::arg("integrate_on_creation") = true, - py::arg("set_integrated_result") = false, - py::arg("print_dependent_variable_data") = true, - get_docstring("SingleArcVariationalSimulator.ctor").c_str() ) - .def("integrate_equations_of_motion_only", - &tp::SingleArcVariationalEquationsSolver::integrateDynamicalEquationsOfMotionOnly, - py::arg("initial_states"), - get_docstring("SingleArcVariationalSimulator.integrate_equations_of_motion_only").c_str() ) - .def("integrate_full_equations", - &tp::SingleArcVariationalEquationsSolver::integrateVariationalAndDynamicalEquations, - py::arg("initial_states"), - py::arg("integrate_equations_concurrently") = true, - get_docstring("SingleArcVariationalSimulator.integrate_full_equations").c_str() ) - .def_property("parameter_vector", - &tp::SingleArcVariationalEquationsSolver::getParametersToEstimate, - &tp::SingleArcVariationalEquationsSolver::resetParameterEstimate, - get_docstring("SingleArcVariationalSimulator.parameter_vector").c_str() ) - .def_property_readonly("variational_equations_history", - &tp::SingleArcVariationalEquationsSolver::getNumericalVariationalEquationsSolution, - get_docstring("SingleArcVariationalSimulator.variational_equations_history").c_str() ) - .def_property_readonly("state_transition_matrix_history", - &tp::SingleArcVariationalEquationsSolver::getStateTransitionMatrixSolution, - get_docstring("SingleArcVariationalSimulator.state_transition_matrix_history").c_str() ) - .def_property_readonly("sensitivity_matrix_history", - &tp::SingleArcVariationalEquationsSolver::getSensitivityMatrixSolution, - get_docstring("SingleArcVariationalSimulator.sensitivity_matrix_history").c_str() ) - .def_property_readonly("state_history", - &tp::SingleArcVariationalEquationsSolver::getEquationsOfMotionSolution, - get_docstring("SingleArcVariationalSimulator.state_history").c_str() ) - .def_property_readonly("dynamics_simulator", - &tp::SingleArcVariationalEquationsSolver::getDynamicsSimulator, - get_docstring("SingleArcVariationalSimulator.dynamics_simulator").c_str() ); - - py::class_< - tss::OrbitDeterminationManager, - std::shared_ptr>>(m, "Estimator", - get_docstring("Estimator").c_str() ) - .def(py::init< - const tss::SystemOfBodies&, - const std::shared_ptr< tep::EstimatableParameterSet< STATE_SCALAR_TYPE > >, - const std::vector< std::shared_ptr< tom::ObservationModelSettings > >&, - const std::shared_ptr< tp::PropagatorSettings< STATE_SCALAR_TYPE > >, - const bool >( ), - py::arg("bodies"), - py::arg("estimated_parameters"), - py::arg("observation_settings"), - py::arg("propagator_settings"), - py::arg("integrate_on_creation") = true, - get_docstring("Estimator.ctor").c_str() ) - .def_property_readonly("observation_simulators", - &tss::OrbitDeterminationManager::getObservationSimulators, - get_docstring("Estimator.observation_simulators").c_str() ) - .def_property_readonly("observation_managers", - &tss::OrbitDeterminationManager::getObservationManagers, - get_docstring("Estimator.observation_managers").c_str() ) - .def_property_readonly("state_transition_interface", - &tss::OrbitDeterminationManager::getStateTransitionAndSensitivityMatrixInterface, - get_docstring("Estimator.state_transition_interface").c_str() ) - .def("perform_estimation", - &tss::OrbitDeterminationManager::estimateParameters, - py::arg( "estimation_input" ), - get_docstring("Estimator.perform_estimation").c_str() ) - .def("compute_covariance", - &tss::OrbitDeterminationManager::computeCovariance, - py::arg( "covariance_analysis_input" ), - get_docstring("Estimator.compute_covariance").c_str() ) - .def_property_readonly("variational_solver", - &tss::OrbitDeterminationManager::getVariationalEquationsSolver, - get_docstring("Estimator.variational_solver").c_str() ); +// +// m.def("get_integrated_type_and_body_list", +// &tp::getIntegratedTypeAndBodyList, +// py::arg("propagator_settings") ); +// +// m.def("get_single_integration_size", +// &tp::getSingleIntegrationSize, +// py::arg("state_type") ); +// +// m.def("create_dynamics_simulator", +// &tss::createDynamicsSimulator, +// py::arg("bodies"), +// py::arg("propagator_settings"), +// py::arg("simulate_dynamics_on_creation") = true, +// get_docstring("create_dynamics_simulator").c_str() ); +// +// py::class_< +// tudat::Time >( +// m,"Time", get_docstring("Time").c_str()) +// .def(py::init< +// const int, +// const long double>(), +// py::arg("full_periods"), +// py::arg("seconds_into_full_period") ) +// .def(py::init< +// const double>(), +// py::arg("seconds_into_full_period") ) +// .def("to_float", +// &tudat::Time::getSeconds< double >, +// get_docstring("Time.to_float").c_str() ) +// .def(py::self + py::self) +// .def(py::self + double()) +// .def(double() + py::self) +// .def(py::self += py::self) +// .def(py::self += double()) +// .def(py::self - py::self) +// .def(py::self - double()) +// .def(py::self -= py::self) +// .def(py::self -= double()) +// .def(double() - py::self) +// .def(py::self * double()) +// .def(double() * py::self) +// .def(py::self *= double()) +// .def(py::self / double()) +// .def(py::self /= double()) +// .def(py::self == py::self) +// .def(double() == py::self) +// .def(py::self == double()) +// .def(py::self != py::self) +// .def(py::self != double()) +// .def(double() != py::self) +// .def(py::self < py::self) +// .def(py::self < double()) +// .def(double() < py::self) +// .def(py::self > py::self) +// .def(py::self > double()) +// .def(double() > py::self) +// .def(py::self <= py::self) +// .def(py::self <= double()) +// .def(double() <= py::self) +// .def(py::self >= py::self) +// .def(double() >= py::self) +// .def(py::self >= double()); +// +// +// +// m.def("create_variational_equations_solver", +// &tss::createVariationalEquationsSolver, +// py::arg("bodies"), +// py::arg("propagator_settings"), +// py::arg("parameters_to_estimate"), +// py::arg("simulate_dynamics_on_creation") = true, +// get_docstring("create_dynamics_simulator").c_str() ); +// +// +// +// py::class_< +// tp::DynamicsSimulator, +// std::shared_ptr>>( +// m,"DynamicsSimulator", get_docstring("DynamicsSimulator").c_str()); +// +// py::class_< +// tp::SingleArcDynamicsSimulator, +// std::shared_ptr>, +// tp::DynamicsSimulator< STATE_SCALAR_TYPE, TIME_TYPE> >( +// m,"SingleArcSimulator", get_docstring("SingleArcSimulator").c_str()) +// .def(py::init< +// const tudat::simulation_setup::SystemOfBodies &, +// const std::shared_ptr>, +// const std::shared_ptr>, +// const bool, +// const bool, +// const bool, +// const bool, +// const bool, +// const bool>(), +// py::arg("bodies"), +// py::arg("integrator_settings"), +// py::arg("propagator_settings"), +// py::arg("are_equations_of_motion_to_be_integrated") = true, +// py::arg("clear_numerical_solutions") = false, +// py::arg("set_integrated_result") = false, +// py::arg("print_number_of_function_evaluations") = false, +// py::arg("print_dependent_variable_data") = true, +// py::arg("print_state_data") = true) +// .def_property_readonly("bodies", +// &tp::SingleArcDynamicsSimulator::getSystemOfBodies) +// .def_property_readonly("state_history", +// &tp::SingleArcDynamicsSimulator::getEquationsOfMotionNumericalSolution) +// .def_property_readonly("unprocessed_state_history", +// &tp::SingleArcDynamicsSimulator::getEquationsOfMotionNumericalSolutionRaw) +// .def_property_readonly("dependent_variable_history", +// &tp::SingleArcDynamicsSimulator::getDependentVariableHistory) +// .def_property_readonly("cumulative_computation_time_history", +// &tp::SingleArcDynamicsSimulator::getCumulativeComputationTimeHistory) +// .def_property_readonly("cumulative_number_of_function_evaluations", +// &tp::SingleArcDynamicsSimulator::getCumulativeNumberOfFunctionEvaluations) +// .def_property_readonly("integrator_settings", +// &tp::SingleArcDynamicsSimulator::getIntegratorSettings, +// get_docstring("SingleArcSimulator.integrator_settings").c_str()) +// .def_property_readonly("state_derivative_function", +// &tp::SingleArcDynamicsSimulator::getStateDerivativeFunction, +// get_docstring("SingleArcSimulator.state_derivative_function").c_str()) +// .def_property_readonly("environment_updater", +// &tp::SingleArcDynamicsSimulator::getEnvironmentUpdater, +// get_docstring("SingleArcSimulator.environment_updater").c_str()) +// .def_property_readonly("propagation_results", +// &tp::SingleArcDynamicsSimulator::getPropagationResults, +// get_docstring("SingleArcSimulator.propagation_results").c_str()) +// .def_property_readonly("propagation_termination_details", +// &tp::SingleArcDynamicsSimulator::getPropagationTerminationReason) +// .def_property_readonly("integration_completed_successfully", +// &tp::SingleArcDynamicsSimulator::integrationCompletedSuccessfully); +// +// py::class_< +// tp::MultiArcDynamicsSimulator, +// std::shared_ptr>, +// tp::DynamicsSimulator< STATE_SCALAR_TYPE, TIME_TYPE>>( +// m,"MultiArcDynamicsSimulator", get_docstring("MultiArcDynamicsSimulator").c_str()) +// .def_property_readonly("propagation_results", +// &tp::MultiArcDynamicsSimulator::getMultiArcPropagationResults, +// get_docstring("MultiArcDynamicsSimulator.propagation_results").c_str()); +// +// py::class_< +// tp::HybridArcDynamicsSimulator, +// std::shared_ptr>, +// tp::DynamicsSimulator< STATE_SCALAR_TYPE, TIME_TYPE>>( +// m,"HybridArcDynamicsSimulator", get_docstring("HybridArcDynamicsSimulator").c_str()) +// .def_property_readonly("propagation_results", +// &tp::HybridArcDynamicsSimulator::getHybridArcPropagationResults, +// get_docstring("HybridArcDynamicsSimulator.propagation_results").c_str()); +// +// +// //TODO: Remove variationalOnlyIntegratorSettings +// py::class_< +// tp::SingleArcVariationalEquationsSolver, +// std::shared_ptr>>(m, "SingleArcVariationalSimulator", +// get_docstring("SingleArcVariationalSimulator").c_str() ) +// .def(py::init< +// const tudat::simulation_setup::SystemOfBodies&, +// const std::shared_ptr< tudat::numerical_integrators::IntegratorSettings>, +// const std::shared_ptr< tp::PropagatorSettings>, +// const std::shared_ptr< tep::EstimatableParameterSet< STATE_SCALAR_TYPE > >, +// const bool, +// const std::shared_ptr< tudat::numerical_integrators::IntegratorSettings< double > >, +// const bool, +// const bool, +// const bool, +// const bool>(), +// py::arg("bodies"), +// py::arg("integrator_settings"), +// py::arg("propagator_settings"), +// py::arg("estimated_parameters"), +// py::arg("integrate_equations_concurrently") = true, +// py::arg("variational_only_integrator_settings") = std::shared_ptr< tudat::numerical_integrators::IntegratorSettings< TIME_TYPE > >( ), +// py::arg("clear_numerical_solutions") = false, +// py::arg("integrate_on_creation") = true, +// py::arg("set_integrated_result") = false, +// py::arg("print_dependent_variable_data") = true, +// get_docstring("SingleArcVariationalSimulator.ctor").c_str() ) +// .def("integrate_equations_of_motion_only", +// &tp::SingleArcVariationalEquationsSolver::integrateDynamicalEquationsOfMotionOnly, +// py::arg("initial_states"), +// get_docstring("SingleArcVariationalSimulator.integrate_equations_of_motion_only").c_str() ) +// .def("integrate_full_equations", +// &tp::SingleArcVariationalEquationsSolver::integrateVariationalAndDynamicalEquations, +// py::arg("initial_states"), +// py::arg("integrate_equations_concurrently") = true, +// get_docstring("SingleArcVariationalSimulator.integrate_full_equations").c_str() ) +// .def_property("parameter_vector", +// &tp::SingleArcVariationalEquationsSolver::getParametersToEstimate, +// &tp::SingleArcVariationalEquationsSolver::resetParameterEstimate, +// get_docstring("SingleArcVariationalSimulator.parameter_vector").c_str() ) +// .def_property_readonly("variational_equations_history", +// &tp::SingleArcVariationalEquationsSolver::getNumericalVariationalEquationsSolution, +// get_docstring("SingleArcVariationalSimulator.variational_equations_history").c_str() ) +// .def_property_readonly("state_transition_matrix_history", +// &tp::SingleArcVariationalEquationsSolver::getStateTransitionMatrixSolution, +// get_docstring("SingleArcVariationalSimulator.state_transition_matrix_history").c_str() ) +// .def_property_readonly("sensitivity_matrix_history", +// &tp::SingleArcVariationalEquationsSolver::getSensitivityMatrixSolution, +// get_docstring("SingleArcVariationalSimulator.sensitivity_matrix_history").c_str() ) +// .def_property_readonly("state_history", +// &tp::SingleArcVariationalEquationsSolver::getEquationsOfMotionSolution, +// get_docstring("SingleArcVariationalSimulator.state_history").c_str() ) +// .def_property_readonly("dynamics_simulator", +// &tp::SingleArcVariationalEquationsSolver::getDynamicsSimulator, +// get_docstring("SingleArcVariationalSimulator.dynamics_simulator").c_str() ); +// +// py::class_< +// tss::OrbitDeterminationManager, +// std::shared_ptr>>(m, "Estimator", +// get_docstring("Estimator").c_str() ) +// .def(py::init< +// const tss::SystemOfBodies&, +// const std::shared_ptr< tep::EstimatableParameterSet< STATE_SCALAR_TYPE > >, +// const std::vector< std::shared_ptr< tom::ObservationModelSettings > >&, +// const std::shared_ptr< tp::PropagatorSettings< STATE_SCALAR_TYPE > >, +// const bool >( ), +// py::arg("bodies"), +// py::arg("estimated_parameters"), +// py::arg("observation_settings"), +// py::arg("propagator_settings"), +// py::arg("integrate_on_creation") = true, +// get_docstring("Estimator.ctor").c_str() ) +// .def_property_readonly("observation_simulators", +// &tss::OrbitDeterminationManager::getObservationSimulators, +// get_docstring("Estimator.observation_simulators").c_str() ) +// .def_property_readonly("observation_managers", +// &tss::OrbitDeterminationManager::getObservationManagers, +// get_docstring("Estimator.observation_managers").c_str() ) +// .def_property_readonly("state_transition_interface", +// &tss::OrbitDeterminationManager::getStateTransitionAndSensitivityMatrixInterface, +// get_docstring("Estimator.state_transition_interface").c_str() ) +// .def("perform_estimation", +// &tss::OrbitDeterminationManager::estimateParameters, +// py::arg( "estimation_input" ), +// get_docstring("Estimator.perform_estimation").c_str() ) +// .def("compute_covariance", +// &tss::OrbitDeterminationManager::computeCovariance, +// py::arg( "covariance_analysis_input" ), +// get_docstring("Estimator.compute_covariance").c_str() ) +// .def_property_readonly("variational_solver", +// &tss::OrbitDeterminationManager::getVariationalEquationsSolver, +// get_docstring("Estimator.variational_solver").c_str() ); }; }// namespace numerical_simulation diff --git a/tudatpy/kernel/expose_numerical_simulation/expose_estimation_setup.cpp b/tudatpy/kernel/expose_numerical_simulation/expose_estimation_setup.cpp index 1a3f92a5..dbb9e77e 100644 --- a/tudatpy/kernel/expose_numerical_simulation/expose_estimation_setup.cpp +++ b/tudatpy/kernel/expose_numerical_simulation/expose_estimation_setup.cpp @@ -34,53 +34,53 @@ namespace estimation_setup { void expose_estimation_setup(py::module &m) { - // *************** PARAMETER *************** - - m.def("print_parameter_names", - &tep::printEstimatableParameterEntries< double >, - py::arg("parameter_set"), - get_docstring("print_parameter_names").c_str() ); - - - // # EstimatableParameterSettings --> EstimatableParameterSet # - m.def("create_parameter_set", - &tss::createParametersToEstimate< STATE_SCALAR_TYPE, TIME_TYPE >, - py::arg("parameter_settings"), - py::arg("bodies"), - py::arg("propagator_settings") = nullptr, - py::arg("consider_parameters_names") = std::vector< std::shared_ptr< tep::EstimatableParameterSettings > >( ), - get_docstring("create_parameter_set").c_str() ); - - - // ************** OBSERVATION *************** - - - - // # Observation Model Settings --> Observation Simulator # - m.def("create_observation_simulators", - py::overload_cast< const std::vector< std::shared_ptr< tom::ObservationModelSettings > >&, const tss::SystemOfBodies& >( - &tom::createObservationSimulators< STATE_SCALAR_TYPE, TIME_TYPE > ), - py::arg( "observation_settings" ), - py::arg( "bodies" ), - get_docstring("create_observation_simulators").c_str() ); - - - m.def("single_type_observation_collection", - py::overload_cast< - const tom::ObservableType, - const tom::LinkDefinition&, - const std::vector< Eigen::Matrix< STATE_SCALAR_TYPE, Eigen::Dynamic, 1 > >&, - const std::vector< TIME_TYPE >, - const tom::LinkEndType, - const std::shared_ptr< tom::ObservationAncilliarySimulationSettings > >( - &tom::createManualObservationCollection< STATE_SCALAR_TYPE, TIME_TYPE > ), - py::arg("observable_type"), - py::arg("link_ends"), - py::arg("observations_list"), - py::arg("times_list"), - py::arg("reference_link_end" ), - py::arg("ancilliary_settings" ) = nullptr, - get_docstring("single_type_observaion_collection").c_str() ); +// // *************** PARAMETER *************** +// +// m.def("print_parameter_names", +// &tep::printEstimatableParameterEntries< double >, +// py::arg("parameter_set"), +// get_docstring("print_parameter_names").c_str() ); +// +// +// // # EstimatableParameterSettings --> EstimatableParameterSet # +// m.def("create_parameter_set", +// &tss::createParametersToEstimate< STATE_SCALAR_TYPE, TIME_TYPE >, +// py::arg("parameter_settings"), +// py::arg("bodies"), +// py::arg("propagator_settings") = nullptr, +// py::arg("consider_parameters_names") = std::vector< std::shared_ptr< tep::EstimatableParameterSettings > >( ), +// get_docstring("create_parameter_set").c_str() ); +// +// +// // ************** OBSERVATION *************** +// +// +// +// // # Observation Model Settings --> Observation Simulator # +// m.def("create_observation_simulators", +// py::overload_cast< const std::vector< std::shared_ptr< tom::ObservationModelSettings > >&, const tss::SystemOfBodies& >( +// &tom::createObservationSimulators< STATE_SCALAR_TYPE, TIME_TYPE > ), +// py::arg( "observation_settings" ), +// py::arg( "bodies" ), +// get_docstring("create_observation_simulators").c_str() ); +// +// +// m.def("single_type_observation_collection", +// py::overload_cast< +// const tom::ObservableType, +// const tom::LinkDefinition&, +// const std::vector< Eigen::Matrix< STATE_SCALAR_TYPE, Eigen::Dynamic, 1 > >&, +// const std::vector< TIME_TYPE >, +// const tom::LinkEndType, +// const std::shared_ptr< tom::ObservationAncilliarySimulationSettings > >( +// &tom::createManualObservationCollection< STATE_SCALAR_TYPE, TIME_TYPE > ), +// py::arg("observable_type"), +// py::arg("link_ends"), +// py::arg("observations_list"), +// py::arg("times_list"), +// py::arg("reference_link_end" ), +// py::arg("ancilliary_settings" ) = nullptr, +// get_docstring("single_type_observaion_collection").c_str() );