diff --git a/sm/csm/structprior/ConstraintManager.cpp b/sm/csm/structprior/ConstraintManager.cpp index 3d33ee90a4969def2ffbeb4d21acd40fb2a486d2..5d0b68badbbf890e92d7f54e82c3d9aa4ae77e96 100644 --- a/sm/csm/structprior/ConstraintManager.cpp +++ b/sm/csm/structprior/ConstraintManager.cpp @@ -1,6 +1,12 @@ #include "ConstraintManager.h" +ConstraintManager::ConstraintManager() +{ + sm_debug("ConstraintManager should take parameters"); + +} + ConstraintManager::ConstraintManager(std::vector<int> constraint_types) { equal_to_either_num = 10; diff --git a/sm/csm/structprior/ConstraintManager.h b/sm/csm/structprior/ConstraintManager.h index f4ca15112d85a05db86e37ed976ef69f11d4305a..0bc60bdac279732912245f6f0a57d2e804fdd1a3 100644 --- a/sm/csm/structprior/ConstraintManager.h +++ b/sm/csm/structprior/ConstraintManager.h @@ -10,6 +10,7 @@ class ConstraintManager { public: //constructors + ConstraintManager(); ConstraintManager(std::vector<int> constraint_types); virtual ~ConstraintManager(void); diff --git a/sm/csm/structprior/MeasurementsLikelihood.cpp b/sm/csm/structprior/MeasurementsLikelihood.cpp index 8bf0a58011a17b37382c3e76706cf78d695de4ac..c18303fef3f89cee9b361f705845d3135718388f 100644 --- a/sm/csm/structprior/MeasurementsLikelihood.cpp +++ b/sm/csm/structprior/MeasurementsLikelihood.cpp @@ -1,5 +1,11 @@ #include "MeasurementsLikelihood.h" +MeasurementsLikelihood::MeasurementsLikelihood() +{ + sm_debug("MeasurementsLikelihood should take parameters"); + +} + MeasurementsLikelihood::MeasurementsLikelihood(int likelihood_function, int measurements_number) { function_type = likelihood_function; diff --git a/sm/csm/structprior/MeasurementsLikelihood.h b/sm/csm/structprior/MeasurementsLikelihood.h index 6c13dbb3a701924a74f2a7c90ebcc91287e88e24..67633022a25c4560680d9cfab99cfb60578fb5cb 100644 --- a/sm/csm/structprior/MeasurementsLikelihood.h +++ b/sm/csm/structprior/MeasurementsLikelihood.h @@ -13,6 +13,7 @@ class MeasurementsLikelihood { public: //constructors + MeasurementsLikelihood(); MeasurementsLikelihood(int likelihood_function, int measurements_number); virtual ~MeasurementsLikelihood(void); //class variables diff --git a/sm/csm/structprior/structprior_test.cpp b/sm/csm/structprior/structprior_test.cpp index eb723b239bd6bd1cbb678d7144e6657dd12bc325..c2cbe19736611db17781f51e99e14c22969a5e9d 100644 --- a/sm/csm/structprior/structprior_test.cpp +++ b/sm/csm/structprior/structprior_test.cpp @@ -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; - //minimizer.Minimize(laserdata,f,cons_manager...)... + Minimizer minimizer(laserdata,f,cons_manager); + minimizer.Minimize();