first version working, needs a couple of fixes

Author: jjdredd

IsingMC.cpp

@@ -132,6 +132,8 @@ void IsingMC::Step() {
 	while (true) {
 		RandomPoint(i, j);
 
+		// std::cout << i << '\t' << j << std::endl;
+
 		double de = EnergyDiff(i, j);
 
 		// {

IsingWindow.cpp

@@ -3,7 +3,8 @@
 #include "IsingWindow.hpp"
 
 IsingWindow::IsingWindow(unsigned M, unsigned N, double J,
-			 double beta, QWidget *parent) : QMainWindow(parent) {
+			 double beta, QWidget *parent)
+	: QMainWindow(parent) {
 
 	simwid = new IsingWidget(M, N, J, beta, parent);
 	grid = new QGridLayout;
@@ -14,22 +15,29 @@ IsingWindow::IsingWindow(unsigned M, unsigned N, double J,
 	lne_b = new QLineEdit( QString(std::to_string(beta).c_str()) );
 
 	form = new QFormLayout;
-	form->addRow("Jparam:", lne_J);
-	form->addRow("bparam:", lne_b);
+	form->addRow("J :", lne_J);
+	form->addRow("1/T :", lne_b);
 
-	connect(lne_J, SIGNAL (returnPressed()), this, SLOT (set_J()));
-	connect(lne_b, SIGNAL (returnPressed()), this, SLOT (set_b()));
+	connect(lne_J, SIGNAL (returnPressed()), this, SLOT (set_J()) );
+	connect(lne_b, SIGNAL (returnPressed()), this, SLOT (set_b()) );
 
-	grid->addLayout(form, 0, 1);
-	grid->addWidget(simwid, 0, 0);
+	btn_start = new QPushButton("Start", this);
+	btn_start->setCheckable(true);
+	connect(btn_start, SIGNAL (toggled(bool)), this, SLOT (toggle_simulation(bool)) );
+
+	grid->addLayout(form, 0, 2);
+	grid->addWidget(simwid, 0, 0, 2, 2);
+	grid->addWidget(btn_start, 1, 2);
 
 	centralWidget()->setLayout(grid);
 
 }
 
 IsingWindow::~IsingWindow() {
+	toggle_simulation(false); // XXX FIXME (data races)
 	delete lne_J;
 	delete lne_b;
+	delete btn_start;
 	delete form;
 	delete simwid;
 	delete grid;
@@ -40,16 +48,19 @@ void IsingWindow::set_J() {
 	double val = lne_J->text().toDouble(&status);
 	if (!status) return;
 	simwid->SetJ(val);
-	std::cout << "J is now set to: " << val << std::endl;
-	
 }
 
 void IsingWindow::set_b() {
 	bool status;
 	double val = lne_b->text().toDouble(&status);
 	if (!status) return;
 	simwid->SetBeta(val);
-	std::cout << "beta is now set to: " << val << std::endl;
+}
+
+void IsingWindow::toggle_simulation(bool sstate) {
+	if (sstate) { btn_start->setText("Stop"); }
+	else { btn_start->setText("Start"); }
+	simwid->ToggleSimulation(sstate);
 }
 
 
@@ -62,6 +73,8 @@ IsingWidget::IsingWidget (unsigned M, unsigned N, double J,
 	: running(false) {
 
 	Q_UNUSED(parent);
+	
+	iterations = 100;
 	imc = new IsingMC(M, N, J, beta);
 	setFixedWidth(M);
 	setFixedHeight(N);
@@ -75,14 +88,11 @@ IsingWidget::~IsingWidget () {
 void IsingWidget::paintEvent (QPaintEvent *e) {
 
 	Q_UNUSED(e);
-	return;
 
 	QPainter qp(this);
-	unsigned PenSize = 2;
+	unsigned PenSize = 1;
 	unsigned offset = PenSize ? PenSize : 1;
 
-	for (unsigned i = 0; i < 100 // imc->XSize() * imc->YSize()
-		     ;i++) imc->Step();
 	// std::cout << imc->Energy() << std::endl;
 
 	// std::cout << "Energy: " << imc->Energy()
@@ -105,18 +115,31 @@ void IsingWidget::paintEvent (QPaintEvent *e) {
 
 void IsingWidget::SetJ (double val) { imc->SetJ(val); }
 void IsingWidget::SetBeta (double val) { imc->SetBeta(val); }
-double IsingWidget::Energy () { return imc->Energy(val); }
-double IsingWidget::Magnetization () { return imc->Magnetization(val); }
+double IsingWidget::Energy () { return imc->Energy(); }
+double IsingWidget::Magnetization () { return imc->Magnetization(); }
 
 void IsingWidget::simulationThread(unsigned num) {
-	while (true) {
+	while (running) {
 		for (unsigned i = 0; i < num; i++) {
-			mtx.lock();
-			if (running) {
-				imc->Step();
-			}
-			mtx.unlock();
+			imc->Step();
 		}
-		emit paintEvent(0);
+		// emit paintEvent(0);
+		update();
 	}
 }
+
+void IsingWidget::ToggleSimulation(bool sstate) {
+	std::cout << "state of simulation before changing: " << running << std::endl;
+	if (sstate) { startSimulation(); }
+	else { stopSimulation(); }
+}
+
+void IsingWidget::startSimulation() {
+	if (running) return;
+	std::thread(&IsingWidget::simulationThread, this, iterations).detach();
+	running = true;
+}
+
+void IsingWidget::stopSimulation() {
+	running = false;
+}

IsingWindow.hpp

@@ -9,8 +9,8 @@
 #include <QHBoxLayout>
 #include <QString>
 #include <QGridLayout>
+#include <QPushButton>
 #include <thread>
-#include <mutex>
 
 #include "IsingMC.hpp"
 
@@ -29,15 +29,19 @@ class IsingWindow : public QMainWindow {
 	QLineEdit *lne_J, *lne_b;
 	QGridLayout *grid;
 	IsingWidget *simwid;
+	QPushButton *btn_start;
 
 public slots:
 	void set_J();
 	void set_b();
+	void toggle_simulation(bool);
 
 };
 
 // need new widget for ising window
 // with seperate computation thread
+//
+// add start, stop and randomize functionality
 
 class IsingWidget : public QWidget {
 
@@ -50,15 +54,18 @@ class IsingWidget : public QWidget {
 	void SetBeta(double);
 	double Energy();
 	double Magnetization();
+	void ToggleSimulation(bool);
 
 protected:
 	void paintEvent(QPaintEvent *e);
 	void simulationThread(unsigned);
+	void startSimulation();
+	void stopSimulation();
 
 private:
 	IsingMC *imc;
-	std::mutex mtx;
 	bool running;
+	unsigned iterations;
 
 };
 

main.cpp

@@ -4,11 +4,11 @@
 
 int main(int argc, char *argv[]) {
 
-	unsigned NX = 200;
-	unsigned NY = 200;
+	unsigned NX = 500;
+	unsigned NY = 500;
 
 	QApplication app(argc, argv);
-	IsingWindow iw(NX, NY, 1.14, 0.1);
+	IsingWindow iw(NX, NY, 1.14, 0.5);
 
 	// iw.resize(NX, NY);
 	iw.setWindowTitle("2D Ising Monte-Carlo");
@@ -19,7 +19,6 @@ int main(int argc, char *argv[]) {
 	return app.exec();
 
 	while (true) {
-		// iw.repaint();
 		app.processEvents();
 	}