Merge branch 'master' of https://github.com/biometrics/openbr

Scott Klum
2 parents dbc62a93 c00e8226
Showing 17 changed files with 65 additions and 98 deletions
openbr/core/common.cpp
openbr/core/common.h
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/draw.cpp
openbr/plugins/eigen3.cpp
openbr/plugins/process.cpp
openbr/plugins/stream.cpp
scripts/evalAgeRegression-PCSO.sh
scripts/evalFaceRecognition-LFW.sh
scripts/evalFaceRecognition-MEDS.sh
scripts/evalGenderClassification-PCSO.sh
scripts/pedestrianBaselineLBP.sh
scripts/trainAgeRegression-PCSO.sh
scripts/trainFaceRecognition-PCSO.sh
scripts/trainGenderClassification-PCSO.sh
share/openbr/cmake/OpenBRConfig.cmake
@@ -63,3 +63,16 @@ QList&lt;int&gt; Common::RandSample(int n, const QSet&lt;int&gt; &amp;values, bool unique)
     }
     return samples;
 }
+
+QList<float> linspace(float start, float stop, int n) {
+    float delta = (stop - start) / (n - 1);
+    float curValue = start;
+    QList<float> spaced;
+    spaced.reserve(n);
+    spaced.append(start);
+    for (int i = 1; i < (n - 1); i++) {
+        spaced.append(curValue += delta);
+    }
+    spaced.append(stop);
+    return spaced;
+}
@@ -253,6 +253,11 @@ QList&lt;int&gt; RandSample(int n, const QList&lt;T&gt; &amp;weights, bool unique = false)
 }
  
 /*!
+ * \brief See Matlab function linspace() for documentation.
+ */
+QList<float> linspace(float start, float stop, int n);
+
+/*!
  * \brief See Matlab function unique() for documentation.
  */
 template <typename T>
@@ -44,12 +44,6 @@ using namespace cv;
  
 Q_DECLARE_METATYPE(QLocalSocket::LocalSocketState)
  
-// Some globals used to transfer data to Context::messageHandler so that
-// we can restart the process if we try and fail to create a QApplication.
-static bool creating_qapp = false;
-static int * argc_ptr = NULL;
-static char ** argv_ptr = NULL;
-
 /* File - public methods */
 // Note that the convention for displaying metadata is as follows:
 // [] for lists in which argument order does not matter (e.g. [FTO=false, Index=0]),
@@ -848,13 +842,7 @@ int br::Context::blocks(int size) const
  
 bool br::Context::contains(const QString &name)
 {
-    QByteArray bytes = name.toLocal8Bit();
-    const char * c_name = bytes.constData();
-
-    for (int i=0; i<metaObject()->propertyCount(); i++)
-        if (!strcmp(c_name, metaObject()->property(i).name()))
-            return true;
-    return false;
+    return property(qPrintable(name)).isValid();
 }
  
 void br::Context::printStatus()
@@ -907,42 +895,26 @@ bool br::Context::checkSDKPath(const QString &amp;sdkPath)
 // We create our own when the user hasn't
 static QCoreApplication *application = NULL;
  
-void br::Context::initialize(int &argc, char *argv[], QString sdkPath, bool use_gui)
+void br::Context::initialize(int &argc, char *argv[], QString sdkPath, bool useGui)
 {
-    for (int i=0; i < argc; i ++)
-    {
-        if (strcmp("-useGui", argv[i]) == 0) {
-            const char * val = i+1 < argc ? argv[i+1] : "";
-            if (strcmp(val, "false") ==0 || strcmp(val, "0") == 0)
-                use_gui = false;
-            break;
-        }
-    }
-
     qInstallMessageHandler(messageHandler);
  
+#ifndef _WIN32
+    useGui = useGui && (getenv("DISPLAY") != NULL);
+#endif // not _WIN32
+
     // We take in argc as a reference due to:
     //   https://bugreports.qt-project.org/browse/QTBUG-5637
     // QApplication should be initialized before anything else.
     // Since we can't ensure that it gets deleted last, we never delete it.
     if (QCoreApplication::instance() == NULL) {
 #ifndef BR_EMBEDDED
-        if (use_gui) {
-            // Set up variables to be used in the message handler if this fails.
-            // Just so you know, we
-            creating_qapp = true;
-            argc_ptr = &argc;
-            argv_ptr = argv;
-
-            application = new QApplication(argc, argv);
-            creating_qapp = false;
-        }
-        else {
-            application = new QCoreApplication(argc, argv);
-        }
-#else
+        if (useGui) application = new QApplication(argc, argv);
+        else        application = new QCoreApplication(argc, argv);
+#else // not BR_EMBEDDED
+        useGui = false;
         application = new QCoreApplication(argc, argv);
-#endif
+#endif // BR_EMBEDDED
     }
  
     QCoreApplication::setOrganizationName(COMPANY_NAME);
@@ -965,8 +937,7 @@ void br::Context::initialize(int &amp;argc, char *argv[], QString sdkPath, bool use_
  
     Globals = new Context();
     Globals->init(File());
-    Globals->useGui = use_gui;
-
+    Globals->useGui = useGui;
  
     Common::seedRNG();
  
@@ -1035,26 +1006,6 @@ void br::Context::messageHandler(QtMsgType type, const QMessageLogContext &amp;conte
     static QMutex generalLock;
     QMutexLocker locker(&generalLock);
  
-    // If we are trying to create a QApplication, and get a fatal, then restart the process
-    // with useGui set to 0.
-    if (creating_qapp && type == QtFatalMsg)
-    {
-        // re-launch process with useGui = 0
-        std::cout << "Failed to initialize gui, restarting with -useGui 0" << std::endl;
-        QStringList arguments;
-        arguments.append("-useGui");
-        arguments.append("0");
-        for (int i=1; i < *argc_ptr; i++)
-        {
-            arguments.append(argv_ptr[i]);
-        }
-        // QProcess::execute blocks until the other process completes.
-        QProcess::execute(argv_ptr[0], arguments);
-        // have to unlock this for some reason
-        locker.unlock();
-        std::exit(0);
-    }
-
     QString txt;
     if (type == QtDebugMsg) {
         if (Globals->quiet) return;
@@ -1076,8 +1027,13 @@ void br::Context::messageHandler(QtMsgType type, const QMessageLogContext &amp;conte
         Globals->logFile.flush();
     }
  
-    if (type == QtFatalMsg)
+    if (type == QtFatalMsg) {
+#ifdef _WIN32
+        QCoreApplication::quit(); // abort() hangs the console on Windows for some reason related to the event loop not being exited
+#else // not _WIN32
         abort(); // We abort so we can get a stack trace back to the code that triggered the message.
+#endif // _WIN32
+    }
 }
  
 Context *br::Globals = NULL;
@@ -794,12 +794,12 @@ public:
      *                 By default <tt>share/openbr/openbr.bib</tt> will be searched for relative to:
      *                   -# The working directory
      *                   -# The executable's location
-     * \param use_gui Create a QApplication instead of a QCoreApplication.
+     * \param useGui Create a QApplication instead of a QCoreApplication.
      * \note Tiggers \em abort() on failure to locate <tt>share/openbr/openbr.bib</tt>.
      * \note <a href="http://qt-project.org/">Qt</a> users should instead call this <i>after</i> initializing QApplication.
      * \see finalize
      */
-    static void initialize(int &argc, char *argv[], QString sdkPath = "", bool use_gui = true);
+    static void initialize(int &argc, char *argv[], QString sdkPath = "", bool useGui = true);
  
     /*!
      * \brief Call \em once at the end of the application to deallocate global variables.
@@ -40,10 +40,12 @@ class DrawTransform : public UntrainableTransform
     Q_PROPERTY(bool points READ get_points WRITE set_points RESET reset_points STORED false)
     Q_PROPERTY(bool rects READ get_rects WRITE set_rects RESET reset_rects STORED false)
     Q_PROPERTY(bool inPlace READ get_inPlace WRITE set_inPlace RESET reset_inPlace STORED false)
+    Q_PROPERTY(int lineThickness READ get_lineThickness WRITE set_lineThickness RESET reset_lineThickness STORED false)
     BR_PROPERTY(bool, verbose, false)
     BR_PROPERTY(bool, points, true)
     BR_PROPERTY(bool, rects, true)
     BR_PROPERTY(bool, inPlace, false)
+    BR_PROPERTY(int, lineThickness, 1)
  
     void project(const Template &src, Template &dst) const
     {
@@ -61,7 +63,7 @@ class DrawTransform : public UntrainableTransform
         }
         if (rects) {
             foreach (const Rect &rect, OpenCVUtils::toRects(src.file.namedRects() + src.file.rects()))
-                rectangle(dst, rect, color);
+                rectangle(dst, rect, color, lineThickness);
         }
     }
 };
@@ -302,8 +302,8 @@ class LDATransform : public Transform
     Q_PROPERTY(int directLDA READ get_directLDA WRITE set_directLDA RESET reset_directLDA STORED false)
     Q_PROPERTY(float directDrop READ get_directDrop WRITE set_directDrop RESET reset_directDrop STORED false)
     Q_PROPERTY(QString inputVariable READ get_inputVariable WRITE set_inputVariable RESET reset_inputVariable STORED false)
-    Q_PROPERTY(bool isBinary READ get_isBinary WRITE set_isBinary RESET reset_isBinary STORED true)
-    Q_PROPERTY(bool normalize READ get_normalize WRITE set_normalize RESET reset_normalize STORED true)
+    Q_PROPERTY(bool isBinary READ get_isBinary WRITE set_isBinary RESET reset_isBinary STORED false)
+    Q_PROPERTY(bool normalize READ get_normalize WRITE set_normalize RESET reset_normalize STORED false)
     BR_PROPERTY(float, pcaKeep, 0.98)
     BR_PROPERTY(bool, pcaWhiten, false)
     BR_PROPERTY(int, directLDA, 0)
@@ -316,12 +316,6 @@ class LDATransform : public Transform
     Eigen::VectorXf mean;
     Eigen::MatrixXf projection;
     float stdDev;
-    bool trained;
-
-    void init()
-    {
-        trained = false;
-    }
  
     void train(const TemplateList &_trainingSet)
     {
@@ -461,9 +455,9 @@ class LDATransform : public Transform
         projection = ((space2.eVecs.transpose() * space1.eVecs.transpose()) * pca.eVecs.transpose()).transpose();
         dimsOut = dim2;
  
+        stdDev = 1; // default initialize
         if (isBinary) {
             assert(dimsOut == 1);
-            TemplateList projected;
             float posVal = 0;
             float negVal = 0;
             Eigen::MatrixXf results(trainingSet.size(),1);
@@ -493,8 +487,6 @@ class LDATransform : public Transform
             if (normalize)
                 stdDev = sqrt(results.array().square().sum() / trainingSet.size());
         }
-
-        trained = true;
     }
  
     void project(const Template &src, Template &dst) const
@@ -508,18 +500,22 @@ class LDATransform : public Transform
         // Do projection
         outMap = projection.transpose() * (inMap - mean);
  
-        if (normalize && isBinary && trained)
+        if (normalize && isBinary)
             dst.m().at<float>(0,0) = dst.m().at<float>(0,0) / stdDev;
     }
  
     void store(QDataStream &stream) const
     {
-        stream << pcaKeep << directLDA << directDrop << dimsOut << mean << projection << stdDev << normalize << isBinary << trained;
+        stream << pcaKeep << directLDA << directDrop << dimsOut << mean << projection;
+        if (normalize && isBinary)
+            stream << stdDev;
     }
  
     void load(QDataStream &stream)
     {
-        stream >> pcaKeep >> directLDA >> directDrop >> dimsOut >> mean >> projection >> stdDev >> normalize >> isBinary >> trained;
+        stream >> pcaKeep >> directLDA >> directDrop >> dimsOut >> mean >> projection;
+        if (normalize && isBinary)
+            stream >> stdDev;
     }
 };
  
@@ -531,8 +531,6 @@ class ProcessWrapperTransform : public TimeVaryingTransform
         baseKey = id.toString();
  
         QStringList argumentList;
-        argumentList.append("-useGui");
-        argumentList.append("0");
         argumentList.append("-algorithm");
         argumentList.append(transform);
         if (!Globals->path.isEmpty()) {
@@ -1079,8 +1079,7 @@ public:
  
         // Wait for the stream to process the last frame available from
         // the data source.
-        bool wait_res = false;
-        wait_res = readStage->dataSource.waitLast();
+        readStage->dataSource.waitLast();
  
         // Now that there are no more incoming frames, call finalize
         // on each transform in turn to collect any last templates
@@ -4,7 +4,7 @@ if [ ! -f evalAgeRegression-PCSO.sh ]; then
   exit
 fi
  
-export BR="../build/app/br/br -useGui 0"
+export BR=../build/app/br/br
 export PCSO_DIR=/user/pripshare/Databases/FaceDatabases/PCSO/PCSO/
 export ageAlg=AgeRegression
  
@@ -20,7 +20,7 @@ if [ ! -e Algorithm_Dataset ]; then
 fi
  
 # Run the LFW test protocol
-br -useGui 0 -algorithm $ALGORITHM -path ../data/LFW/img/ -crossValidate 10 -pairwiseCompare ../data/LFW/sigset/test_image_restricted_target.xml ../data/LFW/sigset/test_image_restricted_query.xml ${ALGORITHM}_LFW.mtx -convert Output ${ALGORITHM}_lfw.mtx Algorithm_Dataset/${ALGORITHM}_LFW%1.eval
+br -algorithm $ALGORITHM -path ../data/LFW/img/ -crossValidate 10 -pairwiseCompare ../data/LFW/sigset/test_image_restricted_target.xml ../data/LFW/sigset/test_image_restricted_query.xml ${ALGORITHM}_LFW.mtx -convert Output ${ALGORITHM}_lfw.mtx Algorithm_Dataset/${ALGORITHM}_LFW%1.eval
  
 # Plot results
-br -useGui 0 -plot Algorithm_Dataset/* 'lfw_results.pdf[smooth=Dataset,rocOptions[yLimits=(0,1)]]'
+br -plot Algorithm_Dataset/* 'lfw_results.pdf[smooth=Dataset,rocOptions[yLimits=(0,1)]]'
@@ -20,11 +20,11 @@ if [ ! -e Algorithm_Dataset ]; then
 fi
  
 if [ ! -e MEDS.mask ]; then
-  br -useGui 0 -makeMask ../data/MEDS/sigset/MEDS_frontal_target.xml ../data/MEDS/sigset/MEDS_frontal_query.xml MEDS.mask
+  br -makeMask ../data/MEDS/sigset/MEDS_frontal_target.xml ../data/MEDS/sigset/MEDS_frontal_query.xml MEDS.mask
 fi
  
 # Run Algorithm on MEDS
-br -useGui 0 -algorithm ${ALGORITHM} -path ../data/MEDS/img -compare ../data/MEDS/sigset/MEDS_frontal_target.xml ../data/MEDS/sigset/MEDS_frontal_query.xml ${ALGORITHM}_MEDS.mtx -eval ${ALGORITHM}_MEDS.mtx MEDS.mask Algorithm_Dataset/${ALGORITHM}_MEDS.csv
+br -algorithm ${ALGORITHM} -path ../data/MEDS/img -compare ../data/MEDS/sigset/MEDS_frontal_target.xml ../data/MEDS/sigset/MEDS_frontal_query.xml ${ALGORITHM}_MEDS.mtx -eval ${ALGORITHM}_MEDS.mtx MEDS.mask Algorithm_Dataset/${ALGORITHM}_MEDS.csv
  
 # Plot results
-br -useGui 0 -plot Algorithm_Dataset/*_MEDS.csv MEDS
+br -plot Algorithm_Dataset/*_MEDS.csv MEDS
@@ -9,7 +9,7 @@ export ALGORITHM=GenderClassification
 export PCSO_DIR=../data/PCSO/img
  
 # Create a file list by querying the database
-$BR -useGui 0 -quiet -algorithm Identity -enroll "$PCSO_DIR/PCSO.db[query='SELECT File,Gender,PersonID FROM PCSO', subset=1:8000]" terminal.txt > Input.txt
+$BR -quiet -algorithm Identity -enroll "$PCSO_DIR/PCSO.db[query='SELECT File,Gender,PersonID FROM PCSO', subset=1:8000]" terminal.txt > Input.txt
  
 # Enroll the file list and evaluate performance
-$BR -useGui 0  -algorithm $ALGORITHM -path $PCSO_DIR -enroll Input.txt Output.txt -evalClassification Output.txt Input.txt Gender
 \ No newline at end of file
+$BR -algorithm $ALGORITHM -path $PCSO_DIR -enroll Input.txt Output.txt -evalClassification Output.txt Input.txt Gender
 \ No newline at end of file
@@ -27,8 +27,7 @@ else
     TEST=testSmall.xml
 fi
  
-br -useGui 0 \
-   -algorithm "${ALG}" \
+br -algorithm "${ALG}" \
    -path $INRIA_PATH/img \
    -train $INRIA_PATH/sigset/train.xml pedModel \
    -enroll $INRIA_PATH/sigset/$TEST pedResults.xml
@@ -13,4 +13,4 @@ export ageAlg=AgeRegression
  
 export PCSO_DIR=/user/pripshare/Databases/FaceDatabases/PCSO/PCSO/
  
-$BR -useGui 0 -algorithm $ageAlg -path $PCSO_DIR/Images -train "$PCSO_DIR/PCSO.db[query='SELECT File,Age,PersonID FROM PCSO WHERE Age >= 17 AND AGE <= 68', subset=0:200]" ../share/openbr/models/algorithms/AgeRegression
+$BR -algorithm $ageAlg -path $PCSO_DIR/Images -train "$PCSO_DIR/PCSO.db[query='SELECT File,Age,PersonID FROM PCSO WHERE Age >= 17 AND AGE <= 68', subset=0:200]" ../share/openbr/models/algorithms/AgeRegression
@@ -14,7 +14,5 @@ export BR=../build/app/br/br
  
 export PCSO_DIR=/user/pripshare/Databases/FaceDatabases/PCSO/PCSO/
  
-
-
-$BR -useGui 0 -algorithm FaceRecognition -path "$PCSO_DIR/Images/" -train "$PCSO_DIR/PCSO.db[query='SELECT File,PersonID as Label,PersonID FROM PCSO', subset=0:5:6000]" ../share/openbr/models/algorithms/FaceRecognition
+$BR -algorithm FaceRecognition -path "$PCSO_DIR/Images/" -train "$PCSO_DIR/PCSO.db[query='SELECT File,PersonID as Label,PersonID FROM PCSO', subset=0:5:6000]" ../share/openbr/models/algorithms/FaceRecognition
  
@@ -13,4 +13,4 @@ export genderAlg=GenderClassification
  
 export PCSO_DIR=/user/pripshare/Databases/FaceDatabases/PCSO/PCSO/
  
-$BR -useGui 0  -algorithm $genderAlg -path $PCSO_DIR/Images -train "$PCSO_DIR/PCSO.db[query='SELECT File,Gender,PersonID FROM PCSO', subset=0:8000]" ../share/openbr/models/algorithms/GenderClassification
+$BR -algorithm $genderAlg -path $PCSO_DIR/Images -train "$PCSO_DIR/PCSO.db[query='SELECT File,Gender,PersonID FROM PCSO', subset=0:8000]" ../share/openbr/models/algorithms/GenderClassification
@@ -8,6 +8,7 @@
 #    target_link_libraries(MY_TARGET_NAME ${OPENBR_LIBS})
 # ================================================================
  
+string(REPLACE "/share/openbr/cmake" "" OPENBR_DIR ${OPENBR_DIR})
 include_directories(${OPENBR_DIR}/include)
 link_directories(${OPENBR_DIR}/lib)
 set(OPENBR_LIBS "openbr")