Moved neuralnet classes into own library

DbNeuralNet.pro

@@ -1,35 +1,6 @@
-QT += core
+TEMPLATE = subdirs
-QT -= gui widgets
 
-DBLIBS +=
+SUBDIRS += neuralnetdemo \
+           neuralnetlib
 
-TARGET = neuralnet
+neuralnetdemo.depends += neuralnetlib
-
-PROJECT_ROOT = ..
-
-SOURCES += main.cpp \
-    neuron.cpp \
-    neurallayer.cpp \
-    neuralnet.cpp \
-    neuralfactor.cpp \
-    debug.cpp
-
-HEADERS += \
-    neuralfactor.h \
-    interfaces/ineuronreceptor.h \
-    interfaces/ineuronsignal.h \
-    interfaces/ineuron.h \
-    interfaces/ineurallayer.h \
-    interfaces/ineuralnet.h \
-    neuron.h \
-    neurallayer.h \
-    neuralnet.h \
-    debug.h
-
-FORMS +=
-
-RESOURCES +=
-
-TRANSLATIONS +=
-
-include($${PROJECT_ROOT}/app.pri)

neuralnetdemo/neuralnetdemo.pro

@@ -0,0 +1,18 @@
+QT += core
+QT -= gui widgets
+
+DBLIBS += neuralnetlib
+
+PROJECT_ROOT = ../..
+
+SOURCES += main.cpp
+
+HEADERS +=
+
+FORMS +=
+
+RESOURCES +=
+
+TRANSLATIONS +=
+
+include($${PROJECT_ROOT}/app.pri)

neuralnetlib/debug.h

@@ -1,9 +1,6 @@
-#ifndef DEBUG_H
+#pragma once
-#define DEBUG_H
 
 class QString;
 
 bool initDebug();
 void debug(const QString &line);
-
-#endif // DEBUG_H

neuralnetlib/interfaces/ineurallayer.h

@@ -1,5 +1,4 @@
-#ifndef INEURALLAYER_H
+#pragma once
-#define INEURALLAYER_H
 
 #include <QList>
 
@@ -17,5 +16,3 @@ public:
     virtual QList<INeuron *> &neurons() = 0;
     virtual const QList<INeuron *> &neurons() const = 0;
 };
-
-#endif // INEURALLAYER_H

neuralnetlib/interfaces/ineuralnet.h

@@ -1,5 +1,4 @@
-#ifndef INEURALNET_H
+#pragma once
-#define INEURALNET_H
 
 #include <qglobal.h>
 
@@ -19,5 +18,3 @@ public:
     virtual const INeuralLayer *hiddenLayer() const = 0;
     virtual const INeuralLayer *outputLayer() const = 0;
 };
-
-#endif // INEURALNET_H

neuralnetlib/interfaces/ineuron.h

@@ -1,5 +1,4 @@
-#ifndef INEURON_H
+#pragma once
-#define INEURON_H
 
 #include "ineuronsignal.h"
 #include "ineuronreceptor.h"
@@ -20,5 +19,3 @@ public:
     virtual NeuralFactor *bias() = 0;
     virtual const NeuralFactor *bias() const = 0;
 };
-
-#endif // INEURON_H

neuralnetlib/interfaces/ineuronreceptor.h

@@ -1,5 +1,4 @@
-#ifndef INEURONRECEPTOR_H
+#pragma once
-#define INEURONRECEPTOR_H
 
 template <class Key, class T> class QMap;
 
@@ -12,5 +11,3 @@ public:
     virtual QMap<INeuronSignal *, NeuralFactor *> &input() = 0;
     virtual const QMap<INeuronSignal *, NeuralFactor *> &input() const = 0;
 };
-
-#endif // INEURONRECEPTOR_H

neuralnetlib/interfaces/ineuronsignal.h

@@ -1,5 +1,4 @@
-#ifndef INEURONSIGNAL_H
+#pragma once
-#define INEURONSIGNAL_H
 
 #include <qglobal.h>
 
@@ -9,5 +8,3 @@ public:
     virtual qreal output() const = 0;
     virtual void setOutput(qreal output) = 0;
 };
-
-#endif // INEURONSIGNAL_H

neuralnetlib/neuralfactor.h

@@ -1,5 +1,4 @@
-#ifndef NEURALFACTOR_H
+#pragma once
-#define NEURALFACTOR_H
 
 #include <QObject>
 #include <qglobal.h>
@@ -32,5 +31,3 @@ private:
     qreal m_weight;
     qreal m_delta;
 };
-
-#endif // NEURALFACTOR_H

neuralnetlib/neurallayer.h

@@ -1,5 +1,4 @@
-#ifndef NEURALLAYER_H
+#pragma once
-#define NEURALLAYER_H
 
 #include <QObject>
 #include <QList>
@@ -29,5 +28,3 @@ private:
     NeuralNet *m_neuralNet;
     QList<INeuron *> m_neurons;
 };
-
-#endif // NEURALLAYER_H

neuralnetlib/neuralnet.h

@@ -1,5 +1,4 @@
-#ifndef NEURALNET_H
+#pragma once
-#define NEURALNET_H
 
 #include <QObject>
 
@@ -48,5 +47,3 @@ private:
     INeuralLayer *m_hiddenLayer;
     INeuralLayer *m_outputLayer;
 };
-
-#endif // NEURALNET_H

neuralnetlib/neuralnetlib.pro

@@ -0,0 +1,33 @@
+QT += core
+QT -= gui widgets
+
+DBLIBS +=
+
+PROJECT_ROOT = ../..
+
+SOURCES += \
+    neuron.cpp \
+    neurallayer.cpp \
+    neuralnet.cpp \
+    neuralfactor.cpp \
+    debug.cpp
+
+HEADERS += \
+    neuralfactor.h \
+    neuron.h \
+    neurallayer.h \
+    neuralnet.h \
+    debug.h \
+    interfaces/ineuronreceptor.h \
+    interfaces/ineuronsignal.h \
+    interfaces/ineuron.h \
+    interfaces/ineurallayer.h \
+    interfaces/ineuralnet.h
+
+FORMS +=
+
+RESOURCES +=
+
+TRANSLATIONS +=
+
+include($${PROJECT_ROOT}/lib.pri)

neuralnetlib/neuron.h

@@ -1,5 +1,4 @@
-#ifndef NEURON_H
+#pragma once
-#define NEURON_H
 
 #include <QObject>
 #include <QMap>
@@ -55,5 +54,3 @@ private:
     qreal m_error;
     NeuralFactor *m_bias;
 };
-
-#endif // NEURON_H