.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
-  </component>
-</project>

.idea/misc.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="JavadocGenerationManager">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <option name="OUTPUT_DIRECTORY" value="$USER_HOME$/Desktop/TrafficSimDoc" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/androidTest/java/de/hems/trafficsim/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package de.hems.trafficsim;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("de.hems.trafficsim", appContext.getPackageName());
+    }
+}

app/src/main/java/de/hems/trafficsim/MainActivity.java

@@ -1,5 +1,7 @@
 package de.hems.trafficsim;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -7,127 +9,61 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import androidx.appcompat.app.AppCompatActivity;
+import java.util.Observable;
+import java.util.Observer;
 
-/**
- * Main user interface class, containing all necessary gui elements and their control flow.
- */
 public class MainActivity extends AppCompatActivity implements SeekBar.OnSeekBarChangeListener {
-    /**
-     * default value of the number of vehicles on the track
-     */
     public static final int defaultNoOfVehicles = 25;
-
-    /**
-     * default value of the length of the track
-     */
     public static final int defaultTrackLength = 100;
-
-    /**
-     * default value of brake probability
-     */
     public static final float defaultBrakeProb = 0.3f;
-
-    /**
-     * default value of the maximum velocity of the vehicles
-     */
     public static final float defaultMaxVelocity = 5.0f;
-
-    /**
-     * default value of the delay between two simulation steps
-     */
     public static final int defaultDelay = 0;
-
-    /**
-     * default value of the number of vehicles on the track
-     */
     public static final int defaultHistoryLength = 50;
-
-    /**
-     * default value of the number of vehicles on the track
-     */
     public static final int defaultFrameskip = 0;
-
-    /**
-     * the track to show in the activity
-     */
     protected Track track;
-
-    /**
-     * the surface view on which the renderer draws the track history
-     */
     protected TimeRecordView trackView;
-
-    /**
-     * the thread which runs the simulation and visualization
-     */
     protected Worker worker;
-
-    /**
-     * the renderer instance drawing the track history
-     */
     protected Renderer renderer;
-
-    /**
-     * the layout which keeps the surface view
-     */
     protected LinearLayout viewStack;
 
-    /**
-     * Utility function to round a float to a given amount of digits.
-     *
-     * @param number number to round
-     * @param digits amount of digits
-     * @return rounded number
-     */
-    public static float round(float number, int digits) {
-        float div = (float) Math.pow(10.0f, digits);
-        return Math.round(number * div) / div;
-    }
-
-    /**
-     * Constructor for MainActivity
-     *
-     * @param savedInstanceState Bundle with previously saved activity state, otherwise null
-     */
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         this.track = new Track(defaultNoOfVehicles, defaultTrackLength, defaultBrakeProb,
                 defaultMaxVelocity, defaultDelay, defaultHistoryLength);
-        this.viewStack = findViewById(R.id.trackViewStack);
+        this.viewStack = (LinearLayout) findViewById(R.id.trackViewStack);
         this.trackView = new TimeRecordView(this, track);
 
         viewStack.addView(this.trackView);
         this.renderer = new Renderer(track, this.trackView.getHolder());
 
-        SeekBar trackLengthSeekBar = findViewById(R.id.trackLengthSeekBar);
+        SeekBar trackLengthSeekBar = (SeekBar) findViewById(R.id.trackLengthSeekBar);
         trackLengthSeekBar.setOnSeekBarChangeListener(this);
         trackLengthSeekBar.setProgress(defaultTrackLength);
         ((TextView)(findViewById(R.id.trackLengthTextView))).setText(String.valueOf(defaultTrackLength));
 
-        SeekBar maxVelocitySeekBar = findViewById(R.id.maxVelocitySeekBar);
+        SeekBar maxVelocitySeekBar = (SeekBar) findViewById(R.id.maxVelocitySeekBar);
         maxVelocitySeekBar.setOnSeekBarChangeListener(this);
         maxVelocitySeekBar.setProgress((int)defaultMaxVelocity);
         ((TextView)(findViewById(R.id.maxVeloTextView))).setText(String.valueOf((int)defaultMaxVelocity));
 
-        SeekBar noOfVehiclesSeekBar = findViewById(R.id.noOfVehiclesSeekBar);
+        SeekBar noOfVehiclesSeekBar = (SeekBar) findViewById(R.id.noOfVehiclesSeekBar);
         noOfVehiclesSeekBar.setOnSeekBarChangeListener(this);
         noOfVehiclesSeekBar.setProgress(defaultNoOfVehicles);
         ((TextView)(findViewById(R.id.noOfVehiclesTextView))).setText(String.valueOf(defaultNoOfVehicles));
 
-        SeekBar brakeProbabilitySeekBar = findViewById(R.id.brakeProbabilitySeekBar);
+        SeekBar brakeProbabilitySeekBar = (SeekBar) findViewById(R.id.brakeProbabilitySeekBar);
         brakeProbabilitySeekBar.setOnSeekBarChangeListener(this);
         brakeProbabilitySeekBar.setProgress((int)(defaultBrakeProb*20));
         ((TextView)(findViewById(R.id.brakeProbTextView))).setText(String.valueOf(defaultBrakeProb));
 
-        SeekBar delaySeekBar = findViewById(R.id.simDelaySeekBar);
+        SeekBar delaySeekBar = (SeekBar)(findViewById(R.id.simDelaySeekBar));
         delaySeekBar.setOnSeekBarChangeListener(this);
         delaySeekBar.setProgress(defaultDelay);
         ((TextView)(findViewById(R.id.simDelayTextView))).setText(String.valueOf(defaultDelay));
 
-        SeekBar frameskipSeekBar = findViewById(R.id.frameskipSeekBar);
+        SeekBar frameskipSeekBar = (SeekBar)(findViewById(R.id.frameskipSeekBar));
         frameskipSeekBar.setOnSeekBarChangeListener(this);
         frameskipSeekBar.setProgress(defaultFrameskip);
         ((TextView)(findViewById(R.id.frameSkipTextView))).setText(String.valueOf(defaultFrameskip));
@@ -135,15 +71,17 @@ public class MainActivity extends AppCompatActivity implements SeekBar.OnSeekBar
         this.updateStats();
     }
 
-    /**
+    public static float round(float number, int digits) {
-     * Updates the statistics view.
+        float div = (float) Math.pow(10.0f, digits);
-     */
+        return Math.round(number*div)/div;
+    }
+
     public void updateStats() {
         final Track trackRef = this.track;
-        final TextView lastAvgView = findViewById(R.id.avgVeloLastView);
+        final TextView lastAvgView = (TextView) findViewById(R.id.avgVeloLastView);
-        final TextView overallAvgView = findViewById(R.id.avgVeloOverallView);
+        final TextView overallAvgView = (TextView) findViewById(R.id.avgVeloOverallView);
-        final TextView delayedAvgView = findViewById(R.id.delayedAvgTextView);
+        final TextView delayedAvgView = (TextView) findViewById(R.id.delayedAvgTextView);
-        final TextView stepsView = findViewById(R.id.stepsTextView);
+        final TextView stepsView = (TextView) findViewById(R.id.stepsTextView);
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -155,30 +93,20 @@ public class MainActivity extends AppCompatActivity implements SeekBar.OnSeekBar
         });
     }
 
-    /**
-     * Handler function for clicks on the "Step" button.
-     *
-     * @param view the view the event is generated from
-     */
     public void onStepButtonClick(View view) {
         this.track.timeElapse();
         this.updateStats();
         this.renderer.draw();
     }
 
-    /**
-     * Handler function for clicks on the "Play" button.
-     *
-     * @param view the view the event is generated from
-     */
     public void onPlayButtonClick(View view) {
-        Button playButton = findViewById(R.id.playButton);
+        Button playButton = (Button) findViewById(R.id.playButton);
         playButton.setEnabled(false);
-        Button stepButton = findViewById(R.id.stepButton);
+        Button stepButton = (Button) findViewById(R.id.stepButton);
         stepButton.setEnabled(false);
-        Button stopButton = findViewById(R.id.stopButton);
+        Button stopButton = (Button) findViewById(R.id.stopButton);
         stopButton.setEnabled(true);
-        Button clearButton = findViewById(R.id.clearButton);
+        Button clearButton = (Button) findViewById(R.id.clearButton);
         clearButton.setEnabled(false);
 
         int frameskip = ((SeekBar)(findViewById(R.id.frameskipSeekBar))).getProgress();
@@ -186,28 +114,25 @@ public class MainActivity extends AppCompatActivity implements SeekBar.OnSeekBar
         this.worker.start();
     }
 
-    /**
-     * Handler function for clicks on the "Stop" button.
-     *
-     * @param view the view the event is generated from
-     */
     public void onStopButtonClick(View view) {
-        Button playButton = findViewById(R.id.playButton);
+        Button playButton = (Button) findViewById(R.id.playButton);
         playButton.setEnabled(true);
-        Button stepButton = findViewById(R.id.stepButton);
+        Button stepButton = (Button) findViewById(R.id.stepButton);
         stepButton.setEnabled(true);
-        Button stopButton = findViewById(R.id.stopButton);
+        Button stopButton = (Button) findViewById(R.id.stopButton);
         stopButton.setEnabled(false);
-        Button clearButton = findViewById(R.id.clearButton);
+        Button clearButton = (Button) findViewById(R.id.clearButton);
         clearButton.setEnabled(true);
 
-        this.stopWorker();
+        this.worker.setStop(true);
+        try {
+            this.worker.join();
+        } catch (InterruptedException ex) {
+
+        }
         this.worker = null;
     }
 
-    /**
-     * Stops the current worker thread.
-     */
     protected void stopWorker() {
         this.worker.setStop(true);
         try {
@@ -217,20 +142,15 @@ public class MainActivity extends AppCompatActivity implements SeekBar.OnSeekBar
         this.worker = null;
     }
 
-    /**
-     * Handler function for clicks on the "Stop" button.
-     *
-     * @param view the view the event is generated from
-     */
     public void onClearButtonClick(View view) {
         if (this.worker != null) { // There was a simulation running
             this.stopWorker();
         }
-        Button playButton = findViewById(R.id.playButton);
+        Button playButton = (Button) findViewById(R.id.playButton);
         playButton.setEnabled(true);
-        Button stepButton = findViewById(R.id.stepButton);
+        Button stepButton = (Button) findViewById(R.id.stepButton);
         stepButton.setEnabled(true);
-        Button stopButton = findViewById(R.id.stopButton);
+        Button stopButton = (Button) findViewById(R.id.stopButton);
         stopButton.setEnabled(false);
         this.updateTrack();
         this.updateStats();
@@ -238,27 +158,23 @@ public class MainActivity extends AppCompatActivity implements SeekBar.OnSeekBar
 
     }
 
-    /**
-     * Creates a new track with the current settings. This methods restarts the simulation it
-     * it was running before.
-     */
     protected void updateTrack() {
         int newTrackLength = ((SeekBar)(findViewById(R.id.trackLengthSeekBar))).getProgress();
-        SeekBar noOfVehiclesSeekBar = findViewById(R.id.noOfVehiclesSeekBar);
+        SeekBar noOfVehiclesSeekBar = (SeekBar)(findViewById(R.id.noOfVehiclesSeekBar));
         int newNoOfVehicles = noOfVehiclesSeekBar.getProgress();
         if (newTrackLength < newNoOfVehicles) { // Dont allow values greater than track length!
-            newNoOfVehicles = newTrackLength;
+            newNoOfVehicles = (int) newTrackLength;
             noOfVehiclesSeekBar.setProgress(newNoOfVehicles);
 
         }
-        TextView noOfVehiclesTextView = findViewById(R.id.noOfVehiclesTextView);
+        TextView noOfVehiclesTextView = (TextView)(findViewById(R.id.noOfVehiclesTextView));
         noOfVehiclesTextView.setText(String.valueOf(newNoOfVehicles));
 
-        TextView trackLengthTextView = findViewById(R.id.trackLengthTextView);
+        TextView trackLengthTextView = (TextView)(findViewById(R.id.trackLengthTextView));
         trackLengthTextView.setText(String.valueOf(newTrackLength));
 
         float newMaxVelocity = ((SeekBar) findViewById(R.id.maxVelocitySeekBar)).getProgress();
-        SeekBar brakeProbabilitySeekBar = findViewById(R.id.brakeProbabilitySeekBar);
+        SeekBar brakeProbabilitySeekBar = (SeekBar) findViewById(R.id.brakeProbabilitySeekBar);
         float newBrakeProb = (float)brakeProbabilitySeekBar.getProgress()
                 / (float)brakeProbabilitySeekBar.getMax();
 
@@ -270,8 +186,7 @@ public class MainActivity extends AppCompatActivity implements SeekBar.OnSeekBar
             this.worker.setStop(true);
             try {
                 this.worker.join();
-            } catch (InterruptedException ex) {
+            } catch (InterruptedException ex) { }
-            }
         }
 
         this.track = new Track(newNoOfVehicles, newTrackLength, newBrakeProb, newMaxVelocity,
@@ -284,34 +199,27 @@ public class MainActivity extends AppCompatActivity implements SeekBar.OnSeekBar
         }
     }
 
-    /**
-     * Handler function for changes on the seek bars.
-     *
-     * @param seekBar  the seek bar changed
-     * @param progress the new progress value of the seek bar
-     * @param fromUser flag if the event is the result of an user action
-     */
     @Override
     public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-        if (seekBar == findViewById(R.id.noOfVehiclesSeekBar)) {
+        if (seekBar == (SeekBar)(findViewById(R.id.noOfVehiclesSeekBar))) {
             this.updateTrack();
-        } else if (seekBar == findViewById(R.id.brakeProbabilitySeekBar)) {
+        } else if (seekBar == (SeekBar)(findViewById(R.id.brakeProbabilitySeekBar))) {
             float newBrakeProb = (float)seekBar.getProgress() / (float)seekBar.getMax();
             this.track.setBrakeProb(newBrakeProb);
-            TextView newBrakeProbTextView = findViewById(R.id.brakeProbTextView);
+            TextView newBrakeProbTextView = (TextView)(findViewById(R.id.brakeProbTextView));
             newBrakeProbTextView.setText(String.valueOf((newBrakeProb)));
-        } else if (seekBar == findViewById(R.id.maxVelocitySeekBar)) {
+        } else if (seekBar == (SeekBar)(findViewById(R.id.maxVelocitySeekBar))) {
             this.track.setMaxVelocity(seekBar.getProgress());
-            TextView tv = findViewById(R.id.maxVeloTextView);
+            TextView tv = (TextView)(findViewById(R.id.maxVeloTextView));
             tv.setText(String.valueOf(progress));
-        } else if (seekBar == findViewById(R.id.trackLengthSeekBar)) {
+        } else if (seekBar == (SeekBar)(findViewById(R.id.trackLengthSeekBar))) {
             this.updateTrack();
-        } else if (seekBar == findViewById(R.id.simDelaySeekBar)) {
+        } else if (seekBar == (SeekBar)(findViewById(R.id.simDelaySeekBar))) {
-            TextView tv = findViewById(R.id.simDelayTextView);
+            TextView tv = (TextView)(findViewById(R.id.simDelayTextView));
             tv.setText(String.valueOf(seekBar.getProgress()));
             this.track.setWaitTime(seekBar.getProgress());
-        } else if (seekBar == findViewById(R.id.frameskipSeekBar)) {
+        } else if (seekBar == (SeekBar)(findViewById(R.id.frameskipSeekBar))) {
-            TextView tv = findViewById(R.id.frameSkipTextView);
+            TextView tv = (TextView)(findViewById(R.id.frameSkipTextView));
             tv.setText(String.valueOf(seekBar.getProgress()));
             if (this.worker != null) {
                 this.worker.setFrameskip(seekBar.getProgress());
@@ -319,21 +227,11 @@ public class MainActivity extends AppCompatActivity implements SeekBar.OnSeekBar
         }
     }
 
-    /**
-     * Handler function for beginning touch events on a seek bar.
-     *
-     * @param seekBar the seek bar touched
-     */
     @Override
     public void onStartTrackingTouch(SeekBar seekBar) {
 
     }
 
-    /**
-     * Handler function for ending touch events on a seek bar.
-     *
-     * @param seekBar the seek bar touched
-     */
     @Override
     public void onStopTrackingTouch(SeekBar seekBar) {
 

app/src/main/java/de/hems/trafficsim/Renderer.java

@@ -9,73 +9,25 @@ import android.view.SurfaceHolder;
 import java.util.ConcurrentModificationException;
 import java.util.List;
 
-/**
- * User interface class rendering the track history on a SurfaceView.
- */
 public class Renderer {
-    /**
-     * the track to render
-     */
-    protected Track track;
-    /**
-     * width of a rectangle representing one vehicle
-     */
-    protected int pixelPerVehicle;
-    /**
-     * height of a rectangle representing one vehicle
-     */
-    protected int pixelPerLine;
-    /**
-     * amount of pixels per track position which are lost by rounding
-     */
-    protected float tooShortPerTrackLength;
-    /**
-     * amount of pixels per height which are lost by rounding
-     */
-    protected float tooShortPerHeight;
-    /**
-     * Paint instance of the renderer
-     */
-    protected Paint paint;
-    /**
-     * holder of the surface the renderer draws to
-     */
-    protected SurfaceHolder holder;
-    /**
-     * width of the surface to draw to
-     */
-    protected int width;
-    /**
-     * height of the surface to draw to
-     */
-    protected int height;
-    /**
-     * temporary reference to the time records of one simulation step
-     */
     private List<VehicleTimeRecord> stepRecords;
-    /**
+    protected Track track;
-     * temporary reference to the canvas to draw to
+    protected int pixelPerVehicle;
-     */
+    protected int pixelPerLine;
-    private Canvas canvas;
+    protected float tooShortPerTrackLength;
+    protected float tooShortPerHeight;
+    protected Paint paint;
+    protected SurfaceHolder holder;
+    protected Canvas canvas;
+    protected int width;
+    protected int height;
 
-    /**
-     * Constuctor for a Renderer.
-     *
-     * @param track  the track to render
-     * @param holder the holder of the surface to draw to
-     */
     public Renderer(Track track, SurfaceHolder holder) {
         this.track = track;
         this.holder = holder;
         this.paint = new Paint();
     }
 
-    /**
-     * Updates the dimension information of the renderer.
-     *
-     * @param width  the width of the SurfaceView
-     * @param height the height of the SurfaceView
-     */
     public void setSize(int width, int height) {
         if (width > 0 && height > 0) {
             this.pixelPerVehicle = width / (int) this.track.getTrackLength();
@@ -91,24 +43,11 @@ public class Renderer {
         }
     }
 
-    /**
-     * Updates the track of the Surface.
-     *
-     * @param track the new track to render
-     */
     public void setTrack(Track track) {
         this.track = track;
         this.setSize(width, height);
     }
 
-    /**
-     * Utility function which calculates a color from the relation between the current speed of a
-     * vehicle and it's maximum speed (from red over yellow to green).
-     *
-     * @param curVelocity current velocity of the vehicle
-     * @param maxVelocity maximum velocity of the vehilce
-     * @return color encoded as Android color integer
-     */
     protected int getColor(float curVelocity, float maxVelocity) {
         float perc = curVelocity / maxVelocity;
         perc = 1 - perc;
@@ -125,9 +64,6 @@ public class Renderer {
         }
     }
 
-    /**
-     * Draws the current state of the track history to the Surface.
-     */
     protected void draw() {
         try {
             if (this.pixelPerVehicle == 0) {

app/src/main/java/de/hems/trafficsim/TimeRecordView.java

@@ -1,26 +1,24 @@
 package de.hems.trafficsim;
 
+import android.app.ActionBar;
 import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.text.Layout;
 import android.view.SurfaceView;
+import android.view.View;
 import android.view.ViewGroup;
 
-/**
+import java.util.ConcurrentModificationException;
- * A Surface View which servers as a stage for a renderer.
+import java.util.List;
- */
+
 public class TimeRecordView extends SurfaceView {
     public TimeRecordView(Context context, Track track) {
         super(context);
         this.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
     }
 
-    /**
-     * Updates the size information of the SurfaceView, used by the Android SDK.
-     *
-     * @param w    new width
-     * @param h    new height
-     * @param oldw old width
-     * @param oldh old height
-     */
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);

app/src/main/java/de/hems/trafficsim/Track.java

@@ -5,92 +5,42 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Observable;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.locks.LockSupport;
 
-/**
- * Main model class of TrafficSim. Represents a round course containing vehicles.
- */
 public class Track extends Observable {
-    /**
-     * list a vehicles on the track
-     */
     protected List<Vehicle> vehicles;
-
-    /**
-     * list of resulting time records of the simulation
-     */
     protected List<List<VehicleTimeRecord>> vtrList;
-
-    /**
-     * length of the track
-     */
     protected float trackLength;
-
-    /**
-     * sum of all vehicle speeds during the simulation, used for average calculation
-     */
     protected float sumAvgMemory;
-
-    /**
-     * sum of all vehicle speeds during the simulation ignoring the first ten steps,
-     * used for average calculation
-     */
     protected float sumDelAvgMemory;
-
-    /**
-     * length of the history kept
-     */
     protected int historyLength;
-
-    /**
-     * average over all velocities in the simulation
-     */
     protected float overallAvg;
-
-    /**
-     * average over all velocities in the simulation, ignoring the first ten steps
-     */
     protected float delayedAvg;
-
-    /**
-     * average over all velocities in the last step
-     */
     protected float lastAvg;
-
-    /**
-     * current configured wait time between two simulation steps
-     */
     protected int waitTime;
-
-    /**
-     * currently configured max velocity for all vehicles
-     */
     protected float maxVelocity;
-
-    /**
-     * currently configured brake probability for all vehicles
-     */
     protected float brakeProb;
-
-    /**
-     * counter for executed simulation steps
-     */
     protected long steps;
-
-    /**
-     * semaphore protecting the vtrlist
-     */
     protected Semaphore listSemaphore;
 
-    /**
+    public List<List<VehicleTimeRecord>> getVtrList() { return vtrList; }
-     * Constructor for a new Track.
+    public float getOverallAvg() {
-     *
+        return overallAvg;
-     * @param numberVehicles number of vehicles on the Track
+    }
-     * @param trackLength    length of the new Track
+    public float getLastAvg() {
-     * @param brakeProb      probability of a vehicle to suddenly brake without reason
+        return lastAvg;
-     * @param maxVelocity    maxmimum velocity of the vehicles
+    }
-     * @param waitTime       time between two simulation steps to slow down the simulation artificially
+    public float getDelayedAvg() { return delayedAvg; }
-     * @param historyLength  length of the history to keep
+    public List<Vehicle> getVehicles() {
-     */
+        return vehicles;
+    }
+    public float getTrackLength() {
+        return trackLength;
+    }
+    public long getSteps() { return steps; }
+    public Semaphore getListSemaphore() { return listSemaphore; }
+    public int getHistoryLength() { return historyLength; }
+
     public Track(int numberVehicles, float trackLength, float brakeProb, float maxVelocity, int waitTime, int historyLength) {
         this.trackLength = trackLength;
         this.brakeProb = brakeProb;
@@ -109,93 +59,6 @@ public class Track extends Observable {
 
     }
 
-    /**
-     * Getter for vtrList
-     *
-     * @return vtrList
-     */
-    public List<List<VehicleTimeRecord>> getVtrList() {
-        return vtrList;
-    }
-
-    /**
-     * Getter for overallAvg
-     *
-     * @return overallAvg
-     */
-    public float getOverallAvg() {
-        return overallAvg;
-    }
-
-    /**
-     * Getter for lastAvg
-     *
-     * @return lastAvg
-     */
-    public float getLastAvg() {
-        return lastAvg;
-    }
-
-    /**
-     * Getter for delayedAvg
-     *
-     * @return delayedAvg
-     */
-    public float getDelayedAvg() {
-        return delayedAvg;
-    }
-
-    /**
-     * Getter for vehicles
-     *
-     * @return vehicles
-     */
-    public List<Vehicle> getVehicles() {
-        return vehicles;
-    }
-
-    /**
-     * Getter for trackLength
-     *
-     * @return trackLength
-     */
-    public float getTrackLength() {
-        return trackLength;
-    }
-
-    /**
-     * Getter for steps
-     *
-     * @return steps
-     */
-    public long getSteps() {
-        return steps;
-    }
-
-    /**
-     * Getter for listSemaphore
-     *
-     * @return listSemaphore
-     */
-    public Semaphore getListSemaphore() {
-        return listSemaphore;
-    }
-
-    /**
-     * Getter for historyLength
-     *
-     * @return historyLength
-     */
-    public int getHistoryLength() {
-        return historyLength;
-    }
-
-    /**
-     * Utility function to add vehicles to the Track.
-     *
-     * @param numberVehicles number of vehicles to add
-     * @return filled list with vehicles
-     */
     protected List<Vehicle> createVehiclesList(int numberVehicles){
         List<Vehicle> result = new ArrayList<>();
         for(int i=0;i<numberVehicles;i++){
@@ -206,40 +69,22 @@ public class Track extends Observable {
         return result;
     }
 
-    /**
-     * Update the wait time of the simulation.
-     *
-     * @param waitTime new wait time in ms
-     */
     public void setWaitTime(int waitTime) {
         this.waitTime = waitTime;
     }
 
-    /**
-     * Update the brake probability of all vehicles.
-     *
-     * @param brakeProb new brake probability
-     */
     public void setBrakeProb(float brakeProb) {
         for (Vehicle v : this.vehicles) {
             v.setBrakeProb(brakeProb);
         }
     }
 
-    /**
-     * Update the maximum velocity of all vehicles.
-     *
-     * @param maxVelocity new maximum velocity
-     */
     public void setMaxVelocity(float maxVelocity) {
         for (Vehicle v : this.vehicles) {
             v.setMaxVelocity(maxVelocity);
         }
     }
 
-    /**
-     * Calculates on simulation step ahead and then waits for the configured wait time.
-     */
     public void timeElapse() {
         for(int i=0; i<vehicles.size();i++) {
             Vehicle v = vehicles.get(i);
@@ -272,18 +117,15 @@ public class Track extends Observable {
         this.listSemaphore.release();
 
         update_avg();
+        this.setChanged();
+        //this.notifyObservers();
+        this.clearChanged();
+        //LockSupport.parkNanos(1);
         try  {
             Thread.sleep(waitTime);
-        } catch (InterruptedException ex) {
+        } catch (InterruptedException ex) { }
-        }
     }
 
-    /**
-     * Returns the average velocity of the given simulation step.
-     *
-     * @param step index of the step in the history list
-     * @return average velocity
-     */
     public float avg_step(int step){
         float sum_step = 0;
         for (VehicleTimeRecord r : vtrList.get(step)) {
@@ -292,10 +134,6 @@ public class Track extends Observable {
         return sum_step / vehicles.size();
     }
 
-    /**
-     * Utility function which updates the averages values with the results from the last simulation
-     * step.
-     */
     protected void update_avg(){
         lastAvg = avg_step(vtrList.size()-1);
         if (this.steps > 10) {
@@ -306,4 +144,13 @@ public class Track extends Observable {
         overallAvg = sumAvgMemory / this.steps;
 
     }
+
+    public float avg_span(int start, int end){
+        float sum_span = 0;
+        for (int i=start; i <end;i++){
+            sum_span += avg_step(i);
+        }
+        return sum_span / (end-start+1);
+    }
+
 }

app/src/main/java/de/hems/trafficsim/Vehicle.java

@@ -2,49 +2,15 @@ package de.hems.trafficsim;
 
 import java.util.Random;
 
-/**
- * Model class which represents a vehicle in the simulation.
- */
 public class Vehicle {
-    /**
-     * a number to index the vehicle
-     */
     protected int id;
-
-    /**
-     * current position of the vehicle on the track
-     */
     protected float position;
-
-    /**
-     * current velocity of the vehicle
-     */
     protected float curVelocity;
-
-    /**
-     * maximum velocity of the vehicle
-     */
     protected float maxVelocity;
-
-    /**
-     * probability of the vehicle to brake without reason
-     */
     protected float brakeProb;
-
-    /**
-     * length of the track the vehicle is placed on
-     */
     protected float trackLength;
 
-    /**
+
-     * Constructs a new vehicle.
-     *
-     * @param id          a number to index the vehicle
-     * @param position    current position of the vehicle on the track
-     * @param maxVelocity maximum velocity of the vehicle
-     * @param brakeProb   probability of the vehicle to brake without reason
-     * @param trackLength length of the track the vehicle is placed on
-     */
     public Vehicle(int id, int position, float maxVelocity, float brakeProb, float trackLength) {
         this.id = id;
         this.position = position;
@@ -55,61 +21,22 @@ public class Vehicle {
 
     }
 
-    /**
-     * Getter for position
-     *
-     * @return position
-     */
     public float getPosition() {
         return position;
     }
 
-    /**
-     * Getter for curVelocity
-     *
-     * @return curVelocity
-     */
     public float getCurVelocity() {
         return curVelocity;
     }
 
-    /**
-     * Getter for maxVelocity
-     *
-     * @return maxVelocity
-     */
     public float getMaxVelocity() {
         return maxVelocity;
     }
 
-    /**
+    public void setBrakeProb(float brakeProb) { this.brakeProb = brakeProb; }
-     * Setter for maxVelocity
-     *
-     * @return maxVelocity
-     */
-    public void setMaxVelocity(float maxVelocity) {
-        this.maxVelocity = maxVelocity;
-    }
 
-    /**
+    public void setMaxVelocity(float maxVelocity) { this.maxVelocity = maxVelocity; }
-     * Setter for brakeProb
-     *
-     * @return brakeProb
-     */
-    public void setBrakeProb(float brakeProb) {
-        this.brakeProb = brakeProb;
-    }
 
-    /**
-     * Calculates the new velocity of the vehicle based on the following rules:
-     * <ol>
-     *     <li>Increase by one if the vehicle is slower than it's maximum speed</li>
-     *     <li>Random brake by one</li>
-     *     <li>Break if the distance to the forerunner is less than it's speed</li>
-     * </ol>
-     *
-     * @param distanceForerunner distance to the forerunner of the vehicle
-     */
     public void updateVelocity(float distanceForerunner) {
         Random random = new Random();
 
@@ -126,9 +53,6 @@ public class Vehicle {
         }
     }
 
-    /**
-     * Updates the position of the vehicle according to it's previously calculated speed.
-     */
     public void timeElapse() {
         position = (position + curVelocity) % this.trackLength;
     }

app/src/main/java/de/hems/trafficsim/VehicleTimeRecord.java

@@ -1,27 +1,9 @@
 package de.hems.trafficsim;
 
-/**
- * Model class which keeps the previous simulation data for analysis.
- */
 public class VehicleTimeRecord {
-    /**
-     * the id of the vehicle it belongs to
-     */
     protected int id;
-
-    /**
-     * the position of the vehicle after the last simulation step
-     */
     protected float position;
-
-    /**
-     * the velocity of the vehicle during the last simulation step
-     */
     protected float velocity;
-
-    /**
-     * the maximum velocity of the vehicle
-     */
     protected float maxVelocity;
 
     public float getMaxVelocity() {
@@ -36,14 +18,6 @@ public class VehicleTimeRecord {
         return velocity;
     }
 
-    /**
-     * Construct a new VehicleTimeRecord.
-     *
-     * @param id          the id of the vehicle it belongs to
-     * @param position    the position of the vehicle after the last simulation step
-     * @param velocity    the velocity of the vehicle during the last simulation step
-     * @param maxVelocity the maximum velocity of the vehicle
-     */
     public VehicleTimeRecord(int id, float position, float velocity, float maxVelocity) {
         this.id = id;
         this.position = position;

app/src/main/java/de/hems/trafficsim/Worker.java

@@ -1,46 +1,17 @@
 package de.hems.trafficsim;
 
 import android.graphics.Canvas;
+import android.view.SurfaceHolder;
+
+import java.util.ConcurrentModificationException;
 
-/**
- * Calculation thread, which runs the simulation itself and also updates the view with a set rate.
- */
 public class Worker extends Thread {
-    /**
-     * the track to simulate
-     */
     protected Track track;
-
-    /**
-     * Stop flag, indicating that the worker shall stop
-     */
     protected boolean stop;
-
-    /**
-     * the MainActivity of the gui
-     */
     protected MainActivity gui;
-
-    /**
-     * the Renderer drawing the Track
-     */
     protected Renderer renderer;
-
-    /**
-     * Amount of simulation steps between two frames in the view. Zero means
-     * that every simulation step is drawn.
-     */
     protected int frameskip;
 
-    /**
-     * Construct a new worker.
-     *
-     * @param track     the track to simulate
-     * @param gui       the MainActivity of the gui
-     * @param renderer  the Renderer drawing the Track
-     * @param frameskip Amount of simulation steps between two frames in the view. Zero means
-     *                  that every simulation step is drawn
-     */
     public Worker(Track track, MainActivity gui, Renderer renderer, int frameskip) {
         super();
         this.track = track;
@@ -50,28 +21,16 @@ public class Worker extends Thread {
         this.frameskip = frameskip;
     }
 
-    /**
-     * Sets a flag that causes the worker to stop.
-     *
-     * @param stop flag whether the thread shall stop
-     */
     public void setStop(boolean stop) {
         this.stop = stop;
     }
 
-    /**
-     * Updates the amount of simulation steps between to view frames.
-     *
-     * @param frames amount of steps
-     */
     public void setFrameskip(int frames) {
         this.frameskip = frames;
     }
 
-    /**
+    public int getFrameskip() { return this.frameskip; }
-     * Method which is automatically executed when the thread is started. It alternates between
+
-     * updating the simulation and drawing a new frame in the view.
-     */
     @Override
     public void run() {
         Canvas canvas = null;

app/src/test/java/de/hems/trafficsim/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package de.hems.trafficsim;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}