Commit f95f259e11ec12f6bbb63b5401fe2935988a961a
1 parent
4391f41f
Removed split parameter
Showing
1 changed file
with
3 additions
and
4 deletions
openbr/plugins/distance.cpp
| @@ -189,7 +189,6 @@ class FuseDistance : public Distance | @@ -189,7 +189,6 @@ class FuseDistance : public Distance | ||
| 189 | Q_ENUMS(Operation) | 189 | Q_ENUMS(Operation) |
| 190 | Q_PROPERTY(QString description READ get_description WRITE set_description RESET reset_description STORED false) | 190 | Q_PROPERTY(QString description READ get_description WRITE set_description RESET reset_description STORED false) |
| 191 | Q_PROPERTY(Operation operation READ get_operation WRITE set_operation RESET reset_operation STORED false) | 191 | Q_PROPERTY(Operation operation READ get_operation WRITE set_operation RESET reset_operation STORED false) |
| 192 | - Q_PROPERTY(QList<int> split READ get_split WRITE set_split RESET reset_split STORED false) | ||
| 193 | 192 | ||
| 194 | QList<br::Distance*> distances; | 193 | QList<br::Distance*> distances; |
| 195 | 194 | ||
| @@ -200,12 +199,12 @@ public: | @@ -200,12 +199,12 @@ public: | ||
| 200 | private: | 199 | private: |
| 201 | BR_PROPERTY(QString, description, "IdenticalDistance") | 200 | BR_PROPERTY(QString, description, "IdenticalDistance") |
| 202 | BR_PROPERTY(Operation, operation, Mean) | 201 | BR_PROPERTY(Operation, operation, Mean) |
| 203 | - BR_PROPERTY(QList<int>, split, QList<int>()) | ||
| 204 | 202 | ||
| 205 | void train(const TemplateList &src) | 203 | void train(const TemplateList &src) |
| 206 | { | 204 | { |
| 207 | - // Default is to train on each matrix | ||
| 208 | - if (split.isEmpty()) for (int i=0; i<src.at(0).size(); i++) split.append(1); | 205 | + // Partition the templates by matrix |
| 206 | + QList<int> split; | ||
| 207 | + for (int i=0; i<src.at(0).size(); i++) split.append(1); | ||
| 209 | 208 | ||
| 210 | QList<TemplateList> partitionedSrc = src.partition(split); | 209 | QList<TemplateList> partitionedSrc = src.partition(split); |
| 211 | 210 |