Commit a58edfb5 authored by Hendrik-Joern Guenther's avatar Hendrik-Joern Guenther
Browse files

Update object classification - removed double confidences

parent 27e4d45a
Loading
Loading
Loading
Loading
+14 −41
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ ObjectClassDescription ::= SEQUENCE (SIZE(1..8)) OF ObjectClassWithConfidence
-- confidence indication.
ObjectClassWithConfidence ::= SEQUENCE {
    -- @todo
    class ObjectClass,
    objectClass ObjectClass,
    -- @todo
    confidence  ClassConfidence
}
@@ -262,46 +262,12 @@ ObjectClassWithConfidence ::= SEQUENCE {
-- The class that best describes the detected object. Each class provides optional subclasses and
-- an associated confidence for the subclass.
ObjectClass ::= CHOICE {
    vehicle                 VehicleSubclass,
    person                  PersonSubclass,
    animal                  AnimalSubclass,
    other                   OtherSubclass
}

-- @brief Vehicle Subclass
-- Describes the subclass of a detected object for class vehicle.
VehicleSubclass ::= SEQUENCE {
    -- @details type
    -- Type of this subclass defaults to 0 (unknown).
    type        VehicleSubclassType DEFAULT 0,
    confidence  ClassConfidence DEFAULT 0
}

-- @brief Person Subclass
-- Describes the subclass of a detected object for class person.
PersonSubclass ::= SEQUENCE {
    -- @details type
    -- Type of this subclass defaults to 0 (unknown).
    type        PersonSubclassType DEFAULT 0,
    confidence  ClassConfidence DEFAULT 0
}

-- @brief Animal Subclass
-- Describes the subclass of a detected object for class animal.
AnimalSubclass ::= SEQUENCE {
    -- @details type
    -- Type of this subclass defaults to 0 (unknown).
    type        AnimalSubclassType DEFAULT 0,
    confidence  ClassConfidence DEFAULT 0
}

-- @brief Other Subclass
-- Describes the subclass of a detected object for class other.
OtherSubclass ::= SEQUENCE {
    -- @details type
    -- Type of this subclass defaults to 0 (unknown).
    type        OtherSublassType DEFAULT 0,
    confidence  ClassConfidence DEFAULT 0
    unknownSubclass     UnknownSubclassType,
    vehicleSubclass     VehicleSubclassType,
    personSubclass      PersonSubclassType,
    animalSubclass      AnimalSubclassType,
    otherSubclass       OtherSublassType,
    ...
}

-- @brief Offset Point
@@ -324,6 +290,13 @@ NodeOffsetPointZ ::= CHOICE {
    node-Z6 Offset-B16  -- node is within 327.67m of last node
}

-- @brief Unknown Subclass Type
-- Describes the subclass of a detected object for class unknown.
-- @unit n/a
UnknownSubclassType ::= INTEGER {
    unknown             (0)
} (0..255)

-- @brief Animal Subclass Type
-- Describes the subclass of a detected object for class animal.
-- @unit n/a