diff --git a/sm/csm/structprior/Optimizer.cpp b/sm/csm/structprior/Optimizer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..95f0367ba79ca3fab5653d67cc37ab20019c97c1 --- /dev/null +++ b/sm/csm/structprior/Optimizer.cpp @@ -0,0 +1,19 @@ +#include "Optimizer.h" + +Optimizer::Optimizer(LDP ld, MeasurementsLikelihood ml, ConstraintManager cm) +{ + laser_data = ld; + measurements_likelihood = ml; + constraint_manager = cm; + +} + +Optimizer::~Optimizer(void) +{ + +} + +void Optimizer::Optimizer() +{ + +} diff --git a/sm/csm/structprior/Optimizer.h b/sm/csm/structprior/Optimizer.h new file mode 100644 index 0000000000000000000000000000000000000000..8784da2b46daa50ad9f236e8498ba8da1f66eb62 --- /dev/null +++ b/sm/csm/structprior/Optimizer.h @@ -0,0 +1,23 @@ +#ifndef H_OPTIMIZER +#define H_OPTIMIZER + +#include <csm/csm_all.h> +#include "MeasurementsLikelihood.h" +#include "ConstraintManager.h" + +class Minimizer +{ + +//constructors +public: + Optimizer(LDP ld, MeasurementsLikelihood ml, ConstraintManager cm); + virtual ~Optimizer(void); +//class variables + LDP laser_data; + MeasurementsLikelihood measurements_likelihood; + ConstraintManager constraint_manager; +//methods + void OptimizeAlphas(); + +}; +#endif diff --git a/sm/csm/structprior/structprior_test.cpp b/sm/csm/structprior/structprior_test.cpp index c2cbe19736611db17781f51e99e14c22969a5e9d..b0a4a9478801283ae11ab644cee42eb1402ae0a3 100644 --- a/sm/csm/structprior/structprior_test.cpp +++ b/sm/csm/structprior/structprior_test.cpp @@ -3,7 +3,7 @@ #include "ConstraintManager.h" #include "MeasurementsLikelihood.h" -#include "Minimizer.h" +#include "Optimizer.h" int main(int argc, const char** argv) @@ -36,8 +36,8 @@ int main(int argc, const char** argv) int number_of_measurements = laserdata->nrays; MeasurementsLikelihood f(L2,number_of_measurements); - Minimizer minimizer(laserdata,f,cons_manager); - minimizer.Minimize(); + Optimizer optimizer(laserdata,f,cons_manager); + optimizer.OptimizeAlphas();