aboutsummaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorSamuel Fadel <samuelfadel@gmail.com>2015-06-01 18:11:33 -0300
committerSamuel Fadel <samuelfadel@gmail.com>2015-06-01 18:11:33 -0300
commitb7e1060b7cb71b30b91cc65c011b719e255c0a06 (patch)
tree5411613d7b0529510dbd94ba26bb4aa2aa7e58be /main.cpp
parent4e0b46a727f6ea727b9e7920150609c58ce65fce (diff)
Minor code changes in main/lamp/forceScheme.
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/main.cpp b/main.cpp
index 5da297f..84579b5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -33,7 +33,7 @@ int main(int argc, char **argv)
arma::uword n = dataset.n_rows;
arma::uword subsampleSize = (arma::uword) sqrt(n) * 3;
arma::uvec sampleIndices = arma::randi<arma::uvec>(subsampleSize, arma::distr_param(0, n-1));
- arma::mat Ys = arma::randn(subsampleSize, 2);
+ arma::mat Ys(subsampleSize, 2, arma::fill::randn);
Ys = mp::forceScheme(mp::dist(X.rows(sampleIndices)), Ys);
arma::mat subsampleData(subsampleSize, 3);
subsampleData.cols(0, 1) = Ys;
@@ -45,12 +45,12 @@ int main(int argc, char **argv)
Scatterplot *plot = engine.rootObjects()[0]->findChild<Scatterplot *>("plot");
// connect both plots through interaction handler
- std::unique_ptr<InteractionHandler> interactionHandler(new InteractionHandler(X, labels, sampleIndices));
+ InteractionHandler interactionHandler(X, labels, sampleIndices);
QObject::connect(subsamplePlot, SIGNAL(dataChanged(const arma::mat &)),
- interactionHandler.get(), SLOT(setSubsample(const arma::mat &)));
- QObject::connect(interactionHandler.get(), SIGNAL(subsampleChanged(const arma::mat &)),
- plot, SLOT(setData(const arma::mat &)));
- interactionHandler.get()->setSubsample(Ys);
+ &interactionHandler, SLOT(setSubsample(const arma::mat &)));
+ QObject::connect(&interactionHandler, SIGNAL(subsampleChanged(const arma::mat &)),
+ plot, SLOT(setData(const arma::mat &)));
+ interactionHandler.setSubsample(Ys);
return app.exec();
}