From 6203d8cc660dc2fc8fa383f12672f57cd414fbd3 Mon Sep 17 00:00:00 2001 From: Paloma de la Puente <paloma.delapuente@upm.es> Date: Fri, 23 Oct 2009 00:26:24 +0000 Subject: [PATCH] constructors issue --- sm/csm/structprior/ConstraintManager.cpp | 6 ++++++ sm/csm/structprior/ConstraintManager.h | 1 + sm/csm/structprior/MeasurementsLikelihood.cpp | 6 ++++++ sm/csm/structprior/MeasurementsLikelihood.h | 1 + sm/csm/structprior/structprior_test.cpp | 4 ++-- 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/sm/csm/structprior/ConstraintManager.cpp b/sm/csm/structprior/ConstraintManager.cpp index 3d33ee9..5d0b68b 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 f4ca151..0bc60bd 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 8bf0a58..c18303f 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 6c13dbb..6763302 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 eb723b2..c2cbe19 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(); -- GitLab