Peter M. Groen / openbr

Commit 43585b3f01c39e28fef302690ecca699e690b255

Authored by Josh Klontz
1 parent d9c315f2

tweaked fusion to allow Identity matrix

Inline Side-by-side
Showing 2 changed files with 5 additions and 2 deletions
openbr/core/fuse.cpp
  View file @43585b3
... ... @@ -75,7 +75,7 @@ static void normalizeMatrix(Mat &matrix, const Mat &mask, const QString &method)
75 75 }
76 76 }
77 77  
78   -void br::Fuse(const QStringList &inputSimmats, const QString &mask, const QString &normalization, const QString &fusion, const QString &outputSimmat)
  78 +void br::Fuse(const QStringList &inputSimmats, File mask, const QString &normalization, const QString &fusion, const QString &outputSimmat)
79 79 {
80 80 qDebug("Fusing %d to %s", inputSimmats.size(), qPrintable(outputSimmat));
81 81 QList<Mat> matrices;
... ... @@ -83,6 +83,9 @@ void br::Fuse(const QStringList &amp;inputSimmats, const QString &amp;mask, const QStrin
83 83 matrices.append(BEE::readSimmat(simmat));
84 84 if ((matrices.size() < 2) && (fusion != "None")) qFatal("Expected at least two similarity matrices.");
85 85 if ((matrices.size() > 1) && (fusion == "None")) qFatal("Expected exactly one similarity matrix.");
  86 +
  87 + mask.set("rows", matrices.first().rows);
  88 + mask.set("columns", matrices.first().cols);
86 89 Mat matrix_mask = BEE::readMask(mask);
87 90  
88 91 for (int i=0; i<matrices.size(); i++)
... ...
openbr/core/fuse.h
  View file @43585b3
... ... @@ -22,7 +22,7 @@
22 22  
23 23 namespace br
24 24 {
25   - void Fuse(const QStringList &inputSimmats, const QString &mask, const QString &normalization, const QString &fusion, const QString &outputSimmat);
  25 + void Fuse(const QStringList &inputSimmats, File mask, const QString &normalization, const QString &fusion, const QString &outputSimmat);
26 26 }
27 27  
28 28 #endif // __FUSE_H
... ...