Skip to content

Commit 7f267e4

Browse files
committed
Added some corrections to the doxygen comments and the README.md
1 parent ef10003 commit 7f267e4

12 files changed

+514
-115
lines changed

README.md

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ Open Simulation Interface (OSI)
33

44
[![Travis Build Status](https://travis-ci.org/OpenSimulationInterface/open-simulation-interface.svg?branch=master)](https://travis-ci.org/OpenSimulationInterface/open-simulation-interface)
55

6+
67
General description
78
-------------------
8-
https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/
9+
[TUM Department of Electrical and Computer Engineering] (https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/)
910

1011

1112
Global remarks
@@ -38,13 +39,16 @@ Fault injection: how-to
3839
Injection of pre-defined sensor errors should be handled by a specialized "fault injector" component that acts like a
3940
sensor model component, i.e. it takes a SensorData message as input and returns a modified SensorData message as output.
4041
Specific errors should be handled as follows:
41-
- Ghost objects / false positive: An additional SensorDataObject is added to the list of objects in SensorData.object
42-
with SensorDataObject.model_internal_object.ground_truth_type set to kTypeGhost.
43-
- False negative: The object is marked as not seen by the sensor by setting the property
44-
SensorDataObject.model_internal_object.is_seen to false. The implementation of field-of-view calculation modules
45-
should respect this flag and never reset an object marked as not-seen to seen.
42+
- Ghost objects / false positive:
43+
An additional SensorDataObject is added to the list of objects in SensorData.object
44+
with SensorDataObject.model_internal_object.ground_truth_type set to kTypeGhost.
45+
- False negative:
46+
The object is marked as not seen by the sensor by setting the property
47+
SensorDataObject.model_internal_object.is_seen to false. The implementation
48+
of field-of-view calculation modules should respect this flag and never reset
49+
an object marked as not-seen to seen.
50+
4651

47-
4852
Versioning
4953
----------
5054
The version number is defined in InterfaceVersion::version_number in osi_common.proto as the field's default value.
@@ -70,20 +74,22 @@ The compatibility of both recorded files and code remains.
7074
- Changing or adding comments
7175
- Clarification of text passages explaining the message content
7276

77+
7378
Packaging
7479
---------
7580

7681
A specification to package sensor models using OSI as (extended)
7782
Functional Mock-up Units (FMUs) for use in simulation environments
7883
is available [here](https://github.com/OpenSimulationInterface/osi-sensor-model-packaging).
7984

85+
8086
Documentation
8187
-------------
8288

8389
In order to generate the doxygen documentation for OSI, please follow the following steps:
84-
1. Install [Doxygen](http://www.stack.nl/~dimitri/doxygen/download.html) and set an environmental variable 'doxygen' with the path to the binary file.
90+
1. Install [Doxygen](http://www.stack.nl/~dimitri/doxygen/download.html), set an environmental variable 'doxygen' with the path to the binary file and add it to PATH ´<old-path>;%doxygen%´.
8591
2. Download and unzip the [zip file containing the filter proto2cpp.py](https://sourceforge.net/p/proto2cpp/wiki/Home/ ).
86-
3. Install [graphviz-2.38](http://www.graphviz.org/Download_windows.php ) and set an environmental variable 'dot' with the path to the binary file.
92+
3. Install [graphviz-2.38](http://www.graphviz.org/Download_windows.php ), set an environmental variable 'graphviz' with the path to the binary file and add it to PATH ´<old-path>;%graphviz%´.
8793
4. From the cmd navigate to the build directory and run:
8894
```cmd
8995
cmake -DFILTER_PROTO2CPP_PY_PATH=<path-to-proto2cpp.py> <path-to-CMakeLists.txt>

osi_common.proto

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,24 @@ option optimize_for = SPEED;
44

55
package osi;
66

7-
7+
//
88
// \brief The interface version number.
9-
9+
//
10+
// The field containing the version number. Should be left on default, not to be modified by sender.
11+
// Increments will happen as part of changes to the whole interface.
12+
//
1013
message InterfaceVersion
1114
{
12-
// The field containing the version number. Should be left on default, not to be modified by sender. Increments will
13-
// happen as part of changes to the whole interface.
15+
// Major version number.
16+
//
1417
optional uint32 major = 1 [default = 2];
18+
19+
// Minor version number.
20+
//
1521
optional uint32 minor = 2 [default = 1];
22+
23+
// Patch version number.
24+
//
1625
optional uint32 patch = 3 [default = 1];
1726
}
1827

@@ -23,15 +32,15 @@ message InterfaceVersion
2332
//
2433
message Vector3d
2534
{
26-
// The x coordinate
35+
// The x coordinate.
2736
//
2837
optional double x = 1;
2938

30-
// The y coordinate
39+
// The y coordinate.
3140
//
3241
optional double y = 2;
3342

34-
// The z coordinate
43+
// The z coordinate.
3544
//
3645
optional double z = 3;
3746
}
@@ -43,11 +52,11 @@ message Vector3d
4352
//
4453
message Vector2d
4554
{
46-
// The x coordinate
55+
// The x coordinate.
4756
//
4857
optional double x = 1;
4958

50-
// The y coordinate
59+
// The y coordinate.
5160
//
5261
optional double y = 2;
5362
}
@@ -79,12 +88,12 @@ message Dimension3d
7988
// The width of the bounding box.
8089
//
8190
optional double width = 1;
82-
91+
8392
// The length of the bounding box.
8493
//
8594
optional double length = 2;
86-
87-
//The height of the bounding box.
95+
96+
// The height of the bounding box.
8897
//
8998
optional double height = 3;
9099
}
@@ -116,11 +125,11 @@ message Orientation3d
116125
// The roll angle/rate/acceleration.
117126
//
118127
optional double roll = 1;
119-
128+
120129
// The pitch angle/rate/acceleration.
121130
//
122131
optional double pitch = 2;
123-
132+
124133
// The yaw angle/rate/acceleration.
125134
//
126135
optional double yaw = 3;
@@ -220,7 +229,7 @@ message BaseStationary
220229
//
221230
message BaseMoving
222231
{
223-
// The 3D dimension of the object (bounding box):
232+
// The 3D dimension of the object (bounding box).
224233
//
225234
optional Dimension3d dimension = 1;
226235

osi_detectedlandmark.proto

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,22 @@ message DetectedTrafficSign
4848
//
4949
enum Geometry
5050
{
51-
// Geometry of the traffic sign is unknown.
51+
// Geometry of the traffic sign is unknown (must not be used in ground truth).
5252
//
5353
GEOMETRY_UNKNOWN = 0;
54+
5455
// Geometry of the traffic sign is unspecified (but known).
5556
//
5657
GEOMETRY_OTHER = 1;
58+
5759
// Traffic sign has a triangular geometry.
5860
//
5961
GEOMETRY_TRIANGLE = 2;
62+
6063
// Traffic sign has a circular geometry.
6164
//
6265
GEOMETRY_CIRCLE = 3;
66+
6367
// Traffic sign has a square geometry.
6468
//
6569
GEOMETRY_SQUARE = 4;
@@ -69,15 +73,18 @@ message DetectedTrafficSign
6973
//
7074
enum MeasurementState
7175
{
72-
// Measurement state is unknown.
76+
// Measurement state is unknown (must not be used in ground truth).
7377
//
7478
MEASUREMENT_STATE_UNKNOWN = 0;
79+
7580
// Measurement state is unspecified (but known, i.e. value is not part of this enum list).
7681
//
7782
MEASUREMENT_STATE_OTHER = 1;
83+
7884
// Traffic sign has been measured by the sensor in the current timestep.
7985
//
8086
MEASUREMENT_STATE_MEASURED = 2;
87+
8188
// Traffic sign has not been measured by the sensor in the current timestep. Values provided by tracking only.
8289
//
8390
MEASUREMENT_STATE_PREDICTED = 3;

osi_detectedobject.proto

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,33 +74,43 @@ message DetectedObject
7474
// within the bounding volume unknown to the sensor. If this value is set, the center of the bounding box should
7575
// be used as reference point by convention, unless the specific use case requires otherwise.
7676
REFERENCE_POINT_UNKNOWN = 0;
77+
7778
// Other (unspecified but known) reference point.
7879
//
7980
REFERENCE_POINT_OTHER = 1;
81+
8082
// Center of the bounding box.
8183
//
8284
REFERENCE_POINT_CENTER = 2;
85+
8386
// Middle-Left of the bounding box.
8487
//
8588
REFERENCE_POINT_MIDDLE_LEFT = 3;
89+
8690
// Middle-Right of the bounding box.
8791
//
8892
REFERENCE_POINT_MIDDLE_RIGHT = 4;
93+
8994
// Rear-Middle of the bounding box.
9095
//
9196
REFERENCE_POINT_REAR_MIDDLE = 5;
97+
9298
// Rear-Left of the bounding box.
9399
//
94100
REFERENCE_POINT_REAR_LEFT = 6;
101+
95102
// Rear-Right of the bounding box.
96103
//
97104
REFERENCE_POINT_REAR_RIGHT = 7;
105+
98106
// Front-Middle of the bounding box.
99107
//
100108
REFERENCE_POINT_FRONT_MIDDLE = 8;
109+
101110
// Front-Left of the bounding box.
102111
//
103112
REFERENCE_POINT_FRONT_LEFT = 9;
113+
104114
// Front-Right of the bounding box.
105115
//
106116
REFERENCE_POINT_FRONT_RIGHT = 10;
@@ -114,21 +124,27 @@ message DetectedObject
114124
// Probability that the object has unknown type. Range [0,1].
115125
//
116126
optional double prob_unknown = 1;
127+
117128
// Probability that the object is a car. Range [0,1].
118129
//
119130
optional double prob_car = 2;
131+
120132
// Probability that the object is a truck. Range [0,1].
121133
//
122134
optional double prob_truck = 3;
135+
123136
// Probability that the object is a motorbike. Range [0,1].
124137
//
125138
optional double prob_motorbike = 4;
139+
126140
// Probability that the object is a bicycle. Range [0,1].
127141
//
128142
optional double prob_bicycle = 5;
143+
129144
// Probability that the object is a pedestrian. Range [0,1].
130145
//
131146
optional double prob_pedestrian = 6;
147+
132148
// Probability that the object is a stationary object. Range [0,1].
133149
//
134150
optional double prob_stationary = 7;

osi_environment.proto

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,23 @@ message EnvironmentalConditions
5757
// Ambient illumination is unknown (must not be used in ground truth).
5858
//
5959
AMBIENT_ILLUMINATION_UNKNOWN = 0;
60+
6061
// Other (unspecified but known) ambient illumination.
6162
//
6263
AMBIENT_ILLUMINATION_OTHER = 1;
64+
6365
// Ambient illumination index is "bright".
6466
// E.g. daytime with sunshine.
6567
AMBIENT_ILLUMINATION_BRIGHT = 2;
68+
6669
// Ambient illumination index is "medium".
6770
// E.g. daytime with overcast sky.
6871
AMBIENT_ILLUMINATION_MEDIUM = 3;
72+
6973
// Ambient illumination index is "low".
7074
// E.g. during twilight (dawn/dusk) or in a tunnel.
7175
AMBIENT_ILLUMINATION_LOW = 4;
76+
7277
// Ambient illumination index is "dark".
7378
// E.g. night time, no sunlight.
7479
AMBIENT_ILLUMINATION_DARK = 5;

osi_groundtruth.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ message GroundTruth
3939
// The data timestamp of the simulation environment. Zero time is arbitrary but must be identical for all messages.
4040
// Zero time does not need to coincide with the unix epoch. Recommended is the starting time point of the
4141
// simulation.
42-
//
4342
optional Timestamp timestamp = 2;
4443

4544
// A list of vehicles.

0 commit comments

Comments
 (0)