From 711a5df8919d2da70bdfd9e6c51ec4ae22d174d8 Mon Sep 17 00:00:00 2001 From: Dongryeol Lee Date: Sat, 22 Jan 2011 18:40:28 +0000 Subject: [PATCH] Another compile error fix. --- .../mlpack/mixed_logit_dcm/mixed_logit_dcm_dev.h | 6 ++++-- .../mlpack/mixed_logit_dcm/mixed_logit_dcm_sampling.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/mlpack/mixed_logit_dcm/mixed_logit_dcm_dev.h b/fastlib/trunk/contrib/dongryel/thesis_research/mlpack/mixed_logit_dcm/mixed_logit_dcm_dev.h index 49a9f7f1d7..ece6761fe2 100644 --- a/fastlib/trunk/contrib/dongryel/thesis_research/mlpack/mixed_logit_dcm/mixed_logit_dcm_dev.h +++ b/fastlib/trunk/contrib/dongryel/thesis_research/mlpack/mixed_logit_dcm/mixed_logit_dcm_dev.h @@ -30,11 +30,13 @@ double MixedLogitDCM::GradientError_( // Get the simulated choice probability gradient for the given // person. - + arma::vec simulated_choice_probability_gradient; + table_->simulated_choice_probability_gradient( + person_index, &simulated_choice_probability_gradient); // First form the $\Delta h_ii vector. arma::vec delta_hii; - delta_hii.set_size(); + delta_hii.set_size(simulated_choice_probability_gradient.n_elem); // Loop through each sample. const std::vector< arma::vec > &integration_samples = diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/mlpack/mixed_logit_dcm/mixed_logit_dcm_sampling.h b/fastlib/trunk/contrib/dongryel/thesis_research/mlpack/mixed_logit_dcm/mixed_logit_dcm_sampling.h index b7318f280e..1e5bf8624c 100644 --- a/fastlib/trunk/contrib/dongryel/thesis_research/mlpack/mixed_logit_dcm/mixed_logit_dcm_sampling.h +++ b/fastlib/trunk/contrib/dongryel/thesis_research/mlpack/mixed_logit_dcm/mixed_logit_dcm_sampling.h @@ -209,7 +209,7 @@ class MixedLogitDCMSampling { */ void simulated_choice_probability_gradient( int person_index, arma::vec *gradient_out) const { - simulated_choice_probability_gradient_[ + simulated_choice_probability_gradients_[ person_index].sample_means(gradient_out); }