Data Reading Generalization

include/Datasets/DataReader.h

@@ -0,0 +1,23 @@
+//
+// Created by Daniel Lopez on 5/4/18.
+//
+
+#ifndef NEURALNETS_DATAREADER_H
+#define NEURALNETS_DATAREADER_H
+
+#include <models/Image.h>
+
+class DataReader {
+public:
+    const Image& getTrainingImage(int index) const;
+    const Image& getTestingImage(int index) const;
+
+    vector<Image> trainingData, testingData;
+
+private:
+    virtual void readData() = 0;
+    virtual void readDataWithLabels(const string &datafile, const string &labelfile, vector<Image> &dst) = 0;
+};
+
+
+#endif //NEURALNETS_DATAREADER_H

include/MNISTReader.h → include/Datasets/MNISTReader.h

@@ -8,24 +8,22 @@
 #include <vector>
 #include <string>
 #include "models/Image.h"
+#include "DataReader.h"
 
 using namespace std;
 
-class MNISTReader {
+class MNISTReader : public DataReader {
 public:
     ~MNISTReader();
     static MNISTReader* getInstance();
-    const Image& getTrainingImage(int index) const;
-    const Image& getTestingImage(int index) const;
 
-    vector<Image> trainingData, testingData;
 private:
     static MNISTReader* instance;
     MNISTReader() = default;
-    void readMNISTData();
+    void readData();
     void readDataWithLabels(const string& datafile, const string& labelfile, vector<Image>& dst);
 
-    static inline void grabFromFile(ifstream &fin, unsigned int &num);
+    void grabFromFileAndReverse(ifstream &fin, unsigned int &num);
 };
 
 #endif //NEURALNETS_MNISTREADER_H

include/Datasets/SmallNORBReader.h

@@ -0,0 +1,29 @@
+//
+// Created by Daniel Lopez on 4/11/18.
+//
+
+#ifndef NEURALNETS_SMALLNORBREADER_H
+#define NEURALNETS_SMALLNORBREADER_H
+
+#include <models/Image.h>
+#include "DataReader.h"
+
+using namespace std;
+
+class SmallNORBReader : public DataReader {
+public:
+    ~SmallNORBReader();
+    static SmallNORBReader* getInstance();
+
+private:
+    static SmallNORBReader* instance;
+    SmallNORBReader() = default;
+    void readData();
+    void readDataWithLabels(const string &datafile, const string &label, vector<Image> &dst);
+
+    void grabFromFile(ifstream &fin, unsigned int &num);
+    void readHeaderFromFile(ifstream &fin, unsigned int &magicNumber, vector<unsigned int>& dimSizes);
+};
+
+
+#endif //NEURALNETS_SMALLNORBREADER_H

include/MultilayerPerceptron/MultilayerPerceptron.h

@@ -7,7 +7,7 @@
 
 
 #include "PerceptronLayer.h"
-#include "MNISTReader.h"
+#include "Datasets/MNISTReader.h"
 
 class MultilayerPerceptron {
 public:

include/Utils.h

@@ -15,6 +15,7 @@ class Utils {
     static double getRandBetween(double lowerBound, double upperBound);
     static double getWeightRand(double n);
     static int reverseInt(int i);
+    static unsigned char reverseChar(char c);
     static long double square_length(const arma::vec &vn);
     static double length(const arma::vec &vn);
     static arma::vec squish(const arma::vec& input);

include/models/Image.h

@@ -12,18 +12,19 @@ using namespace std;
 
 class Image : public vector<unsigned char> {
 public:
-    Image();
+    explicit Image(int height = 28, int width = 28);
     Image(size_t label, const vector<double>& input);
     void addRow(const vector<unsigned char> &row);
     void print() const;
     vector<double> toVectorOfDoubles() const;
-    void fromVectorOfDoubles(const vector<double>& input);
+    void fromVectorOfUnsignedChars(const vector<unsigned char> &input);
     FeatureMap toFeatureMap() const;
 
     size_t getLabel() const;
     void setLabel(unsigned char l);
 private:
     unsigned char label;
+    int height, width;
 };
 
 

src/CapsuleNetwork/CapsuleNetwork.cpp

@@ -3,7 +3,7 @@
 //
 
 #include <Config.h>
-#include <MNISTReader.h>
+#include <Datasets/MNISTReader.h>
 #include <models/VectorMap.h>
 #include <Utils.h>
 #include <cassert>

src/Datasets/DataReader.cpp

@@ -0,0 +1,16 @@
+//
+// Created by Daniel Lopez on 5/4/18.
+//
+
+#include <cassert>
+#include "Datasets/DataReader.h"
+
+const Image& DataReader::getTrainingImage(int index) const {
+    assert (index <= trainingData.size());
+    return trainingData[index];
+}
+
+const Image& DataReader::getTestingImage(int index) const {
+    assert (index <= testingData.size());
+    return testingData[index];
+}

src/MNISTReader.cpp → src/Datasets/MNISTReader.cpp

@@ -5,25 +5,25 @@
 #include <fstream>
 #include <iostream>
 #include <Utils.h>
-#include "MNISTReader.h"
+#include "Datasets/MNISTReader.h"
 
 MNISTReader* MNISTReader::instance = nullptr;
 
 MNISTReader* MNISTReader::getInstance() {
     if (instance == nullptr) {
         instance = new MNISTReader;
-        instance->readMNISTData();
+        instance->readData();
     }
     return instance;
 }
 
 MNISTReader::~MNISTReader() {
-    if (instance == nullptr) {
+    if (instance != nullptr) {
         delete instance;
     }
 }
 
-void MNISTReader::readMNISTData() {
+void MNISTReader::readData() {
     readDataWithLabels("../data/train-images-idx3-ubyte", "../data/train-labels-idx1-ubyte", trainingData);
     readDataWithLabels("../data/t10k-images-idx3-ubyte", "../data/t10k-labels-idx1-ubyte", testingData);
 }
@@ -37,31 +37,27 @@ void MNISTReader::readDataWithLabels(const string &datafile, const string &label
         cerr << "Something went wrong in reading..." << endl;
         return;
     }
-    grabFromFile(fin, magicNumber);
-    grabFromFile(fin, numImages);
-    grabFromFile(fin, numRows);
-    grabFromFile(fin, numCols);
+    grabFromFileAndReverse(fin, magicNumber);
+    grabFromFileAndReverse(fin, numImages);
+    grabFromFileAndReverse(fin, numRows);
+    grabFromFileAndReverse(fin, numCols);
 
     for (int i = 0; i < numImages; i++) {
         Image image;
-
         for (int r = 0; r < numRows; r++) {
             vector<unsigned char> row(numCols);
-
             for (int c = 0; c < numCols; c++) {
                 fin.read((char*)&row[c], sizeof(row[c]));
             }
-
             image.addRow(row);
         }
-
         dst.push_back(image);
     }
     fin.close();
 
     fin.open(labelfile, ios::binary);
-    grabFromFile(fin, magicNumber);
-    grabFromFile(fin, labels);
+    grabFromFileAndReverse(fin, magicNumber);
+    grabFromFileAndReverse(fin, labels);
     for (int i = 0; i < labels; i++) {
         unsigned char temp;
         fin.read((char*)&temp, 1);
@@ -74,15 +70,7 @@ void MNISTReader::readDataWithLabels(const string &datafile, const string &label
 
 }
 
-void MNISTReader::grabFromFile(ifstream &fin, unsigned int &num) {
+void MNISTReader::grabFromFileAndReverse(ifstream &fin, unsigned int &num) {
     fin.read((char*)&num, sizeof(num));
     num = Utils::reverseInt(num);
-}
-
-const Image& MNISTReader::getTrainingImage(int index) const {
-    return trainingData[index];
-}
-
-const Image& MNISTReader::getTestingImage(int index) const {
-    return testingData[index];
 }

src/Datasets/SmallNORBReader.cpp

@@ -0,0 +1,91 @@
+//
+// Created by Daniel Lopez on 4/11/18.
+//
+
+#include <iostream>
+#include <fstream>
+#include <Utils.h>
+#include "Datasets/SmallNORBReader.h"
+
+SmallNORBReader* SmallNORBReader::instance = nullptr;
+
+SmallNORBReader* SmallNORBReader::getInstance() {
+    if (instance == nullptr) {
+        instance = new SmallNORBReader;
+        instance->readData();
+    }
+    return instance;
+}
+
+SmallNORBReader::~SmallNORBReader() {
+    if (instance != nullptr) {
+        delete instance;
+    }
+}
+
+void SmallNORBReader::readData() {
+    readDataWithLabels("../data/smallnorb-5x46789x9x18x6x2x96x96-training-dat.mat", "../data/smallnorb-5x46789x9x18x6x2x96x96-training-cat.mat", trainingData);
+    readDataWithLabels("../data/smallnorb-5x01235x9x18x6x2x96x96-testing-dat.mat", "../data/smallnorb-5x01235x9x18x6x2x96x96-testing-cat.mat", testingData);
+}
+
+void SmallNORBReader::readDataWithLabels(const string &datafile, const string &label, vector<Image> &dst) {
+    unsigned int data_magicNumber = 0;
+    unsigned int label_magicNumber = 0;
+    vector<unsigned int> data_dimSizes;
+    vector<unsigned int> label_dimSizes;
+
+    ifstream dataFin(datafile, ios::binary);
+    ifstream labelFin(label, ios::binary);
+    if (!dataFin.good() || !labelFin.good()) {
+        cerr << "Something went wrong in reading..." << endl;
+        return;
+    }
+
+    readHeaderFromFile(dataFin, data_magicNumber, data_dimSizes);
+    readHeaderFromFile(labelFin, label_magicNumber, label_dimSizes);
+
+    int numImages = label_dimSizes[0];
+
+    vector<unsigned char> imagedata(numImages*2*96*96);
+    vector<int> labeldata(numImages);
+
+    dataFin.read(reinterpret_cast<char*>(&imagedata[0]), numImages*2*96*96);
+    labelFin.read(reinterpret_cast<char*>(&labeldata[0]), numImages*sizeof(int));
+
+//    for (int r = 0; r < 2*96; r++) {
+//        for (int c = 0; c < 96; c++) {
+//            cout << double(255 - (int) imagedata[r*96 + c])/255 << "\t";
+//        }
+//        cout << endl;
+//    }
+    dataFin.close();
+
+    int imageDistance = 2*96*96;
+    for (int i = 0; i < numImages; i++) {
+        int index = i*imageDistance;
+        Image currentImage(96, 96);
+        currentImage.fromVectorOfUnsignedChars(
+                vector<unsigned char>(imagedata.begin() + index, imagedata.begin() + index + imageDistance));
+        dst.push_back(currentImage);
+    }
+}
+
+void SmallNORBReader::grabFromFile(ifstream &fin, unsigned int &num) {
+    fin.read((char*)&num, sizeof(num));
+}
+
+void SmallNORBReader::readHeaderFromFile(ifstream &fin, unsigned int &magicNumber, vector<unsigned int> &dimSizes) {
+    unsigned int numDimensions;
+
+    grabFromFile(fin, magicNumber);
+    grabFromFile(fin, numDimensions);
+    dimSizes.resize(max((unsigned int)3, numDimensions));
+    for (int i = 0; i < dimSizes.size(); i++) {
+        grabFromFile(fin, dimSizes[i]);
+    }
+
+//    for (int i = 0; i < dimSizes.size(); i++) {
+//        cout << dimSizes[i] << " ";
+//    }
+//    cout << endl;
+}

src/Utils.cpp

@@ -42,6 +42,13 @@ int Utils::reverseInt(int i) {
            ((int) c4);
 }
 
+unsigned char Utils::reverseChar(char c) {
+    c = (c & 0xF0) >> 4 | (c & 0x0F) << 4;
+    c = (c & 0xCC) >> 2 | (c & 0x33) << 2;
+    c = (c & 0xAA) >> 1 | (c & 0x55) << 1;
+    return c;
+}
+
 long double Utils::square_length(const arma::vec &vn) {
     long double sum = 0.0;
     for (auto& v : vn) {

src/main.cpp

@@ -10,6 +10,7 @@
 #include <models/VectorMap.h>
 #include <cassert>
 #include <CapsuleNetwork/CapsuleNetwork.h>
+#include <Datasets/SmallNORBReader.h>
 
 void test_SingleLayerCNN() {
     auto image = MNISTReader::getInstance()->trainingData[0];
@@ -240,6 +241,12 @@ void test_CapsuleNetwork_multipleReconstruction() {
     }
 }
 
+void test_readingNORBDatasets() {
+    auto readerPtr = SmallNORBReader::getInstance();
+    CapsuleNetwork capsuleNetwork;
+    capsuleNetwork.loadImageAndPrintOutput(0);
+}
+
 int main() {
 //    test_SingleLayerCNN();
 //    test_CapsuleNetSquishing();
@@ -255,6 +262,7 @@ int main() {
 //    test_CapsuleNetwork_Epoch();
     test_NetworkTallyingTiming();
 
+    test_readingNORBDatasets();
 
 //    ConvolutionalNetwork cnn;
 //    cnn.init();