Refactor conditionals in AlgorithmCore::init

This saves upwards of 3 lines of code!

Refactor conditionals in AlgorithmCore::init
This saves upwards of 3 lines of code!
Charles Otto
1 parent ab563f10
Showing 3 changed files with 24 additions and 28 deletions
openbr/core/core.cpp
openbr/openbr_plugin.cpp
openbr/plugins/openbr_internal.h
@@ -522,41 +522,37 @@ struct AlgorithmCore
 private:
     QString name;
  
-    QString getFileName(const QString &description) const
-    {
-        const QString file = Globals->sdkPath + "/share/openbr/models/algorithms/" + description;
-        QFileInfo qFile(file);
-        return qFile.exists() && !qFile.isDir() ? file : QString();
-    }
-
-    void init(const QString &description)
+    // Check if description is either an abbreviation or a model file, if so load it
+    bool loadOrExpand(const QString & description)
     {
         // Check if a trained binary already exists for this algorithm
-        const QString file = getFileName(description);
-        if (!file.isEmpty()) return init(file);
+        QString file = Globals->sdkPath + "/share/openbr/models/algorithms/" + description;
+        QFileInfo eFile(file);
+        file = eFile.exists() && !eFile.isDir() ? file : description;
  
-        QFileInfo dFile(description);
-        if (dFile.exists()) {
+        QFileInfo dFile(file);
+        if (dFile.exists() && !dFile.isDir()) {
             qDebug("Loading %s", qPrintable(dFile.fileName()));
-            load(description);
-            return;
+            load(file);
+            return true;
         }
  
-        File parsed("."+description);
-        const QString parsedFname = getFileName(parsed.suffix());
-        QFileInfo pFile(parsedFname);
-        if (pFile.exists()) {
-            load(parsedFname);
-            applyAdditionalProperties(parsed, transform.data());
-            return;
+        // Expand abbreviated algorithms to their full strings
+        if (Globals->abbreviations.contains(description)) {
+            init(Globals->abbreviations[description]);
+            return true;
         }
+        return false;
+    }
  
-        // Expand abbreviated algorithms to their full strings
-        if (Globals->abbreviations.contains(description))
-            return init(Globals->abbreviations[description]);
+    void init(const QString &description)
+    {
+        if (loadOrExpand(description))
+            return;
  
-        if (Globals->abbreviations.contains(parsed.suffix())) {
-            init(Globals->abbreviations[parsed.suffix()]);
+        // check if the description is an abbreviation or model file with additional arguments supplied
+        File parsed("."+description);
+        if (loadOrExpand(parsed.suffix())) {
             applyAdditionalProperties(parsed, transform.data());
             return;
         }
@@ -1443,7 +1443,7 @@ void Distance::compareBlock(const TemplateList &amp;target, const TemplateList &amp;quer
             else output->setRelative(compare(target[j], query[i]), i+queryOffset, j+targetOffset);
 }
  
-void br::applyAdditionalProperties(File & temp, Transform * target)
+void br::applyAdditionalProperties(const File &temp, Transform *target)
 {
     QVariantMap meta = temp.localMetadata();
     for (QVariantMap::iterator i = meta.begin(); i != meta.end(); ++i) {
@@ -386,7 +386,7 @@ public:
 };
  
  
-void applyAdditionalProperties(File & temp, Transform * target);
+void applyAdditionalProperties(const File &temp, Transform *target);
  
 }