Fix Detected Object class (#178)

<!-- Thanks for the contribution, this is awesome. -->

# PR Details
## Description
Fix Detected Object class to include timestamp
<!--- Describe your changes in detail -->

## Related GitHub Issue

<!--- This project only accepts pull requests related to open GitHub
issues or Jira Keys -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please DO NOT name partially fixed issues, instead open an issue
specific to this fix -->
<!--- Please link to the issue here: -->

## Related Jira Key
[CDAR-446
](https://usdot-carma.atlassian.net/browse/CDAR-446)<!-- e.g. CAR-123
-->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?
Unit testing 
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [x] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [x] I have read the
[**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md)
document.
- [ ] I have added tests to cover my changes.
- [x] All new and existing tests passed.

co-simulation/fed/mosaic-carla/src/test/java/org/eclipse/mosaic/fed/carla/ambassador/CarlaAmbassadorTest.java

@@ -137,7 +137,8 @@ public void processTimeAdvanceGrant() throws InternalFederateException, NoSuchFi
                 CartesianPoint.xyz(-1.1, -2, -3.2),
                 new Vector3d(1, 1, 1),
                 new Vector3d(.1, .2, .3),
-                new Size(2, 1, .5));
+                new Size(2, 1, .5),
+                100);
         Double[][] covarianceMatrix =  { {1.0, 0.0, 0.0} , {1.0, 0.0, 0.0} , {1.0, 0.0, 0.0}};
         predictedCar.setPositionCovariance(covarianceMatrix);
         predictedCar.setVelocityCovariance(covarianceMatrix);
@@ -151,7 +152,8 @@ public void processTimeAdvanceGrant() throws InternalFederateException, NoSuchFi
             CartesianPoint.xyz(1.1, 2, 3.2),
             new Vector3d(0, 0, 0),
             new Vector3d(),
-            new Size(0, 0, 0));
+            new Size(0, 0, 0),
+            100);
         Double[][] bus_covarianceMatrix =  { {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0}};
         predictedBus.setPositionCovariance(bus_covarianceMatrix);
         predictedBus.setVelocityCovariance(bus_covarianceMatrix);

co-simulation/fed/mosaic-carla/src/test/java/org/eclipse/mosaic/fed/carla/carlaconnect/CarlaXmlRpcClientTest.java

@@ -108,7 +108,8 @@ public void testGetDetectedObjects() throws XmlRpcException {
                 + "\"length\":2.0,"
                 + "\"height\":1.0,"
                 + "\"width\":0.5"
-                + "}"
+                + "},"
+                + "\"timestamp\":100"
                 + "},"
                 + "{"
                 + "\"type\":\"BUS\","
@@ -142,7 +143,8 @@ public void testGetDetectedObjects() throws XmlRpcException {
                 + "\"length\":0.0,"
                 + "\"height\":0.0,"
                 + "\"width\":0.0"
-                + "}"
+                + "},"
+                + "\"timestamp\":100"
                 + "}"
                 + "]";
         // Create request params
@@ -165,7 +167,8 @@ public void testGetDetectedObjects() throws XmlRpcException {
                 CartesianPoint.xyz(-1.1, -2, -3.2),
                 new Vector3d(1, 1, 1),
                 new Vector3d(.1, .2, .3),
-                new Size(2, 1, .5));
+                new Size(2, 1, .5),
+                100);
         Double[][] covarianceMatrix =  { {1.0, 0.0, 0.0} , {1.0, 0.0, 0.0} , {1.0, 0.0, 0.0}};
         predictedCar.setPositionCovariance(covarianceMatrix);
         predictedCar.setVelocityCovariance(covarianceMatrix);
@@ -181,7 +184,8 @@ public void testGetDetectedObjects() throws XmlRpcException {
             CartesianPoint.xyz(1.1, 2, 3.2),
             new Vector3d(0, 0, 0),
             new Vector3d(),
-            new Size(0, 0, 0));
+            new Size(0, 0, 0),
+            100);
         Double[][] bus_covarianceMatrix =  { {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0}};
         predictedBus.setPositionCovariance(bus_covarianceMatrix);
         predictedBus.setVelocityCovariance(bus_covarianceMatrix);

co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstanceManagerTest.java

@@ -132,7 +132,8 @@ public void testOnDetectedObject() throws IOException{
                 CartesianPoint.xyz(1.1, 2, 3.2),
                 new Vector3d(2, 3, 4),
                 new Vector3d(-4.4,-5.5,-6.6),
-                new Size(3, 4, 5));
+                new Size(3, 4, 5),
+                100);
         Double[][] covarianceMatrix =  { {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0}};
         detectedObject1.setPositionCovariance(covarianceMatrix);
         detectedObject1.setVelocityCovariance(covarianceMatrix);
@@ -152,7 +153,8 @@ public void testOnDetectedObject() throws IOException{
                 CartesianPoint.xyz(1.1, 2, 3.2),
                 new Vector3d(2, 3, 4),
                 new Vector3d(-4.4,-5.5,-6.6),
-                new Size(3, 4, 5));
+                new Size(3, 4, 5),
+                100);
         detectedObject2.setPositionCovariance(covarianceMatrix);
         detectedObject2.setVelocityCovariance(covarianceMatrix);
         detectedObject2.setAngularVelocityCovariance(covarianceMatrix);

co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstanceTest.java

@@ -186,7 +186,8 @@ public void testSendInteraction() throws IOException {
                 CartesianPoint.xyz(1.1, 2, 3.2),
                 new Vector3d(0, 0, 0),
                 new Vector3d(),
-                new Size(0, 0, 0));
+                new Size(0, 0, 0),
+                100);
         Double[][] covarianceMatrix =  { {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0}};
         test_msg.setPositionCovariance(covarianceMatrix);
         test_msg.setVelocityCovariance(covarianceMatrix);

co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureMessageAmbassadorTest.java

@@ -194,7 +194,8 @@ public void testProcessInteraction() throws InternalFederateException{
                 CartesianPoint.xyz(1.1, 2, 3.2),
                 new Vector3d(2, 3, 4),
                 new Vector3d(-4.4,-5.5,-6.6),
-                new Size(3, 4, 5));
+                new Size(3, 4, 5),
+                100);
         Double[][] covarianceMatrix =  { {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0}};
         detectedObject.setPositionCovariance(covarianceMatrix);
         detectedObject.setVelocityCovariance(covarianceMatrix);

co-simulation/lib/mosaic-interactions/src/test/java/org/eclipse/mosaic/interactions/detector/DetectedObjectInteractionTest.java

@@ -45,7 +45,8 @@ public void testGetterSetterConstructor() {
                 CartesianPoint.xyz(-1.1, -2, -3.2),
                 new Vector3d(1, 1, 1),
                 new Vector3d(.1, .2, .3),
-                new Size(2, 1, .5));
+                new Size(2, 1, .5),
+                100);
         Double[][] covarianceMatrix =  { {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0}};
         detectedObject.setPositionCovariance(covarianceMatrix);
         detectedObject.setVelocityCovariance(covarianceMatrix);

co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/DetectedObject.java

@@ -48,6 +48,8 @@ public final class DetectedObject implements Serializable {
     private Double[][] angularVelocityCovariance = new Double[3][3];
 
     private Size size;
+
+    private int timestamp;
     /**
      * Constructor for Detected Object information.
      * 
@@ -66,7 +68,7 @@ public final class DetectedObject implements Serializable {
      * @param size              size of object including height,width and length.
      */
     public DetectedObject(DetectionType type, double confidence, String sensorId, String projString, String objectId,
-            CartesianPoint position, Vector3d velocity, Vector3d angularVelocity, Size size) {
+            CartesianPoint position, Vector3d velocity, Vector3d angularVelocity, Size size, int timestamp) {
         this.type = type;
         this.confidence = confidence;
         this.sensorId = sensorId;
@@ -76,6 +78,7 @@ public DetectedObject(DetectionType type, double confidence, String sensorId, St
         this.velocity = velocity;
         this.angularVelocity = angularVelocity;
         this.size = size;
+        this.timestamp = timestamp;
     }
 
     /**
@@ -248,6 +251,14 @@ public void setSize(Size size) {
         this.size = size;
     }
 
+    public int getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(int timestamp) {
+        this.timestamp = timestamp;
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -266,6 +277,7 @@ public int hashCode() {
         result = prime * result + ((angularVelocity == null) ? 0 : angularVelocity.hashCode());
         result = prime * result + Arrays.deepHashCode(angularVelocityCovariance);
         result = prime * result + ((size == null) ? 0 : size.hashCode());
+        result = prime * result + timestamp;
         return result;
     }
 
@@ -323,9 +335,7 @@ public boolean equals(Object obj) {
                 return false;
         } else if (!size.equals(other.size))
             return false;
+        if (timestamp != other.timestamp)
+            return false;
         return true;
-    }
-
-
-
-}
+    }}

co-simulation/lib/mosaic-objects/src/test/java/org/eclipse/mosaic/lib/objects/detector/DetectedObjectTest.java

@@ -44,7 +44,8 @@ public void testDetectObjectJsonSerialization() {
                 CartesianPoint.xyz(1.1, 2, 3.2),
                 new Vector3d(0, 0, 0),
                 new Vector3d(),
-                new Size(0, 0, 0));
+                new Size(0, 0, 0),
+                100);
         Double[][] covarianceMatrix =  { {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0}};
         detectedObject.setPositionCovariance(covarianceMatrix);
         detectedObject.setVelocityCovariance(covarianceMatrix);
@@ -83,11 +84,10 @@ public void testDetectObjectJsonSerialization() {
                 + "\"length\":0.0,"
                 + "\"height\":0.0,"
                 + "\"width\":0.0"
-                + "}"
+                + "},"
+                + "\"timestamp\":100"
                 + "}";
-        assertEquals(json,
-                json_prediction);
-        System.out.println(json);
+        assertEquals(json_prediction,json);
     }
 
     @Test
@@ -125,7 +125,8 @@ public void testDetectObjectJsonDeserialization() {
                 + "\"length\":2.0,"
                 + "\"height\":1.0,"
                 + "\"width\":0.5"
-                + "}"
+                + "},"
+                + "\"timestamp\":100"
                 + "}";
 
         DetectedObject detectedObject = gson.fromJson(json, DetectedObject.class);
@@ -138,7 +139,8 @@ public void testDetectObjectJsonDeserialization() {
                 CartesianPoint.xyz(-1.1, -2, -3.2),
                 new Vector3d(1, 1, 1),
                 new Vector3d(.1, .2, .3),
-                new Size(2, 1, .5));
+                new Size(2, 1, .5),
+                100);
         Double[][] covarianceMatrix =  { {1.0, 0.0, 0.0} , {1.0, 0.0, 0.0} , {1.0, 0.0, 0.0}};
         predictedDetectedObject.setPositionCovariance(covarianceMatrix);
         predictedDetectedObject.setVelocityCovariance(covarianceMatrix);
@@ -159,7 +161,8 @@ public void testGetterSetterConstructor() {
                 CartesianPoint.xyz(1.1, 2, 3.2),
                 new Vector3d(2, 3, 4),
                 new Vector3d(-4.4,-5.5,-6.6),
-                new Size(3, 4, 5));
+                new Size(3, 4, 5),
+                0);
         Double[][] covarianceMatrix =  { {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0}};
         detectedObject.setPositionCovariance(covarianceMatrix);
         detectedObject.setVelocityCovariance(covarianceMatrix);
@@ -192,7 +195,8 @@ public void testEquals() {
                 CartesianPoint.xyz(1.1, 2, 3.2),
                 new Vector3d(2, 3, 4),
                 new Vector3d(-4.4,-5.5,-6.6),
-                new Size(3, 4, 5));
+                new Size(3, 4, 5),
+                100);
         Double[][] covarianceMatrix =  { {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0} , {0.0, 0.0, 0.0}};
         detectedObject.setPositionCovariance(covarianceMatrix);
         detectedObject.setVelocityCovariance(covarianceMatrix);
@@ -207,7 +211,8 @@ public void testEquals() {
                 null,
                 null,
                 null,
-                null);
+                null,
+                100);
         DetectedObject detectedObject2 = new DetectedObject(
                 null,
                 0.6,
@@ -217,7 +222,8 @@ public void testEquals() {
                 null,
                 null,
                 null,
-                null);
+                null,
+                100);
 
         assertNotEquals(detectedObject1, detectedObject);
         assertEquals(detectedObject2, detectedObject1);