|
|
@@ -27,7 +27,7 @@ public class Track extends Observable { |
|
|
|
protected List<Vehicle> createVehiclesList(int numberVehicles){ |
|
|
|
List<Vehicle> result = new ArrayList<>(); |
|
|
|
for(int i=0;i<numberVehicles;i++){ |
|
|
|
Vehicle vehicle = new Vehicle(i, i, 5, 0.2f, this.trackLength); |
|
|
|
Vehicle vehicle = new Vehicle(i, i, 5, 0.1f, this.trackLength); |
|
|
|
result.add(vehicle); |
|
|
|
} |
|
|
|
|
|
|
@@ -46,12 +46,12 @@ public class Track extends Observable { |
|
|
|
if(distanceForerunner < 0.0){ |
|
|
|
distanceForerunner += this.trackLength; |
|
|
|
} |
|
|
|
v.updateVelocity(distanceForerunner); |
|
|
|
v.updateVelocity(distanceForerunner, timeStep); |
|
|
|
} |
|
|
|
List <VehicleTimeRecord> records = new ArrayList<>(vehicles.size()); |
|
|
|
this.vtr_list.add(records); |
|
|
|
for(Vehicle v: vehicles){ |
|
|
|
v.timeElapse(50); |
|
|
|
v.timeElapse(timeStep); |
|
|
|
VehicleTimeRecord vtr = new VehicleTimeRecord(v.id, v.position, v.curVelocity, timeStep); |
|
|
|
records.add(vtr); |
|
|
|
} |
|
|
@@ -60,4 +60,7 @@ public class Track extends Observable { |
|
|
|
this.notifyObservers(this); |
|
|
|
this.clearChanged(); |
|
|
|
} |
|
|
|
|
|
|
|
// Durchschnittsgeschwindigkeit, Anteil der Fahrzeuge unter einem bestimmten Threshold |
|
|
|
// |
|
|
|
} |