From 2ef03df89547a0b6d7b304ecfa9662ab19008925 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Tue, 4 Feb 2020 11:06:40 +0100 Subject: [PATCH] Labels: Update rules for more accurate results Signed-off-by: Michael Mayer --- internal/classify/rules.go | 76 +++++++++++++++++++++---------------- internal/classify/rules.yml | 72 ++++++++++++++++++++--------------- 2 files changed, 85 insertions(+), 63 deletions(-) diff --git a/internal/classify/rules.go b/internal/classify/rules.go index 384b8bcbb..e39621616 100644 --- a/internal/classify/rules.go +++ b/internal/classify/rules.go @@ -310,7 +310,7 @@ var rules = LabelRules{ }, "backpack": { Label: "", - Threshold: 0.200000, + Threshold: 0.300000, Priority: 0, Categories: []string{}, }, @@ -1108,7 +1108,7 @@ var rules = LabelRules{ }, "carbonara": { Label: "pasta", - Threshold: 0.300000, + Threshold: 0.400000, Priority: 0, Categories: []string{"dining", "food"}, }, @@ -1216,8 +1216,8 @@ var rules = LabelRules{ }, "chain": { Label: "", - Threshold: 0.500000, - Priority: 0, + Threshold: 1.000000, + Priority: -2, Categories: []string{}, }, "chain mail": { @@ -1336,7 +1336,7 @@ var rules = LabelRules{ }, "church": { Label: "church", - Threshold: 0.300000, + Threshold: 0.400000, Priority: 0, Categories: []string{"building", "architecture"}, }, @@ -1575,9 +1575,9 @@ var rules = LabelRules{ Categories: []string{}, }, "cowboy hat": { - Label: "hat", - Threshold: 0.300000, - Priority: 0, + Label: "", + Threshold: 1.000000, + Priority: -2, Categories: []string{}, }, "coyote": { @@ -1698,7 +1698,7 @@ var rules = LabelRules{ Label: "wall", Threshold: 0.300000, Priority: 0, - Categories: []string{"water"}, + Categories: []string{"architecture"}, }, "damselfly": { Label: "insect", @@ -2308,7 +2308,7 @@ var rules = LabelRules{ }, "gazelle": { Label: "", - Threshold: 0.500000, + Threshold: 0.600000, Priority: 0, Categories: []string{"animal", "wildlife"}, }, @@ -3285,10 +3285,10 @@ var rules = LabelRules{ Categories: []string{"animal"}, }, "library": { - Label: "", - Threshold: 0.700000, + Label: "architecture", + Threshold: 0.500000, Priority: 0, - Categories: []string{"architecture"}, + Categories: []string{}, }, "lifeboat": { Label: "boat", @@ -3358,7 +3358,7 @@ var rules = LabelRules{ }, "llama": { Label: "", - Threshold: 0.500000, + Threshold: 0.600000, Priority: 0, Categories: []string{"animal"}, }, @@ -3609,8 +3609,8 @@ var rules = LabelRules{ Categories: []string{"cooking", "electronics"}, }, "military uniform": { - Label: "uniform", - Threshold: 0.000000, + Label: "portrait", + Threshold: 0.350000, Priority: 0, Categories: []string{"people"}, }, @@ -3633,10 +3633,10 @@ var rules = LabelRules{ Categories: []string{"animal"}, }, "minibus": { - Label: "vehicle", - Threshold: 0.200000, + Label: "bus", + Threshold: 0.400000, Priority: 0, - Categories: []string{}, + Categories: []string{"vehicle"}, }, "miniskirt": { Label: "portrait", @@ -4569,10 +4569,10 @@ var rules = LabelRules{ Categories: []string{"farm", "animal"}, }, "rapeseed": { - Label: "flowers", + Label: "field", Threshold: 0.400000, Priority: 0, - Categories: []string{"flower", "nature", "plant"}, + Categories: []string{"farm", "landscape"}, }, "recreational vehicle": { Label: "camper", @@ -4839,10 +4839,10 @@ var rules = LabelRules{ Categories: []string{"animal"}, }, "school bus": { - Label: "vehicle", + Label: "bus", Threshold: 0.200000, Priority: 0, - Categories: []string{}, + Categories: []string{"vehicle"}, }, "schooner": { Label: "ship", @@ -5366,6 +5366,12 @@ var rules = LabelRules{ Priority: -2, Categories: []string{}, }, + "stone wall": { + Label: "wall", + Threshold: 0.300000, + Priority: 0, + Categories: []string{"architecture"}, + }, "stopwatch": { Label: "display", Threshold: 0.300000, @@ -5625,10 +5631,10 @@ var rules = LabelRules{ Categories: []string{"farm"}, }, "throne": { - Label: "castle", - Threshold: 0.500000, + Label: "", + Threshold: 0.400000, Priority: 0, - Categories: []string{"furniture"}, + Categories: []string{"historic"}, }, "thunder snake": { Label: "animal", @@ -5847,10 +5853,10 @@ var rules = LabelRules{ Categories: []string{"architecture"}, }, "trolleybus": { - Label: "vehicle", - Threshold: 0.500000, + Label: "bus", + Threshold: 0.400000, Priority: 0, - Categories: []string{}, + Categories: []string{"vehicle"}, }, "trombone": { Label: "instrument", @@ -5943,10 +5949,10 @@ var rules = LabelRules{ Categories: []string{}, }, "vestment": { - Label: "uniform", - Threshold: 0.500000, + Label: "portrait", + Threshold: 0.350000, Priority: 0, - Categories: []string{}, + Categories: []string{"people"}, }, "viaduct": { Label: "building", @@ -6212,6 +6218,12 @@ var rules = LabelRules{ Priority: 0, Categories: []string{"beverage", "drinks"}, }, + "wing": { + Label: "", + Threshold: 0.150000, + Priority: 0, + Categories: []string{"aircraft"}, + }, "wire-haired fox terrier dog": { Label: "dog", Threshold: 0.200000, diff --git a/internal/classify/rules.yml b/internal/classify/rules.yml index b0dc9c463..69de0821b 100644 --- a/internal/classify/rules.yml +++ b/internal/classify/rules.yml @@ -98,12 +98,11 @@ daisy: - plant rapeseed: - label: flowers + label: field threshold: 0.4 categories: - - flower - - nature - - plant + - farm + - landscape fashion: label: portrait @@ -111,6 +110,9 @@ fashion: categories: - people +vestment: + see: fashion + trench coat: see: ignore @@ -1549,13 +1551,13 @@ impala: - wildlife gazelle: - threshold: 0.5 + threshold: 0.6 categories: - animal - wildlife llama: - threshold: 0.5 + threshold: 0.6 categories: - animal @@ -1780,6 +1782,11 @@ airship: - airport - vehicle +wing: + threshold: 0.15 + categories: + - aircraft + ambulance: label: vehicle threshold: 0.3 @@ -1804,7 +1811,7 @@ assault rifle: see: weapon backpack: - threshold: 0.2 + threshold: 0.3 bakery: threshold: 0.5 @@ -1998,7 +2005,7 @@ china cabinet: church: label: church - threshold: 0.3 + threshold: 0.4 categories: - building - architecture @@ -2086,7 +2093,13 @@ dam: label: wall threshold: 0.3 categories: - - water + - architecture + +stone wall: + label: wall + threshold: 0.3 + categories: + - architecture desktop computer: label: computer @@ -2363,9 +2376,8 @@ reflex camera: see: photography library: - threshold: 0.7 - categories: - - architecture + label: architecture + threshold: 0.5 lifeboat: see: boat @@ -2437,8 +2449,10 @@ microwave: - electronics minibus: - label: vehicle - threshold: 0.2 + label: bus + threshold: 0.4 + categories: + - vehicle minivan: label: vehicle @@ -2778,8 +2792,10 @@ sax: see: instrument school bus: - label: vehicle + label: bus threshold: 0.2 + categories: + - vehicle schooner: see: ship @@ -2973,8 +2989,10 @@ triumphal arch: see: historic architecture trolleybus: - label: vehicle - threshold: 0.5 + label: bus + threshold: 0.4 + categories: + - vehicle trombone: see: instrument @@ -3242,7 +3260,7 @@ pomegranate: carbonara: label: pasta - threshold: 0.3 + threshold: 0.4 categories: - dining - food @@ -3547,10 +3565,6 @@ beaker: bucket: threshold: 0.5 -vestment: - label: uniform - threshold: 0.5 - baby: label: baby threshold: 0.25 @@ -3798,7 +3812,7 @@ joystick: see: electronics chain: - threshold: 0.5 + see: ignore chest: label: box @@ -3813,8 +3827,7 @@ cinema: - theater cowboy hat: - label: hat - threshold: 0.3 + see: ignore cowboy boot: see: shoe @@ -3870,9 +3883,7 @@ lumbermill: label: wood military uniform: - label: uniform - categories: - - people + see: fashion park bench: label: bench @@ -3956,10 +3967,9 @@ scuba diver: - water throne: - label: castle - threshold: 0.5 + threshold: 0.4 categories: - - furniture + - historic traffic light: label: traffic