diff options
| author | Samuel Fadel <samuelfadel@gmail.com> | 2015-05-22 18:41:47 -0300 |
|---|---|---|
| committer | Samuel Fadel <samuelfadel@gmail.com> | 2015-05-22 18:41:52 -0300 |
| commit | b506e3bf7bbb28e89bd6cba55e7fa5ae78a95536 (patch) | |
| tree | 0113b046352d4053133e3126a354ccfeeda0b81c | |
| parent | 6a7b60784a44013156382843a5e72af272810674 (diff) | |
| parent | 49b32975e9963de01b2ecc102b95488e4fdbf975 (diff) | |
Fixed merge conflicts.
| -rw-r--r-- | interactionhandler.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/interactionhandler.cpp b/interactionhandler.cpp index 50d0653..9feaf0f 100644 --- a/interactionhandler.cpp +++ b/interactionhandler.cpp @@ -9,6 +9,7 @@ InteractionHandler::InteractionHandler(const arma::mat &X, , m_Y(X.n_rows, 3) , m_labels(labels) , m_sampleIndices(sampleIndices) + , m_Y(X.n_rows, 3) , m_technique(TECHNIQUE_LAMP) { m_Y.col(2) = m_labels; |