tweaks

Josh Klontz
1 parent ead85fdf
Showing 6 changed files with 21 additions and 12 deletions
sdk/core/core.cpp
sdk/core/plot.cpp
sdk/core/qtutils.cpp
sdk/openbr_plugin.cpp
sdk/plugins/eigen3.cpp
sdk/plugins/misc.cpp
@@ -300,7 +300,8 @@ bool br::IsClassifier(const QString &amp;algorithm)
  
 void br::Train(const QString &inputs, const File &model)
 {
-    qDebug("Training on %s to %s", qPrintable(inputs), qPrintable(model.flat()));
+    qDebug("Training on %s%s", qPrintable(inputs),
+                               model.isNull() ? "" : qPrintable(" to " + model.flat()));
     AlgorithmManager::getAlgorithm(model.getString("algorithm"))->train(inputs, model);
 }
  
@@ -183,8 +183,9 @@ float Evaluate(const QString &amp;simmat, const QString &amp;mask, const QString &amp;csv)
         }
     }
  
-    if (operatingPoints.size() <= 2) qFatal("Insufficent genuines or impostors.");
-    operatingPoints.takeLast(); // Remove point (1,1)
+    if (operatingPoints.size() == 0) operatingPoints.append(OperatingPoint(1, 1, 1));
+    if (operatingPoints.size() == 1) operatingPoints.prepend(OperatingPoint(0, 0, 0));
+    if (operatingPoints.size() > 2)  operatingPoints.takeLast(); // Remove point (1,1)
  
     // Write Metadata table
     QStringList lines;
@@ -405,8 +406,8 @@ struct RPlot
         }
  
         const QString &smooth = destination.getString("smooth", "");
-        major.smooth = !smooth.isEmpty() && (major.header == smooth);
-        minor.smooth = !smooth.isEmpty() && (minor.header == smooth);
+        major.smooth = !smooth.isEmpty() && (major.header == smooth) && (major.size > 1);
+        minor.smooth = !smooth.isEmpty() && (minor.header == smooth) && (minor.size > 1);
         if (major.smooth) major.size = 1;
         if (minor.smooth) minor.size = 1;
         if (major.size < minor.size)
@@ -271,7 +271,9 @@ bool QtUtils::runRScript(const QString &amp;file)
     RScript.start("Rscript", QStringList() << file);
     RScript.waitForFinished(-1);
     bool result = ((RScript.exitCode() == 0) && (RScript.error() == QProcess::UnknownError));
-    if (!result) qDebug("Failed to run 'Rscript', did you forget to install R?  See online documentation of 'br_plot' for required R packages.");
+    if (!result) qDebug("Failed to run 'Rscript', did you forget to install R?  "
+                        "See online documentation of 'br_plot' for required R packages.  "
+                        "Otherwise, try running Rscript on %s to get the exact error.", qPrintable(file));
     return result;
 }
  
@@ -424,6 +424,7 @@ TemplateList TemplateList::fromInput(const br::File &amp;input)
         QScopedPointer<Gallery> i(Gallery::make(file));
         TemplateList newTemplates = i->read();
         const int crossValidate = input.getInt("crossValidate");
+        if (crossValidate > 0) srand(0);
  
         // If input is a Format not a Gallery
         if (newTemplates.isEmpty())
@@ -434,8 +435,7 @@ TemplateList TemplateList::fromInput(const br::File &amp;input)
             newTemplates[i].file.append(input.localMetadata());
             newTemplates[i].file.append(file.localMetadata());
             newTemplates[i].file.insert("Input_Index", i+templates.size());
-            if (crossValidate > 0)
-                newTemplates[i].file.insert("Cross_Validation_Partition", i*crossValidate/newTemplates.size());
+            if (crossValidate > 0) newTemplates[i].file.insert("Cross_Validation_Partition", rand()%crossValidate);
         }
  
         if (!templates.isEmpty() && input.getBool("merge")) {
@@ -266,9 +266,7 @@ class LDATransform : public Transform
  
     void train(const TemplateList &_trainingSet)
     {
-        TemplateList trainingSet = _trainingSet;
-        trainingSet = TemplateList::relabel(trainingSet);
-
+        TemplateList trainingSet = TemplateList::relabel(_trainingSet);
         int instances = trainingSet.size();
  
         // Perform PCA dimensionality reduction
@@ -123,6 +123,11 @@ BR_REGISTER(Transform, PrintTransform)
 class CheckTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
+    static int count;
+    int index;
+
+ public:
+    CheckTransform() : index(count++) {}
  
     void project(const Template &src, Template &dst) const
     {
@@ -134,11 +139,13 @@ class CheckTransform : public UntrainableMetaTransform
             const float *data = (const float*)fm.data;
             for (int i=0; i<elements; i++)
                 if (data[i] != data[i])
-                    qFatal("%s NaN check failed!", qPrintable(src.file.flat()));
+                    qFatal("%s NaN check %d failed!", qPrintable(src.file.flat()), index);
         }
     }
 };
  
+int CheckTransform::count = 0;
+
 BR_REGISTER(Transform, CheckTransform)
  
 /*!