Merge remote-tracking branch 'origin/jz/master-levent-goergue' into jz/bachelor-henry-kalff

pom.xml

@@ -101,25 +101,34 @@
 	</repositories>
 	
 	<dependencies> 
+		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
 		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>18.0</version>
+		    <groupId>com.google.guava</groupId>
+		    <artifactId>guava</artifactId>
+		    <version>31.1-jre</version>
 		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
 		<dependency>
 		    <groupId>javax.xml.bind</groupId>
 		    <artifactId>jaxb-api</artifactId>
 		    <version>2.3.1</version>
 		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/gov.nist.math/jama -->
+		<!-- Usage: TemporalDependencyMatrix -->
 		<dependency>
 			<groupId>gov.nist.math</groupId>
 			<artifactId>jama</artifactId>
 			<version>1.0.3</version>
 		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-math3 -->
 	  	<dependency>
 	  		<groupId>org.apache.commons</groupId>
 	  		<artifactId>commons-math3</artifactId>
 	  		<version>3.6.1</version>
 	  	</dependency>
+	  	
   	</dependencies>
 </project>

src/de/tudarmstadt/maki/simonstrator/api/uavsupport/communication/BaseToUAVInterface.java

@@ -32,7 +32,11 @@ import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.Location;
  * Interface simulating direct hardware connection from Base to UAVs.
  * 
  * @author Julian Zobel
- *
+ * 
+ * @param <T>
+ *            Type of data messages in the DTN
+ * @param <S>
+ *            Type of monitoring information from monitoring
  */
 public interface BaseToUAVInterface<T extends OverlayMessage, S extends Location> {
 	/**

src/de/tudarmstadt/maki/simonstrator/api/uavsupport/communication/UAVToBaseInterface.java

@@ -7,6 +7,18 @@ import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.Location;
 import de.tudarmstadt.maki.simonstrator.api.uavsupport.Actuator;
 import de.tudarmstadt.maki.simonstrator.api.uavsupport.strategy.UAVStrategy;
 
+/**
+ * UAV-Side: Direct communication/interaction interface between UAV and Base
+ * Station when the UAV is landed.
+ * 
+ * 
+ * @author Julian Zobel
+ *
+ * @param <T>
+ *            Type of data messages in the DTN
+ * @param <S>
+ *            Type of monitoring information from monitoring
+ */
 public interface UAVToBaseInterface<T extends OverlayMessage, S extends Location> {
 
 	public void connectToBase(BaseToUAVInterface<T, S> base);