Layer.cpp

@@ -41,7 +41,7 @@ double Layer::getWeightedSum(size_t outputNeuron) const
 		sum += neuron.getWeightedOutputValue(outputNeuron);
 	}
 
-    return sum / size();
+	return sum;
 }
 
 void Layer::connectTo(const Layer & nextLayer)

gui/NeuroUI/errorplotter.cpp

@@ -28,11 +28,6 @@ void ErrorPlotter::clear()
 
 void ErrorPlotter::addErrorValue(double errorValue)
 {
-    if (m_errorValues.size() == m_bufferSize)
-    {
-        m_errorValues.pop_front();
-    }
-
     m_errorValues.push_back(errorValue);
     m_maxErrorValue = std::max<double>(m_maxErrorValue, errorValue);
 

gui/NeuroUI/errorplotter.h

@@ -11,8 +11,6 @@ private:
     std::list<double> m_errorValues;
     double m_maxErrorValue;
 
-    size_t m_bufferSize = 10000;
-
 public:
     explicit ErrorPlotter(QWidget *parent = 0);
 

gui/NeuroUI/mnistloader.cpp

@@ -8,21 +8,6 @@ void MnistLoader::load(const std::string &databaseFileName, const std::string &l
     loadLabels(labelsFileName);
 }
 
-size_t MnistLoader::getSamleCount() const
-{
-    return samples.size();
-}
-
-const MnistLoader::MnistSample &MnistLoader::getSample(size_t index) const
-{
-    if (index >= samples.size())
-    {
-        throw std::runtime_error("MNIST sample index out of range");
-    }
-
-    return *(samples[index].get());
-}
-
 const MnistLoader::MnistSample &MnistLoader::getRandomSample() const
 {
     size_t sampleIndex = (std::rand() * (samples.size() - 1)) / RAND_MAX;

gui/NeuroUI/mnistloader.h

@@ -6,8 +6,6 @@
 #include <memory>
 #include <inttypes.h>
 
-#include <QImage>
-
 class MnistLoader
 {
 private:
@@ -23,11 +21,6 @@ public:
     public:
         uint8_t label;
         uint8_t data[SAMPLE_WIDTH * SAMPLE_HEIGHT];
-
-        QImage toQImage() const
-        {
-            return QImage(data, SAMPLE_WIDTH, SAMPLE_HEIGHT, QImage::Format_Grayscale8);
-        }
     };
 
     using MnistSample = Sample<SampleWidth, SampleHeight>;
@@ -38,8 +31,6 @@ private:
 public:
     void load(const std::string &databaseFileName, const std::string &labelsFileName);
 
-    size_t getSamleCount() const;
-    const MnistSample &getSample(size_t index) const;
     const MnistSample &getRandomSample() const;
 
 private:

gui/NeuroUI/netlearner.cpp

@@ -24,12 +24,12 @@ void NetLearner::run()
         timer.start();
 
         size_t numIterations = 100000;
-        for (size_t iteration = 0; iteration < numIterations && cancel == false; ++iteration)
+        for (size_t iteration = 0; iteration < numIterations; ++iteration)
         {
             auto trainingSample = mnistLoader.getRandomSample();
 
-//            emit logMessage(QString("training sample ") + QString::number(trainingSample.label));
-            emit sampleImageLoaded(trainingSample.toQImage());
+            QImage trainingImage(trainingSample.data, 28, 28, QImage::Format_Grayscale8);
+            emit sampleImageLoaded(trainingImage);
 
             std::vector<double> targetValues =
             {
@@ -49,7 +49,12 @@ void NetLearner::run()
 
             double error = outputValues[0] - targetValues[0];
 
-            emit logMessage(QString("Error: ") + QString::number(std::abs(error)));
+            QString logString;
+
+            logString.append("Error: ");
+            logString.append(QString::number(std::abs(error)));
+
+            emit logMessage(logString);
             emit currentNetError(error);
             emit progress((double)iteration / (double)numIterations);
 
@@ -71,11 +76,4 @@ void NetLearner::run()
         logString.append(ex.what());
         emit logMessage(logString);
     }
-
-    cancel = false;
-}
-
-void NetLearner::cancelLearning()
-{
-    cancel = true;
 }

gui/NeuroUI/netlearner.h

@@ -7,9 +7,6 @@ class NetLearner : public QThread
 {
     Q_OBJECT
 
-private:
-    bool cancel = false;
-
 private:
     void run() Q_DECL_OVERRIDE;
 
@@ -18,9 +15,6 @@ signals:
     void progress(double progress);
     void currentNetError(double error);
     void sampleImageLoaded(const QImage &image);
-
-public slots:
-    void cancelLearning();
 };
 
 #endif // NETLEARNER_H

gui/NeuroUI/neuroui.cpp

@@ -12,12 +12,6 @@ NeuroUI::NeuroUI(QWidget *parent) :
 
 NeuroUI::~NeuroUI()
 {
-    if (m_netLearner != nullptr)
-    {
-        m_netLearner->cancelLearning();
-        m_netLearner->wait();
-    }
-
     delete ui;
 }
 
@@ -46,11 +40,6 @@ void NeuroUI::on_runButton_clicked()
 
 void NeuroUI::logMessage(const QString &logMessage)
 {
-    if (ui->logView->count() == static_cast<int>(m_logSize))
-    {
-        delete ui->logView->item(0);
-    }
-
     ui->logView->addItem(logMessage);
     ui->logView->scrollToBottom();
 }

gui/NeuroUI/neuroui.h

@@ -17,7 +17,6 @@ class NeuroUI : public QMainWindow
 
 private:
     std::unique_ptr<NetLearner> m_netLearner;
-    size_t m_logSize = 128;
 
 public:
     explicit NeuroUI(QWidget *parent = 0);