Commit da3ecbc4f04ce888d7444730a1dae4678503ba88
1 parent
d39425d2
GroundTruth fixes
Showing
3 changed files
with
9 additions
and
12 deletions
openbr/plugins/misc.cpp
| @@ -295,7 +295,9 @@ class GroundTruthTransform : public UntrainableMetaTransform | @@ -295,7 +295,9 @@ class GroundTruthTransform : public UntrainableMetaTransform | ||
| 295 | { | 295 | { |
| 296 | Q_OBJECT | 296 | Q_OBJECT |
| 297 | Q_PROPERTY(QString groundTruth READ get_groundTruth WRITE set_groundTruth RESET reset_groundTruth STORED false) | 297 | Q_PROPERTY(QString groundTruth READ get_groundTruth WRITE set_groundTruth RESET reset_groundTruth STORED false) |
| 298 | + Q_PROPERTY(QStringList keys READ get_keys WRITE set_keys RESET reset_keys STORED false) | ||
| 298 | BR_PROPERTY(QString, groundTruth, "") | 299 | BR_PROPERTY(QString, groundTruth, "") |
| 300 | + BR_PROPERTY(QStringList, keys, QStringList()) | ||
| 299 | 301 | ||
| 300 | QMap<QString,File> files; | 302 | QMap<QString,File> files; |
| 301 | 303 | ||
| @@ -308,7 +310,7 @@ class GroundTruthTransform : public UntrainableMetaTransform | @@ -308,7 +310,7 @@ class GroundTruthTransform : public UntrainableMetaTransform | ||
| 308 | void project(const Template &src, Template &dst) const | 310 | void project(const Template &src, Template &dst) const |
| 309 | { | 311 | { |
| 310 | dst = src; | 312 | dst = src; |
| 311 | - dst.file.append(files[dst.file.baseName()].localMetadata()); | 313 | + foreach(const QString &key, keys) dst.file.set(key,files[dst.file.baseName()].value(key)); |
| 312 | } | 314 | } |
| 313 | }; | 315 | }; |
| 314 | 316 |
openbr/plugins/turk.cpp
| @@ -78,13 +78,8 @@ class MapTransform : public UntrainableTransform | @@ -78,13 +78,8 @@ class MapTransform : public UntrainableTransform | ||
| 78 | QMap<QString,QVariant> map; | 78 | QMap<QString,QVariant> map; |
| 79 | 79 | ||
| 80 | foreach(const QString &s, inputVariables) { | 80 | foreach(const QString &s, inputVariables) { |
| 81 | - // Get checks if the variant stored in m_metdata can be | ||
| 82 | - // converted to the type T. For some reason, you cannot | ||
| 83 | - // convert from a QVariant to a QVariant. Thus, this transform | ||
| 84 | - // has to assume that the metadata we want to organize can be | ||
| 85 | - // converted to a float, resulting in a loss of generality :-(. | ||
| 86 | if (t.file.contains(s)) { | 81 | if (t.file.contains(s)) { |
| 87 | - map.insert(s,t.file.get<float>(s)); | 82 | + map.insert(s,t.file.value(s)); |
| 88 | mappedT.file.remove(s); | 83 | mappedT.file.remove(s); |
| 89 | } | 84 | } |
| 90 | } | 85 | } |
scripts/attributes.sh
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | 2 | ||
| 3 | -BASE="Open+GroundTruth(../../sigsets/CUHK-VHDC/CUFSF/target.xml)+Rename(NEC3RightEye,Affine_0)+Rename(NEC3LeftEye,Affine_1)+Affine(192,240,.345,.475,-1,-1,-1,-1,Cubic)+Cvt(Gray)" | 3 | +BASE="Open+GroundTruth(../../sigsets/CUHK-VHDC/CUFSF/target.xml,[NEC3RightEye,NEC3LeftEye])+Rename(NEC3RightEye,Affine_0)+Rename(NEC3LeftEye,Affine_1)+Affine(192,240,.345,.475,-1,-1,-1,-1,Cubic)+Cvt(Gray)" |
| 4 | NOSE="RectFromStasmNoseWithBridge+ROI+Resize(76,52,Cubic)+Normalize(L2)+PCA(0.95)+Cat" | 4 | NOSE="RectFromStasmNoseWithBridge+ROI+Resize(76,52,Cubic)+Normalize(L2)+PCA(0.95)+Cat" |
| 5 | MOUTH="RectFromStasmMouth+ROI+Resize(36,104,Cubic)+Normalize(L2)+PCA(0.95)+Cat" | 5 | MOUTH="RectFromStasmMouth+ROI+Resize(36,104,Cubic)+Normalize(L2)+PCA(0.95)+Cat" |
| 6 | EYES="RectFromStasmEyes+ROI+Resize(24,136,Cubic)+Normalize(L2)+PCA(0.95)+Cat" | 6 | EYES="RectFromStasmEyes+ROI+Resize(24,136,Cubic)+Normalize(L2)+PCA(0.95)+Cat" |
| @@ -90,11 +90,11 @@ Turk(chinsize,[shortchin,longchin],3)],indices=[0,1,2,3,4,5,6,7,8,9,10,11,12,13, | @@ -90,11 +90,11 @@ Turk(chinsize,[shortchin,longchin],3)],indices=[0,1,2,3,4,5,6,7,8,9,10,11,12,13, | ||
| 90 | -path ../../img/CUHK-VHDC/CUFSF/target/ -train results30v2.turk models/all | 90 | -path ../../img/CUHK-VHDC/CUFSF/target/ -train results30v2.turk models/all |
| 91 | fi | 91 | fi |
| 92 | 92 | ||
| 93 | -br -crossValidate 2 -path ../../img/CUHK-VHDC/CUFSF/target/ -algorithm models/all -compare results30v2.turk results30v2.turk simmat/eyes.mtx | 93 | +br -crossValidate 2 -path ../../img/CUHK-VHDC/CUFSF/target/ -algorithm models/all -compare results30v2.turk results30v2.turk simmat/all.mtx |
| 94 | 94 | ||
| 95 | -br -crossValidate 2 -setHeader simmat/eyes.mtx ../../sigsets/CUHK-VHDC/CUFSF/target.xml ../../sigsets/CUHK-VHDC/CUFSF/query.xml | ||
| 96 | -br -crossValidate 2 -convert Output simmat/eyes.mtx output/eyes.rank | ||
| 97 | -br -crossValidate 2 -convert Output simmat/eyes.mtx algorithm_dataset/eyes_CUFSF%1.eval | 95 | +br -crossValidate 2 -setHeader simmat/all.mtx ../../sigsets/CUHK-VHDC/CUFSF/target.xml ../../sigsets/CUHK-VHDC/CUFSF/query.xml |
| 96 | +br -crossValidate 2 -convert Output simmat/all.mtx output/all.rank | ||
| 97 | +br -crossValidate 2 -convert Output simmat/all.mtx algorithm_dataset/all_CUFSF%1.eval | ||
| 98 | 98 | ||
| 99 | # Not trained on: earpitch, earsize, neck thickness | 99 | # Not trained on: earpitch, earsize, neck thickness |
| 100 | # Not used for comparison: gender, eyelashvisbility | 100 | # Not used for comparison: gender, eyelashvisbility |