Removed Train flag logic from crossValidate to facilitate training distances properly

Scott Klum
1 parent 32bfcd72
Showing 3 changed files with 10 additions and 12 deletions
openbr/plugins/independent.cpp
openbr/plugins/quality.cpp
openbr/plugins/validate.cpp
@@ -156,8 +156,8 @@ class IndependentTransform : public MetaTransform
         QFutureSynchronizer<void> futures;
         for (int i=0; i<templatesList.size(); i++)
-	  futures.addFuture(QtConcurrent::run(_train, transforms[i], &templatesList[i]));
-	futures.waitForFinished();
+            futures.addFuture(QtConcurrent::run(_train, transforms[i], &templatesList[i]));
+        futures.waitForFinished();
     }
     void project(const Template &src, Template &dst) const
@@ -173,7 +173,7 @@ class MatchProbabilityDistance : public Distance
             for (int j=0; j<i; j++) {
                 const float score = matrixOutput.data()->data.at<float>(i, j);
                 if (score == -std::numeric_limits<float>::max()) continue;
-                if (crossModality) if(src[i].file.get<QString>("MODALITY") == src[j].file.get<QString>("MODALITY")) continue;
+                if (crossModality && src[i].file.get<QString>("MODALITY") == src[j].file.get<QString>("MODALITY")) continue;
                 if (labels[i] == labels[j]) genuineScores.append(score);
                 else                        impostorScores.append(score);
             }
@@ -104,15 +104,13 @@ class CrossValidateTransform : public MetaTransform
         // since it is assumed that the allPartitions
         // flag is only used during comparison
         // (i.e. only used when making a mask)
-        if (src.file.getBool("Train", false)) dst = src;
-        else {
-            // If we want to duplicate templates but use the same training data
-            // for all partitions (i.e. transforms.size() == 1), we need to
-            // restrict the partition
-            int partition = src.file.get<int>("Partition", 0);
-            partition = (partition >= transforms.size()) ? 0 : partition;
-            transforms[partition]->project(src, dst);
-        }
+
+        // If we want to duplicate templates but use the same training data
+        // for all partitions (i.e. transforms.size() == 1), we need to
+        // restrict the partition
+        int partition = src.file.get<int>("Partition", 0);
+        partition = (partition >= transforms.size()) ? 0 : partition;
+        transforms[partition]->project(src, dst);
     }
     void store(QDataStream &stream) const