TraciSimulationController.java 19.1 KB
Newer Older
1
2
package de.tud.kom.p2psim.impl.topology.movement.vehicular.sumo.simulation.controller.traci;

3
4
5
6
7
8
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
9
10
11
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
12
import java.util.LinkedList;
13
14
15
import java.util.List;
import java.util.Map;

16
17
18
19
20
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.api.EdgeController;
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.api.SimulationSetupExtractor;
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.api.VehicleController;
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.api.information.LocationUtils;
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.api.information.Position;
21
22
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.roadnetwork.RoadNetwork;
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.roadnetwork.RoadNetworkEdge;
Tobias Meuser's avatar
Tobias Meuser committed
23
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.roadnetwork.RoadNetworkLane;
24
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.roadnetwork.RoadNetworkRoute;
25
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.roadnetwork.SerializableRoadNetwork;
26
27
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.roadnetwork.exception.NoAdditionalRouteAvailableException;
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.roadnetwork.exception.NoExitAvailableException;
Tobias Meuser's avatar
Tobias Meuser committed
28
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.roadnetwork.routing.BreadthFirstSearchRoutingAlgorithm;
29
import de.tudarmstadt.maki.simonstrator.api.component.vehicular.roadnetwork.routing.RoutingAlgorithm;
30
import de.tudresden.sumo.cmd.Edge;
31
import de.tudresden.sumo.cmd.Junction;
32
import de.tudresden.sumo.cmd.Lane;
33
34
35
import de.tudresden.sumo.cmd.Simulation;
import de.tudresden.sumo.cmd.Vehicle;
import de.tudresden.sumo.util.SumoCommand;
36
import de.tudresden.ws.container.SumoBoundingBox;
37
import de.tudresden.ws.container.SumoGeometry;
38
39
import de.tudresden.ws.container.SumoLink;
import de.tudresden.ws.container.SumoLinkList;
40
41
42
43
import de.tudresden.ws.container.SumoPosition2D;
import de.tudresden.ws.container.SumoStringList;
import it.polito.appeal.traci.SumoTraciConnection;

44
public class TraciSimulationController implements VehicleController, SimulationSetupExtractor, EdgeController {
45
	private static final File TEMP_FILE = new File(new File(System.getProperty("java.io.tmpdir")), "road_network.tmp");
46

47
	private static final Map<String, TraciSimulationController> CONTROLLER = new HashMap<>();
48

49
	private static final double CLUSTERING_DISTANCE = 50;
50

51
52
	private String _sumoExe;
	private String _configFile;
53

54
	private SumoTraciConnection _connection;
55

56
57
	private double _start = -1;
	private double _step = -1;
58

59
60
61
62
	private double _startX;
	private double _startY;
	private double _endX;
	private double _endY;
63

64
	private Map<Double, Map<String, Position>> _positonsByTimestamp = new HashMap<>();
65
	private int _futureInformation = 0;
66

67
	private boolean _initalized = false;
68

69
	private boolean _observedAreaSet;
70

71
	private Map<String, Double> _vehiclesOutOfRange = new HashMap<>();
72

73
74
	private RoadNetwork _roadNetwork;

Tobias Meuser's avatar
Tobias Meuser committed
75
	private RoutingAlgorithm _algorithm = new BreadthFirstSearchRoutingAlgorithm();
76

77
78
79
80
81
82
	public static synchronized TraciSimulationController createSimulationController(String pSumoExe, String pConfigFile) {
		if (!CONTROLLER.containsKey(pConfigFile)) {
			CONTROLLER.put(pConfigFile, new TraciSimulationController(pSumoExe, pConfigFile));
		}
		return CONTROLLER.get(pConfigFile);
	}
83

84
85
86
87
	private TraciSimulationController(String pSumoExe, String pConfigFile) {
		_sumoExe = pSumoExe;
		_configFile = pConfigFile;
	}
88

89
90
91
	public static VehicleController getSimulationController() {
		return CONTROLLER.values().iterator().next();
	}
92

93
94
95
96
	@Override
	public synchronized void init() {
		if (!_initalized) {
			_connection = new SumoTraciConnection(_sumoExe, _configFile);
97

98
99
			try {
				_connection.runServer();
100

101
102
103
104
105
106
107
108
				for (int i = 0; i < _futureInformation; i++) {
					nextStep();
				}
			} catch (RuntimeException e) {
				throw e;
			} catch (Exception e) {
				e.printStackTrace();
			}
109

110
			Runnable shutdownHook = new Runnable() {
111

112
113
114
115
116
				@Override
				public void run() {
					_connection.close();
				}
			};
117

118
			Runtime.getRuntime().addShutdownHook(new Thread(shutdownHook));
119

120
121
122
			_initalized = true;
		}
	}
123

124
125
126
127
	@Override
	public Position getVehiclePosition(String pVehicleID) {
		return getVehiclePosition(_step, pVehicleID);
	}
128

129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
	@Override
	public Position getVehiclePosition(double pStep, String pVehicleID) {
		Map<String, Position> map = _positonsByTimestamp.get(pStep);

		return map.get(pVehicleID);
	}

	@Override
	public List<Position> getAllIntersections(boolean pCluster) {
		List<Position> result = new ArrayList<>();

		SumoCommand intersectionCommand = Junction.getIDList();

		Object intersectionObject = requestObject(intersectionCommand);

		SumoStringList intersections = (SumoStringList) intersectionObject;

		for (String intersection : intersections) {
			SumoCommand positionCommand = Junction.getPosition(intersection);
			Object positionObject = requestObject(positionCommand);
			SumoPosition2D sumoPosition = (SumoPosition2D) positionObject;

			if (_observedAreaSet) {
				if (_startX <= sumoPosition.x && sumoPosition.x <= _endX && _startY <= sumoPosition.y && sumoPosition.y <= _endY) {
					result.add(new Position(sumoPosition.x - _startX, sumoPosition.y - _startY, 0, 0));
				}
			} else {
				result.add(new Position(sumoPosition.x, sumoPosition.y, 0, 0));
			}
		}

		if (pCluster) {
			List<Position> tempResult = new ArrayList<>();

			outer:for (int i = 0; i < result.size(); i++) {
				Position position = result.get(i);

				for (int j = 0; j < tempResult.size(); j++) {
					Position addedPosition = tempResult.get(j);
					if (position != addedPosition && LocationUtils.calculateDistance(position, addedPosition) < CLUSTERING_DISTANCE / 1000.0) {
						continue outer;
					}
				}

				tempResult.add(position);
			}

			result = tempResult;
		}

		return result;
	}

	@Override
	public boolean nextStep() {
		try {
			_connection.do_timestep();

			try {
				int temp = (Integer) _connection.do_job_get(Simulation.getCurrentTime());

				_step = temp / 1000.0 - _futureInformation;

				if (_start == -1) {
					_start = _step + _futureInformation;
				}

				double newStep = _step + _futureInformation;
				if (!_positonsByTimestamp.containsKey(newStep)) {
					Map<String, Position> vehiclePositions = new HashMap<>();
					_positonsByTimestamp.put(newStep, vehiclePositions);

					List<String> allVehicles = requestAllVehicles();
					for (String vehicle : allVehicles) {
						Position vehiclePosition = requestVehiclePosition(vehicle);
						if (vehiclePosition != null) {
							vehiclePositions.put(vehicle, vehiclePosition);
						}
					}
				}

				if (_positonsByTimestamp.containsKey(_step - 1)) {
					_positonsByTimestamp.remove(_step - 1);
				}
			} catch (Exception e) {
				e.printStackTrace();
			}

			return true;
		} catch (RuntimeException e) {
			throw e;
		} catch (Exception e) {
			e.printStackTrace();
		}
		return false;
	}

	private Position requestVehiclePosition(String pVehicleID) {
		if (_vehiclesOutOfRange.containsKey(pVehicleID)) {
			if (_vehiclesOutOfRange.get(pVehicleID) < _step) {
				return null;
			} else {
				_vehiclesOutOfRange.remove(pVehicleID);
			}
		}

		SumoCommand positionCommand = Vehicle.getPosition(pVehicleID);
		SumoCommand angleCommand = Vehicle.getAngle(pVehicleID);
		SumoCommand speedCommand = Vehicle.getSpeed(pVehicleID);

		Object positionObject = requestObject(positionCommand);
		Object angleObject = requestObject(angleCommand);
		Object speedObject = requestObject(speedCommand);

		SumoPosition2D sumoPosition = (SumoPosition2D) positionObject;
		double angle = (Double) angleObject;
		double speed = (Double) speedObject;

		if (_observedAreaSet) {
			if (_startX <= sumoPosition.x && sumoPosition.x <= _endX && _startY <= sumoPosition.y && sumoPosition.y <= _endY) {
				return new Position(sumoPosition.x - _startX, sumoPosition.y - _startY, 0, angle, speed);
			} else {
				double diffX = _startX - sumoPosition.x;
				if (diffX < 0 || sumoPosition.x - _endX < diffX) {
					diffX = sumoPosition.x - _endX;
				}
				if (diffX < 0) {
					diffX = 0;
				}
				double diffY = _startY - sumoPosition.y;
				if (diffY < 0 || sumoPosition.y - _endY < diffY) {
					diffY = sumoPosition.y - _endY;
				}
				if (diffY < 0) {
					diffY = 0;
				}
				double diff = Math.sqrt(Math.pow(diffX, 2) + Math.pow(diffY, 2));

				double timeTillNextJoin = diff / 50;

				//                _vehiclesOutOfRange.put(pVehicleID, _step + timeTillNextJoin);

				return null;
			}
		} else {
			return new Position(sumoPosition.x, sumoPosition.y, 0, angle);
		}
	}

	private List<String> requestAllVehicles() {
		SumoCommand idList = Vehicle.getIDList();
		Object object = requestObject(idList);
		SumoStringList list = (SumoStringList)object;

		List<String> result = new ArrayList<>();

		for (String vehicle : list) {
			result.add(vehicle);
		}

		return result;
	}

	@Override
	public List<String> getAllVehicles() {
		return getAllVehicles(_step);
	}

	@Override
	public List<String> getAllVehicles(double pStep) {
		Map<String, Position> map = _positonsByTimestamp.get(pStep);

		return new ArrayList<>(map.keySet());
	}

304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
	public RoadNetworkEdge getCurrentEdge(String pVehicleID) {
		obtainRoadNetwork();

		SumoCommand roadIDCommand = Vehicle.getRoadID(pVehicleID);
		String currentRoadID = (String) requestObject(roadIDCommand);

		RoadNetworkEdge edge = _roadNetwork.getEdge(currentRoadID);
		while (edge.isInternal()) {
			if (edge.getAccessibleEdges().size() == 1) {
				edge = edge.getAccessibleEdges().get(0);
			} else {
				break;
			}
		}

		return edge;
	}

322
323
	@Override
	public RoadNetworkRoute getCurrentRoute(String pVehicleID) {
324
325
		obtainRoadNetwork();

326
327
328
329
		SumoCommand routeCommand = Vehicle.getRoute(pVehicleID);
		Object object = requestObject(routeCommand);
		SumoStringList streetList = (SumoStringList) object;

330
		RoadNetworkEdge currentEdge = getCurrentEdge(pVehicleID);
331

332
333
334
		if (currentEdge == null) {
			return null;
		}
335
336

		List<RoadNetworkEdge> streets = new ArrayList<>();
337
		boolean add = false;
338
		for (String street : streetList) {
339
			if (street.equals(currentEdge.getEdgeID())) {
340
341
342
343
344
345
346
347
348
				add = true;
			}
			if (add) {
				streets.add(_roadNetwork.getEdge(street));
			}
		}


		if (streets.size() == 0) {
349
			return new RoadNetworkRoute(new ArrayList<>());
350
351
		}

352
		return new RoadNetworkRoute(streets);
353
354
355
356
357
358
359
360
361
362
363
364
365
366
	}

	public Object requestObject(SumoCommand routeCommand) {
		Object object = null;
		try {
			object = _connection.do_job_get(routeCommand);
		} catch (RuntimeException e) {
			throw e;
		} catch (Exception e) {
			e.printStackTrace();
		}
		return object;
	}

367
368
369
370
371
372
373
374
375
376
	public void execute(SumoCommand routeCommand) {
		try {
			_connection.do_job_set(routeCommand);
		} catch (RuntimeException e) {
			throw e;
		} catch (Exception e) {
			e.printStackTrace();
		}
	}

377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
	@Override
	public double getStep() {
		return _step;
	}

	@Override
	public double getStart() {
		return _start;
	}

	@Override
	public double getMaximumAvailablePrediction() {
		double max = Collections.max(_positonsByTimestamp.keySet());

		return max;
	}

	@Override
	public void setObservedArea(double pStartX, double pStartY, double pEndX, double pEndY) {
		_startX = pStartX;
		_startY = pStartY;
		_endX = pEndX;
		_endY = pEndY;

		_observedAreaSet = true;
	}

	@Override
	public double getScenarioWidth() {
		SumoCommand netBoundaryCommand = Simulation.getNetBoundary();

		try {
			SumoBoundingBox netBoundary = (SumoBoundingBox) _connection.do_job_get(netBoundaryCommand);
410
			return Math.max(netBoundary.x_max - netBoundary.x_min, 10);
411
412
413
414
415
416
417
418
419
420
421
422
		} catch (Exception e) {
			//Nothing to do
		}
		return -1;
	}

	@Override
	public double getScenarioHeight() {
		SumoCommand netBoundaryCommand = Simulation.getNetBoundary();

		try {
			SumoBoundingBox netBoundary = (SumoBoundingBox) _connection.do_job_get(netBoundaryCommand);
423
			return Math.max(netBoundary.y_max - netBoundary.y_min, 10);
424
425
426
427
428
		} catch (Exception e) {
			//Nothing to do
		}
		return -1;
	}
429

430
431
432
433
434
	public boolean providesRoadInformation() {
		return true;
	}

	public RoadNetworkEdge getVehicleDestination(String pVehicleID) {
435
		RoadNetworkRoute roadNetworkRoute = getCurrentRoute(pVehicleID);
436
437
438
439

		return roadNetworkRoute.getDestination();
	}

440
	@Override
441
442
443
444
445
446
	public RoadNetwork getRoadNetwork() {
		obtainRoadNetwork();

		return _roadNetwork;
	}

447
	@Override
448
449
	public RoadNetworkRoute findNewRoute(String pVehicle) throws NoAdditionalRouteAvailableException {
		List<RoadNetworkRoute> routes = new ArrayList<>();
450
		RoadNetworkRoute route = getCurrentRoute(pVehicle);
451
452
453
454
455

		if (route.getRoute().isEmpty()) {
			return null;
		}

456
457
458
459
460
461
462
463
		routes.add(route);
		RoadNetworkRoute findRoute = _algorithm.findRoute(_roadNetwork, route.getStart(), route.getDestination(), routes);
		if (findRoute == null) {
			throw new NoAdditionalRouteAvailableException(route.getStart(), route.getDestination(), routes);
		}
		return findRoute;
	}

464
	@Override
465
466
467
	public RoadNetworkRoute findNewRoute(String pVehicle, List<RoadNetworkEdge> pEdgesToAvoid, boolean pKeepDestination) throws NoAdditionalRouteAvailableException, NoExitAvailableException {
		if (pKeepDestination) {
			List<RoadNetworkRoute> routes = new ArrayList<>();
468
			RoadNetworkRoute route = getCurrentRoute(pVehicle);
469
470
471
472
473

			if (route.getRoute().isEmpty()) {
				return null;
			}

474
475
476
477
478
479
480
481
			routes.add(route);

			RoadNetworkRoute findRoute = _algorithm.findRoute(_roadNetwork, route.getStart(), route.getDestination(), routes, pEdgesToAvoid);
			if (findRoute == null) {
				throw new NoAdditionalRouteAvailableException(route.getStart(), route.getDestination(), routes);
			}
			return findRoute;
		} else {
482
			RoadNetworkRoute route = getCurrentRoute(pVehicle);
483
484
485
486
487

			if (route.getRoute().isEmpty()) {
				return null;
			}

488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
			List<RoadNetworkEdge> routeList = route.getRoute();

			RoadNetworkEdge lastEdge = null;
			boolean search = false;
			outer:for (int i = routeList.size() - 1; i >= 0; i--) {
				if (search) {
					List<RoadNetworkEdge> accessibleEdges = routeList.get(i).getAccessibleEdges();
					if (accessibleEdges.size() > 1) {
						for (int j = 0; j < accessibleEdges.size(); j++) {
							if (!accessibleEdges.get(j).equals(lastEdge)) {
								List<RoadNetworkEdge> edges = new ArrayList<>();

								for (int k = 0; k <= i; k++) {
									edges.add(routeList.get(k));
								}
								edges.add(accessibleEdges.get(j));

								for (RoadNetworkEdge roadNetworkEdge : edges) {
									if (pEdgesToAvoid.contains(roadNetworkEdge)) {
										continue outer;
									}
								}

								return new RoadNetworkRoute(edges);
							}
						}
					}
				}
				search = true;
				lastEdge = routeList.get(i);
			}
			throw new NoExitAvailableException(route.getStart(), route.getDestination());
		}
	}

523
	@Override
524
525
526
527
528
529
530
531
	public void rerouteVehicle(String pVehicle, RoadNetworkRoute pRoute) {
		SumoStringList routeEdges = new SumoStringList();
		for (RoadNetworkEdge edge : pRoute.getRoute()) {
			routeEdges.add(edge.getEdgeID());
		}
		execute(Vehicle.setRoute(pVehicle, routeEdges));
	}

532
533
534
535
536
537
	@Override
	public void stopVehicle(String pVehicle) {
		SumoCommand stopCommand = Vehicle.setSpeed(pVehicle, 0);
		execute(stopCommand);
	}

538
539
	public void obtainRoadNetwork() {
		if (_roadNetwork == null) {
540
541
542
543
544
545
546
547
			if (TEMP_FILE.exists()) {
				try {
					ObjectInputStream inputStream = new ObjectInputStream(new FileInputStream(TEMP_FILE));

					Object readObject = inputStream.readObject();

					if (readObject instanceof SerializableRoadNetwork) {
						SerializableRoadNetwork serializedRoadNetwork = (SerializableRoadNetwork) readObject;
548
						_roadNetwork = new RoadNetwork(serializedRoadNetwork, this);
549
550
551
552
553
554
555
556
557
					}

					inputStream.close();
				} catch (IOException | ClassNotFoundException e) {
					//Nothing to do
				}
			}

			if (_roadNetwork != null) {
Tobias Meuser's avatar
Tobias Meuser committed
558
559
				System.out.println("Got network from cache");

560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
				SumoCommand edgeIDCommand = Edge.getIDList();

				SumoStringList edgeIDStringList = (SumoStringList) requestObject(edgeIDCommand);

				if (_roadNetwork.getAvailableEdges().size() == edgeIDStringList.size()) {
					boolean matching = true;

					for (String edgeID : edgeIDStringList) {
						if (_roadNetwork.getEdge(edgeID) == null) {
							matching = false;
						}
					}

					if (matching) {
						return;
					}
				}
			}
578
579
580
581
582
			SumoCommand laneIDCommand = Lane.getIDList();

			Map<String, RoadNetworkEdge> roadNetwork = new HashMap<>();

			SumoStringList laneIDStringList = (SumoStringList) requestObject(laneIDCommand);
583
584

			//Requesting all lanes from sumo.
585
586
587
588
589
			for (String laneID : laneIDStringList) {
				SumoCommand edgeIDCommand = Lane.getEdgeID(laneID);

				SumoLinkList linkStringList = (SumoLinkList) requestObject(Lane.getLinks(laneID));

590
591
592
593
				double angle = getLaneAngle(laneID);

				double maxSpeed = getMaxSpeed(laneID);

594
595
596
597
				if (linkStringList.size() > 0) {
					String edgeID = (String) requestObject(edgeIDCommand);

					if (!roadNetwork.containsKey(edgeID)) {
598
						roadNetwork.put(edgeID, new RoadNetworkEdge(edgeID, angle, this));
599
600
601
602
					}

					RoadNetworkEdge edge = roadNetwork.get(edgeID);

603
					edge.setOriginalMaxSpeed(maxSpeed);
Tobias Meuser's avatar
Tobias Meuser committed
604
					edge.addLane(new RoadNetworkLane(laneID));
605

606
607
608
609
					for (SumoLink link : linkStringList) {
						String notInternalLane = link.notInternalLane;
						String connectedEdge = (String) requestObject(Lane.getEdgeID(notInternalLane));

610
611
						double linkAngle = getLaneAngle(laneID);

612
						if (!roadNetwork.containsKey(connectedEdge)) {
Tobias Meuser's avatar
Tobias Meuser committed
613
614
							RoadNetworkEdge roadNetworkEdge = new RoadNetworkEdge(connectedEdge, linkAngle, this);
							roadNetwork.put(connectedEdge, roadNetworkEdge);
615
616
617
618
619
620
621
622
623
						}

						edge.addConnectedEdge(roadNetwork.get(connectedEdge));
					}
				}


			}
			_roadNetwork = new RoadNetwork(roadNetwork);
624
625
626
627
628
629
630
631
632
633
634
635

			try {
				ObjectOutputStream outputStream = new ObjectOutputStream(new FileOutputStream(TEMP_FILE));

				outputStream.writeObject(new SerializableRoadNetwork(_roadNetwork));

				outputStream.flush();
				outputStream.close();
			} catch (IOException e) {
				//Nothing to do
				e.printStackTrace();
			}
636
637
638
		}
	}

639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
	public double getMaxSpeed(String laneID) {
		SumoCommand maxSpeedCommand = Lane.getMaxSpeed(laneID);
		double maxSpeed = (Double) requestObject(maxSpeedCommand);
		return maxSpeed;
	}

	public double getLaneAngle(String laneID) {
		SumoCommand shapeCommand = Lane.getShape(laneID);
		SumoGeometry geometry = (SumoGeometry) requestObject(shapeCommand);

		LinkedList<SumoPosition2D> coords = geometry.coords;
		SumoPosition2D start = coords.getFirst();
		SumoPosition2D end = coords.getLast();

		double sin = (end.y - start.y) / Math.sqrt(Math.pow(end.x - start.x, 2) + Math.pow(end.y - start.y, 2));

		double angle = Math.asin(sin) * 180 / Math.PI;
		if (end.x - start.x < 0) {
			angle += 180;
		}
		return angle;
	}

Tobias Meuser's avatar
Tobias Meuser committed
662
663
664
665
666
667
668
669
	@Override
	public double getVehicleSpeed(String pVehicleID) {
		SumoCommand speedCommand = Vehicle.getSpeed(pVehicleID);
		Object object = requestObject(speedCommand);

		return (Double)object;
	}

670
671
672
673
674
675
676
	@Override
	public void setEdgeMaxSpeed(String pEdgeID, double pMaxSpeed) {
		SumoCommand setMaxSpeedCommand = Edge.setMaxSpeed(pEdgeID, pMaxSpeed);

		execute(setMaxSpeedCommand);
	}

677
}