Skip to content

Commit de54413

Browse files
jdsikajdsika
committed
removed Estimated# message type
1 parent 58a129d commit de54413

File tree

5 files changed

+236
-333
lines changed

5 files changed

+236
-333
lines changed

‎osi_detectedlandmark.proto‎

Lines changed: 54 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ message DetectedTrafficSign
1919

2020
// The main sign as detected by the sensor.
2121
//
22-
optional EstimatedMainSign main_sign = 2;
22+
optional DetectedMainSign main_sign = 2;
2323

2424
// A list of additional supplementary sign(s) as detected by the sensor.
2525
//
2626
// \note OSI uses singular instead of plural for repeated field names.
2727
//
28-
repeated EstimatedSupplementarySign supplementary_sign = 3;
28+
repeated DetectedSupplementarySign supplementary_sign = 3;
2929

3030
//
3131
// \brief Candidates for a detected main sign as estimated by the sensor.
3232
//
33-
message EstimatedMainSign
33+
message DetectedMainSign
3434
{
3535
// A list of candidates for this traffic sign as estimated by the
3636
// sensor.
@@ -45,7 +45,7 @@ message DetectedTrafficSign
4545
//
4646
optional BaseStationary base_rmse = 2;
4747

48-
// The detected geometry of the traffic sign.
48+
// The estimated geometry of the traffic sign.
4949
//
5050
optional Geometry geometry = 3;
5151

@@ -139,7 +139,7 @@ message DetectedTrafficSign
139139
// \brief Candidates for all detected supplementary signs of one traffic
140140
// sign as estimated by the sensor.
141141
//
142-
message EstimatedSupplementarySign
142+
message DetectedSupplementarySign
143143
{
144144
// The definition of one of more supplementary signs that together
145145
// define this candidate.
@@ -155,14 +155,6 @@ message DetectedTrafficSign
155155
//
156156
optional BaseStationary base_rmse = 2;
157157

158-
// The estimated probability that this supplementary sign really
159-
// exists, not based on history.
160-
//
161-
// \note Use as confidence measure where a low value means less
162-
// confidence and a high value indicates strong confidence.
163-
//
164-
optional double existence_probability = 3;
165-
166158
//
167159
// \brief A candidate for a detected supplementary sign as estimated by
168160
// the sensor.
@@ -199,52 +191,41 @@ message DetectedTrafficLight
199191
//
200192
optional DetectedItemHeader header = 1;
201193

202-
// The main sign as detected by the sensor.
194+
// A list of candidates for this traffic light as estimated by the
195+
// sensor.
196+
//
197+
// \note OSI uses singular instead of plural for repeated field names.
203198
//
204-
optional EstimatedTrafficLight traffic_light = 2;
199+
repeated CandidateTrafficLight candidate = 2;
205200

201+
// The root mean squared error of the base parameters of the detected
202+
// traffic light's geometry. \c TrafficLight::base has to be identical
203+
// for all \c #candidate traffic lights.
206204
//
207-
// \brief Candidates for a detected traffic light as estimated by the
208-
// sensor.
205+
optional BaseStationary base_rmse = 3;
206+
207+
//
208+
// \brief A candidate for a detected traffic light as estimated by
209+
// the sensor.
209210
//
210-
message EstimatedTrafficLight
211+
message CandidateTrafficLight
211212
{
212-
// A list of candidates for this traffic light as estimated by the
213-
// sensor.
213+
// The estimated probability that this candidate is the true value.
214+
//
215+
// \note The sum of all \c #probability must be one. This probability is
216+
// given under the condition of
217+
// \c #DetectedItemHeader.existence_probability.
214218
//
215-
// \note OSI uses singular instead of plural for repeated field names.
219+
// Range: [0,1]
216220
//
217-
repeated CandidateTrafficLight candidate = 1;
221+
optional double probability = 1;
218222

219-
// The root mean squared error of the base parameters of the detected
220-
// traffic light's geometry. \c TrafficLight::base has to be identical
221-
// for all \c #candidate traffic lights.
223+
// The definition of one traffic light that define this candidate.
222224
//
223-
optional BaseStationary base_rmse = 2;
224-
225+
// \note IDs, which are referenced in this message, usually
226+
// reference to \c DetectedXXX::tracking_id IDs.
225227
//
226-
// \brief A candidate for a detected traffic light as estimated by
227-
// the sensor.
228-
//
229-
message CandidateTrafficLight
230-
{
231-
// The estimated probability that this candidate is the true value.
232-
//
233-
// \note The sum of all \c #probability must be one. This probability is
234-
// given under the condition of
235-
// \c #DetectedItemHeader.existence_probability.
236-
//
237-
// Range: [0,1]
238-
//
239-
optional double probability = 1;
240-
241-
// The definition of one traffic light that define this candidate.
242-
//
243-
// \note IDs, which are referenced in this message, usually
244-
// reference to \c DetectedXXX::tracking_id IDs.
245-
//
246-
optional TrafficLight traffic_light = 2;
247-
}
228+
optional TrafficLight traffic_light = 2;
248229
}
249230
}
250231

@@ -257,51 +238,40 @@ message DetectedRoadMarking
257238
//
258239
optional DetectedItemHeader header = 1;
259240

260-
// The road marking as detected by the sensor.
241+
// A list of candidates for this road marking as estimated by the
242+
// sensor.
243+
//
244+
// \note OSI uses singular instead of plural for repeated field names.
245+
//
246+
repeated CandidateRoadMarking candidate = 2;
247+
248+
// The root mean squared error of the base parameters of the detected
249+
// road marking. \c RoadMarking::base has to be identical for
250+
// all \c #candidate road markings.
261251
//
262-
optional EstimatedRoadMarking road_marking = 2;
252+
optional BaseStationary base_rmse = 3;
263253

264254
//
265-
// \brief Candidates for a detected road marking as estimated by the
255+
// \brief A candidate for a detected road marking as estimated by the
266256
// sensor.
267257
//
268-
message EstimatedRoadMarking
258+
message CandidateRoadMarking
269259
{
270-
// A list of candidates for this road marking as estimated by the
271-
// sensor.
260+
// The estimated probability that this candidate is the true value.
261+
//
262+
// \note The sum of all \c #probability must be one. This probability is
263+
// given under the condition of
264+
// \c #DetectedItemHeader.existence_probability.
272265
//
273-
// \note OSI uses singular instead of plural for repeated field names.
266+
// Range: [0,1]
274267
//
275-
repeated CandidateRoadMarking candidate = 1;
268+
optional double probability = 1;
276269

277-
// The root mean squared error of the base parameters of the detected
278-
// road marking. \c RoadMarking::base has to be identical for
279-
// all \c #candidate road markings.
270+
// The description of the road marking.
280271
//
281-
optional BaseStationary base_rmse = 2;
282-
272+
// \note IDs, which are referenced in this message, usually
273+
// reference to \c DetectedXXX::tracking_id IDs.
283274
//
284-
// \brief A candidate for a detected road marking as estimated by the
285-
// sensor.
286-
//
287-
message CandidateRoadMarking
288-
{
289-
// The estimated probability that this candidate is the true value.
290-
//
291-
// \note The sum of all \c #probability must be one. This probability is
292-
// given under the condition of
293-
// \c #DetectedItemHeader.existence_probability.
294-
//
295-
// Range: [0,1]
296-
//
297-
optional double probability = 1;
298-
299-
// The description of the road marking.
300-
//
301-
// \note IDs, which are referenced in this message, usually
302-
// reference to \c DetectedXXX::tracking_id IDs.
303-
//
304-
optional RoadMarking road_marking = 2;
305-
}
275+
optional RoadMarking road_marking = 2;
306276
}
307277
}

‎osi_detectedlane.proto‎

Lines changed: 51 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -16,44 +16,34 @@ message DetectedLane
1616
//
1717
optional DetectedItemHeader header = 1;
1818

19-
// The lane as detected by the sensor.
19+
// A list of candidates for this lane as estimated by the sensor.
2020
//
21-
optional EstimatedLane lane = 2;
21+
// \note OSI uses singular instead of plural for repeated field names.
22+
//
23+
repeated CandidateLane candidate = 2;
2224

2325
//
24-
// \brief Candidates for a detected lane as estimated by the sensor.
26+
// \brief A candidate for a detected lane as estimated by the
27+
// sensor.
2528
//
26-
message EstimatedLane
29+
message CandidateLane
2730
{
28-
// A list of candidates for this lane as estimated by the sensor.
31+
// The estimated probability that this candidate is the true value.
32+
//
33+
// \note The sum of all \c #probability must be one. This probability is
34+
// given under the condition of
35+
// \c #DetectedItemHeader.existence_probability.
2936
//
30-
// \note OSI uses singular instead of plural for repeated field names.
37+
// Range: [0,1]
3138
//
32-
repeated CandidateLane candidate = 1;
39+
optional double probability = 1;
3340

41+
// The definition of one lane that defines this candidate.
3442
//
35-
// \brief A candidate for a detected lane as estimated by the
36-
// sensor.
43+
// \note IDs, which are referenced in this message, usually
44+
// reference to \c DetectedXXX::tracking_id IDs.
3745
//
38-
message CandidateLane
39-
{
40-
// The estimated probability that this candidate is the true value.
41-
//
42-
// \note The sum of all \c #probability must be one. This probability is
43-
// given under the condition of
44-
// \c #DetectedItemHeader.existence_probability.
45-
//
46-
// Range: [0,1]
47-
//
48-
optional double probability = 1;
49-
50-
// The definition of one lane that defines this candidate.
51-
//
52-
// \note IDs, which are referenced in this message, usually
53-
// reference to \c DetectedXXX::tracking_id IDs.
54-
//
55-
optional Lane lane = 2;
56-
}
46+
optional Lane lane = 2;
5747
}
5848
}
5949

@@ -66,68 +56,49 @@ message DetectedLaneBoundary
6656
//
6757
optional DetectedItemHeader header = 1;
6858

69-
// The lane boundary as detected by the sensor.
59+
// A list of candidates for this lane boundary as estimated by the
60+
// sensor.
61+
//
62+
// \note OSI uses singular instead of plural for repeated field names.
63+
//
64+
repeated CandidateLaneBoundary candidate = 2;
65+
66+
// The root mean squared error of the \c LaneBoundary.BoundaryPoint
67+
// information from a \c LaneBoundary.
68+
// For each \c #lane_boundary \c LaneBoundary::boundary_line point exact
69+
// one \c #boundary_line_rmse rmse information exist.
70+
//
71+
repeated LaneBoundary.BoundaryPoint boundary_line_rmse = 3;
72+
73+
// Confidence of the segments of the \c LaneBoundary.BoundaryPoint
74+
// information from a \c LaneBoundary.
75+
// For each \c #lane_boundary \c LaneBoundary::boundary_line point exact
76+
// one \c #boundary_line_confidences confidence value is
77+
// specified.
7078
//
71-
optional EstimatedLaneBoundary lane_boundary = 2;
79+
repeated double boundary_line_confidences = 4;
7280

7381
//
74-
// \brief Candidates for a detected lane boundary as estimated by the
82+
// \brief A candidate for a detected lane boundary as estimated by the
7583
// sensor.
7684
//
77-
message EstimatedLaneBoundary
85+
message CandidateLaneBoundary
7886
{
79-
// A list of candidates for this lane boundary as estimated by the
80-
// sensor.
81-
//
82-
// \note OSI uses singular instead of plural for repeated field names.
83-
//
84-
repeated CandidateLaneBoundary candidate = 1;
85-
86-
// The root mean squared error of the \c LaneBoundary.BoundaryPoint
87-
// information from a \c LaneBoundary.
88-
// For each \c #lane_boundary \c LaneBoundary::boundary_line point exact
89-
// one \c #boundary_line_rmse rmse information exist.
87+
// The estimated probability that this candidate is the true value.
88+
//
89+
// \note The sum of all \c #probability must be one. This probability is
90+
// given under the condition of
91+
// \c #DetectedItemHeader.existence_probability.
9092
//
91-
repeated LaneBoundary.BoundaryPoint boundary_line_rmse = 2;
92-
93-
// Confidence of the segments of the \c LaneBoundary.BoundaryPoint
94-
// information from a \c LaneBoundary.
95-
// For each \c #lane_boundary \c LaneBoundary::boundary_line point exact
96-
// one \c #boundary_line_confidences confidence value is
97-
// specified.
93+
// Range: [0,1]
9894
//
99-
repeated double boundary_line_confidences = 3;
95+
optional double probability = 1;
10096

97+
// The definition of one lane boundary that defines this candidate.
10198
//
102-
// \brief A candidate for a detected lane boundary as estimated by the
103-
// sensor.
99+
// \note IDs, which are referenced in this message, usually
100+
// reference to \c DetectedXXX::tracking_id IDs.
104101
//
105-
message CandidateLaneBoundary
106-
{
107-
// The estimated probability that this candidate is the true value.
108-
//
109-
// \note The sum of all \c #probability must be one. This probability is
110-
// given under the condition of
111-
// \c #DetectedItemHeader.existence_probability.
112-
//
113-
// Range: [0,1]
114-
//
115-
optional double probability = 1;
116-
117-
// The definition of one lane boundary that defines this candidate.
118-
//
119-
// \note IDs, which are referenced in this message, usually
120-
// reference to \c DetectedXXX::tracking_id IDs.
121-
//
122-
optional LaneBoundary lane_boundary = 2;
123-
124-
// Confidence of the classified lane boundary type.
125-
//
126-
optional double type_confidence = 3;
127-
128-
// Confidence of the classified lane marker color.
129-
//
130-
optional double color_confidence = 4;
131-
}
102+
optional LaneBoundary lane_boundary = 2;
132103
}
133104
}

0 commit comments

Comments
 (0)