Skip to content
Snippets Groups Projects

Replaced (x,y) with (lat,long)

Merged Pascal Maurice Porta requested to merge LatLong into master
16 files
+ 109
109
Compare changes
  • Side-by-side
  • Inline
Files
16
@@ -55,27 +55,27 @@ grammar SimLang extends de.monticore.lang.montisim.Weather, de.monticore.lang.mo
// Entity Configuration
//
Pedestrians implements SimulationEntity = ("pedestrian"
"(" startX:NumberWithUnit "," startY:NumberWithUnit ("," startZ:NumberWithUnit)? ")"
"(" startLat:NumberWithUnit "," startLong:NumberWithUnit ("," startZ:NumberWithUnit)? ")"
"->"
"(" destX:NumberWithUnit "," destY:NumberWithUnit ("," destZ:NumberWithUnit)? ")"
"(" destLat:NumberWithUnit "," destLong:NumberWithUnit ("," destZ:NumberWithUnit)? ")"
) ;
//defined vehicle moving from start to destination pos
ExplicitVehicle implements SimulationEntity = "vehicle" Name
("(" startX:NumberWithUnit "," startY:NumberWithUnit "," startRot:NumberWithUnit ")"
("(" startLat:NumberWithUnit "," startLong:NumberWithUnit "," startRot:NumberWithUnit ")"
"->"
"(" destX:NumberWithUnit "," destY:NumberWithUnit ("," destZ:NumberWithUnit)? ")"
"(" destLat:NumberWithUnit "," destLong:NumberWithUnit ("," destZ:NumberWithUnit)? ")"
);
//random vehicles spawning somewhere within a circle at x,y with radius r moving to somewhere within dest circle
//random vehicles spawning somewhere within a circle at latitude,longitude with radius r moving to somewhere within dest circle
PathedVehicle implements SimulationEntity = "vehicle"
"(" startX:NumberWithUnit "," startY:NumberWithUnit "," spawnRadius:NumberWithUnit ")"
"(" startLat:NumberWithUnit "," startLong:NumberWithUnit "," spawnRadius:NumberWithUnit ")"
"->"
"(" destX:NumberWithUnit "," destY:NumberWithUnit "," destRadius:NumberWithUnit ")"
"(" destLat:NumberWithUnit "," destLong:NumberWithUnit "," destRadius:NumberWithUnit ")"
(amount:NumberWithUnit)?;
//completely random vehicle spawns and destinations with optional avoidance of path
RandomVehicle implements SimulationEntity = "vehicle" amount:NumberWithUnit ("(" startX:NumberWithUnit "," startY:NumberWithUnit ")" "->" "(" destX:NumberWithUnit "," destY:NumberWithUnit ")")?;
RandomVehicle implements SimulationEntity = "vehicle" amount:NumberWithUnit ("(" startLat:NumberWithUnit "," startLong:NumberWithUnit ")" "->" "(" destLat:NumberWithUnit "," destLong:NumberWithUnit ")")?;
//
// Communication Configuration
@@ -86,4 +86,4 @@ grammar SimLang extends de.monticore.lang.montisim.Weather, de.monticore.lang.mo
Latency implements ChannelSetting = "latency" AlternativeInput;
Outage implements ChannelSetting = "outage" AlternativeInput;
Area implements ChannelSetting = "area" (["global"]|(point1:Coordinate (point2:Coordinate|radius:NumberWithUnit))) ;
}
\ No newline at end of file
}
Loading