From 2007ebb8e431d1341583a03c22d440a7d0f79194 Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Mon, 5 Oct 2015 14:20:47 -0300 Subject: Re-added effectiveness observer (still needs work). --- effectivenessobserver.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'effectivenessobserver.cpp') diff --git a/effectivenessobserver.cpp b/effectivenessobserver.cpp index 305b3f8..61bc264 100644 --- a/effectivenessobserver.cpp +++ b/effectivenessobserver.cpp @@ -6,7 +6,7 @@ EffectiveInteractionEnforcer::EffectiveInteractionEnforcer(const arma::uvec &sam { } -void EffectiveInteractionEnforcer::setSelection(const arma::uvec &selection) +void EffectiveInteractionEnforcer::setSelection(const QSet &selection) { m_selection = selection; } @@ -15,13 +15,15 @@ void EffectiveInteractionEnforcer::setMeasureDifference(const arma::vec &measure { m_measure = measure; - if (m_selection.n_elem == 0) { + if (m_selection.isEmpty()) { return; } - arma::uvec selectionIndices(m_selection); - for (auto it = selectionIndices.begin(); it != selectionIndices.end(); it++) { - *it = m_sampleIndices[*it]; + arma::uvec selectionIndices(m_selection.size()); + int i = 0; + for (auto it = m_selection.cbegin(); it != m_selection.cend(); it++) { + selectionIndices[i] = m_sampleIndices[*it]; + i++; } double diff = arma::mean(m_measure(selectionIndices)); -- cgit v1.2.3