diff --git a/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstance.java b/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstance.java index 4ab09909..59ae919f 100644 --- a/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstance.java +++ b/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstance.java @@ -22,8 +22,8 @@ import java.net.InetAddress; import java.util.List; -import org.eclipse.mosaic.interactions.sensor.Sensor; import org.eclipse.mosaic.lib.geo.CartesianPoint; +import org.eclipse.mosaic.lib.objects.detector.Detector; /** * InfrastructureInstance class represents a physical instance of an @@ -40,7 +40,7 @@ public class InfrastructureInstance { private int simulatedInteractionPort; private CartesianPoint location = null; private DatagramSocket rxMsgsSocket = null; - private List sensors; + private List sensors; /** * Constructor for InfrastructureInstance @@ -55,7 +55,7 @@ public class InfrastructureInstance { * simulated environment */ public InfrastructureInstance(String infrastructureId, InetAddress targetAddress, int rxMessagePort, - int timeSyncPort, int simulatedInteractionPort, CartesianPoint location, List sensors) { + int timeSyncPort, int simulatedInteractionPort, CartesianPoint location, List sensors) { this.infrastructureId = infrastructureId; this.targetAddress = targetAddress; this.rxMessagePort = rxMessagePort; @@ -158,7 +158,7 @@ public void setTimeSyncPort(int timeSyncPort) { } public boolean containsSensor(String sensorId) { - for (Sensor sensor : sensors) { + for (Detector sensor : sensors) { if (sensor.getSensorId().equals(sensorId) ) { return true; } diff --git a/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstanceManager.java b/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstanceManager.java index d2ca62e8..8170cd08 100644 --- a/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstanceManager.java +++ b/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstanceManager.java @@ -24,12 +24,12 @@ import java.util.Map; import org.eclipse.mosaic.interactions.communication.V2xMessageTransmission; -import org.eclipse.mosaic.interactions.sensor.DetectedObject; -import org.eclipse.mosaic.interactions.sensor.Sensor; import org.eclipse.mosaic.lib.enums.AdHocChannel; import org.eclipse.mosaic.lib.geo.CartesianPoint; import org.eclipse.mosaic.lib.geo.GeoCircle; import org.eclipse.mosaic.lib.objects.addressing.AdHocMessageRoutingBuilder; +import org.eclipse.mosaic.lib.objects.detector.DetectedObject; +import org.eclipse.mosaic.lib.objects.detector.Detector; import org.eclipse.mosaic.lib.objects.v2x.ExternalV2xContent; import org.eclipse.mosaic.lib.objects.v2x.ExternalV2xMessage; import org.eclipse.mosaic.lib.objects.v2x.MessageRouting; @@ -101,7 +101,7 @@ public void onNewRegistration(InfrastructureRegistrationMessage registration) { * */ private void newInfrastructureInstance(String infrastructureId, InetAddress rxMessageIpAddress, int rxMessagePort, - int timeSyncPort, int simulatedInteractionPort, CartesianPoint location, List sensors) { + int timeSyncPort, int simulatedInteractionPort, CartesianPoint location, List sensors) { InfrastructureInstance tmp = new InfrastructureInstance(infrastructureId, rxMessageIpAddress, rxMessagePort, timeSyncPort, simulatedInteractionPort, location, sensors); try { diff --git a/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureMessageAmbassador.java b/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureMessageAmbassador.java index 39d00d90..5ab705ab 100644 --- a/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureMessageAmbassador.java +++ b/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureMessageAmbassador.java @@ -31,16 +31,16 @@ import org.eclipse.mosaic.interactions.communication.AdHocCommunicationConfiguration; import org.eclipse.mosaic.interactions.communication.V2xMessageReception; import org.eclipse.mosaic.interactions.communication.V2xMessageTransmission; +import org.eclipse.mosaic.interactions.detector.DetectedObjectInteraction; +import org.eclipse.mosaic.interactions.detector.DetectorRegistration; import org.eclipse.mosaic.interactions.mapping.RsuRegistration; -import org.eclipse.mosaic.interactions.sensor.DetectedObjectInteraction; -import org.eclipse.mosaic.interactions.sensor.Sensor; -import org.eclipse.mosaic.interactions.sensor.SensorRegistration; import org.eclipse.mosaic.lib.enums.AdHocChannel; import org.eclipse.mosaic.lib.geo.GeoPoint; import org.eclipse.mosaic.lib.misc.Tuple; import org.eclipse.mosaic.lib.objects.addressing.IpResolver; import org.eclipse.mosaic.lib.objects.communication.AdHocConfiguration; import org.eclipse.mosaic.lib.objects.communication.InterfaceConfiguration; +import org.eclipse.mosaic.lib.objects.detector.Detector; import org.eclipse.mosaic.lib.objects.v2x.ExternalV2xMessage; import org.eclipse.mosaic.lib.objects.v2x.V2xMessage; import org.eclipse.mosaic.lib.util.objects.ObjectInstantiation; @@ -298,9 +298,9 @@ public synchronized void processTimeAdvanceGrant(long time) throws InternalFeder log.info("RSU Registration for "+ reg.getInfrastructureId() + " @ x, y, z: (" + reg.getLocation().getX() + ", " + reg.getLocation().getY() + ", " + reg.getLocation().getZ() + ")"); onDsrcRegistrationRequest(reg.getInfrastructureId()); log.debug("Sending SensorRegistration interactions for sensor : {}", reg.getSensors()); - for (Sensor sensor : reg.getSensors()) { + for (Detector sensor : reg.getSensors()) { // Trigger Sensor registrations for all listed sensors. - this.rti.triggerInteraction(new SensorRegistration(time,sensor)); + this.rti.triggerInteraction(new DetectorRegistration(time,sensor)); } } diff --git a/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureRegistrationMessage.java b/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureRegistrationMessage.java index 3783d33c..7d076780 100644 --- a/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureRegistrationMessage.java +++ b/co-simulation/fed/mosaic-infrastructure/src/main/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureRegistrationMessage.java @@ -18,8 +18,8 @@ import java.util.List; -import org.eclipse.mosaic.interactions.sensor.Sensor; import org.eclipse.mosaic.lib.geo.CartesianPoint; +import org.eclipse.mosaic.lib.objects.detector.Detector; /** * A message to be sent by Infrastructure Device when it registers with the @@ -46,7 +46,7 @@ public class InfrastructureRegistrationMessage { // Geo-coordinate of the Infrastructure Device location private CartesianPoint location = null; - private List sensors; + private List sensors; /** @@ -67,7 +67,7 @@ public class InfrastructureRegistrationMessage { * Device */ public InfrastructureRegistrationMessage(String rxMessageIpAddress, String infrastructureId, int rxMessagePort, - int timeSyncPort, int simulatedInteractionPort, CartesianPoint location, List sensors) { + int timeSyncPort, int simulatedInteractionPort, CartesianPoint location, List sensors) { this.rxMessageIpAddress = rxMessageIpAddress; this.infrastructureId = infrastructureId; this.rxMessagePort = rxMessagePort; @@ -130,78 +130,15 @@ public CartesianPoint getLocation() { return this.location; } - /** - * Sets the IP address where the Infrastructure Device will be listening for - * inbound messages - * - * @param rxMessageIpAddress The IP address where the Infrastructure Device will - * be listening for inbound messages - */ - public void setRxMessageIpAddress(String rxMessageIpAddress) { - this.rxMessageIpAddress = rxMessageIpAddress; - } - - /** - * Sets the unique identifier for the Infrastructure Device - * It currently is the same with RSU ID - * - * @param infrastructureId The unique identifier for the Infrastructure Device - */ - public void setInfrastructureId(String infrastructureId) { - this.infrastructureId = infrastructureId; - } - - /** - * Sets the port number where the Infrastructure Device will be listening for - * inbound messages - * - * @param rxMessagePort The port number where the Infrastructure Device will be - * listening for inbound messages - */ - public void setRxMessagePort(int rxMessagePort) { - this.rxMessagePort = rxMessagePort; - } - - /** - * Set the time sync port for the InfrastructureRegistrationMessage - * - * @param timeSyncPort the new time sync port to be set - */ - public void setTimeSyncPort(int timeSyncPort) { - this.timeSyncPort = timeSyncPort; - } - - /** - * Set the location for the InfrastructureRegistrationMessage - * - * @param location the new GeoPoint object representing the location of the - * Infrastructure Device - */ - public void setLocation(CartesianPoint location) { - this.location = location; - } - - public List getSensors() { + public List getSensors() { return sensors; } - - public void setSensors(List sensors) { - this.sensors = sensors; - } - public int getSimulatedInteractionPort() { return simulatedInteractionPort; } - - public void setSimulatedInteractionPort(int simulatedInteractionPort) { - this.simulatedInteractionPort = simulatedInteractionPort; - } - - - @Override public String toString() { return "InfrastructureRegistrationMessage [rxMessageIpAddress=" + rxMessageIpAddress + ", infrastructureId=" diff --git a/co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstanceManagerTest.java b/co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstanceManagerTest.java index 54d66677..4172ce0b 100644 --- a/co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstanceManagerTest.java +++ b/co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureInstanceManagerTest.java @@ -24,10 +24,10 @@ import java.net.InetAddress; import java.util.ArrayList; -import org.eclipse.mosaic.interactions.sensor.Orientation; -import org.eclipse.mosaic.interactions.sensor.Sensor; -import org.eclipse.mosaic.interactions.sensor.SensorType; import org.eclipse.mosaic.lib.geo.CartesianPoint; +import org.eclipse.mosaic.lib.objects.detector.Detector; +import org.eclipse.mosaic.lib.objects.detector.DetectorType; +import org.eclipse.mosaic.lib.objects.detector.Orientation; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -55,11 +55,11 @@ public void testOnNewRegistration() { int simulatedInteractionPort = 2355; String ipAddressString = "127.0.0.1"; CartesianPoint pt = CartesianPoint.xyz(37.3382, -121.8863, 1.0); - ArrayList sensors = new ArrayList<>(); + ArrayList sensors = new ArrayList<>(); sensors.add( - new Sensor( + new Detector( "String sensorId", - SensorType.SEMANTIC_LIDAR, + DetectorType.SEMANTIC_LIDAR, new Orientation( 0.0,0.0,0.0), CartesianPoint.ORIGO)); diff --git a/co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureRegistrationMessageTest.java b/co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureRegistrationMessageTest.java new file mode 100644 index 00000000..710509f8 --- /dev/null +++ b/co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureRegistrationMessageTest.java @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2023 LEIDOS. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.eclipse.mosaic.fed.infrastructure.ambassador; + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; + +import org.eclipse.mosaic.lib.geo.CartesianPoint; +import org.eclipse.mosaic.lib.objects.detector.Detector; +import org.eclipse.mosaic.lib.objects.detector.DetectorType; +import org.eclipse.mosaic.lib.objects.detector.Orientation; +import org.junit.Test; + +public class InfrastructureRegistrationMessageTest { + @Test + public void testGetterSettersConstructor() { + ArrayList sensors = new ArrayList<>(); + sensors.add( + new Detector( + "String sensorId", + DetectorType.SEMANTIC_LIDAR, + new Orientation( 0.0,0.0,0.0), + CartesianPoint.ORIGO)); + InfrastructureRegistrationMessage message = new InfrastructureRegistrationMessage( + "127.0.0.1", + "rsu_1", + 4567 , + 5678, + 8642, + CartesianPoint.xy(1, 2), + sensors); + assertEquals(message.getInfrastructureId(), "rsu_1"); + assertEquals(message.getRxMessageIpAddress(), "127.0.0.1" ); + assertEquals(message.getRxMessagePort(), 4567); + assertEquals(message.getTimeSyncPort(), 5678); + assertEquals(message.getSimulatedInteractionPort(), 8642); + assertEquals(message.getLocation(), CartesianPoint.xy(1,2)); + assertEquals(message.getSensors(), sensors); + + + + } + + @Test + public void testToString() { + + } +} diff --git a/co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureRegistrationReceiverTest.java b/co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureRegistrationReceiverTest.java index a93a24b5..0f1ad685 100644 --- a/co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureRegistrationReceiverTest.java +++ b/co-simulation/fed/mosaic-infrastructure/src/test/java/org/eclipse/mosaic/fed/infrastructure/ambassador/InfrastructureRegistrationReceiverTest.java @@ -82,6 +82,8 @@ public void testMessageReceive() throws Exception { assertEquals(121.8863, msg.getLocation().getY(), delta); assertEquals(1.0, msg.getLocation().getZ(), delta); } + + } \ No newline at end of file diff --git a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/DetectedObjectInteraction.java b/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/detector/DetectedObjectInteraction.java similarity index 94% rename from co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/DetectedObjectInteraction.java rename to co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/detector/DetectedObjectInteraction.java index 5d447a7e..b0e1c830 100644 --- a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/DetectedObjectInteraction.java +++ b/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/detector/DetectedObjectInteraction.java @@ -13,8 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.eclipse.mosaic.interactions.sensor; +package org.eclipse.mosaic.interactions.detector; +import org.eclipse.mosaic.lib.objects.detector.DetectedObject; import org.eclipse.mosaic.rti.api.Interaction; public class DetectedObjectInteraction extends Interaction { diff --git a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/SensorRegistration.java b/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/detector/DetectorRegistration.java similarity index 59% rename from co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/SensorRegistration.java rename to co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/detector/DetectorRegistration.java index 9c5169b0..642c96cb 100644 --- a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/SensorRegistration.java +++ b/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/detector/DetectorRegistration.java @@ -13,29 +13,30 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.eclipse.mosaic.interactions.sensor; +package org.eclipse.mosaic.interactions.detector; +import org.eclipse.mosaic.lib.objects.detector.Detector; import org.eclipse.mosaic.rti.api.Interaction; -public class SensorRegistration extends Interaction { - public static final String TYPE_ID = createTypeIdentifier(SensorRegistration.class); +public class DetectorRegistration extends Interaction { + public static final String TYPE_ID = createTypeIdentifier(DetectorRegistration.class); - private Sensor sensor; - public SensorRegistration(long time, Sensor sensor) { + private Detector detector; + public DetectorRegistration(long time, Detector sensor) { super(time); - this.sensor = sensor; + this.detector = sensor; } - public Sensor getSensor() { - return sensor; + public Detector getDetector() { + return detector; } - public void setSensor(Sensor sensor) { - this.sensor = sensor; + public void setDetector(Detector sensor) { + this.detector = sensor; } @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + ((sensor == null) ? 0 : sensor.hashCode()); + result = prime * result + ((detector == null) ? 0 : detector.hashCode()); return result; } @Override @@ -46,11 +47,11 @@ public boolean equals(Object obj) { return false; if (getClass() != obj.getClass()) return false; - SensorRegistration other = (SensorRegistration) obj; - if (sensor == null) { - if (other.sensor != null) + DetectorRegistration other = (DetectorRegistration) obj; + if (detector == null) { + if (other.detector != null) return false; - } else if (!sensor.equals(other.sensor)) + } else if (!detector.equals(other.detector)) return false; return true; } diff --git a/co-simulation/lib/mosaic-interactions/src/test/java/org/eclipse/mosaic/interactions/sensor/DetectedObjectInteractionTest.java b/co-simulation/lib/mosaic-interactions/src/test/java/org/eclipse/mosaic/interactions/sensor/DetectedObjectInteractionTest.java index 4c86fedb..16acaf62 100644 --- a/co-simulation/lib/mosaic-interactions/src/test/java/org/eclipse/mosaic/interactions/sensor/DetectedObjectInteractionTest.java +++ b/co-simulation/lib/mosaic-interactions/src/test/java/org/eclipse/mosaic/interactions/sensor/DetectedObjectInteractionTest.java @@ -19,6 +19,9 @@ import org.eclipse.mosaic.lib.geo.CartesianPoint; import org.eclipse.mosaic.lib.math.Vector3d; +import org.eclipse.mosaic.lib.objects.detector.DetectedObject; +import org.eclipse.mosaic.lib.objects.detector.DetectionType; +import org.eclipse.mosaic.lib.objects.detector.Size; import org.junit.Before; import org.junit.Test; diff --git a/co-simulation/lib/mosaic-interactions/src/test/java/org/eclipse/mosaic/interactions/sensor/SensorRegistrationTest.java b/co-simulation/lib/mosaic-interactions/src/test/java/org/eclipse/mosaic/interactions/sensor/SensorRegistrationTest.java index ffd94a42..942e21d5 100644 --- a/co-simulation/lib/mosaic-interactions/src/test/java/org/eclipse/mosaic/interactions/sensor/SensorRegistrationTest.java +++ b/co-simulation/lib/mosaic-interactions/src/test/java/org/eclipse/mosaic/interactions/sensor/SensorRegistrationTest.java @@ -18,6 +18,9 @@ import static org.junit.Assert.assertEquals; import org.eclipse.mosaic.lib.geo.CartesianPoint; +import org.eclipse.mosaic.lib.objects.detector.Detector; +import org.eclipse.mosaic.lib.objects.detector.DetectorType; +import org.eclipse.mosaic.lib.objects.detector.Orientation; import org.junit.Before; import org.junit.Test; @@ -31,7 +34,7 @@ public void setUp() throws Exception { @Test public void testSensorRegistrationJsonSerialization() { - Sensor sensor = new Sensor("something", SensorType.SEMANTIC_LIDAR, new Orientation(23.0, 0, 0), + Detector sensor = new Detector("something", DetectorType.SEMANTIC_LIDAR, new Orientation(23.0, 0, 0), CartesianPoint.xyz(1, 2, 3)); Gson gson = new Gson(); String sensorJson = gson.toJson(sensor); @@ -73,9 +76,9 @@ public void testSensorRegistrationJsonDeserialization() { + "}" +"}"; Gson gson = new Gson(); - Sensor predictedSensor = new Sensor("something", SensorType.SEMANTIC_LIDAR, new Orientation(23.0, 0, 0), + Detector predictedSensor = new Detector("something", DetectorType.SEMANTIC_LIDAR, new Orientation(23.0, 0, 0), CartesianPoint.xyz(1, 2, 3)); - Sensor sensor = gson.fromJson(predictedSensorJson, Sensor.class); + Detector sensor = gson.fromJson(predictedSensorJson, Detector.class); assertEquals(sensor, predictedSensor); } } diff --git a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/DetectedObject.java b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/DetectedObject.java similarity index 99% rename from co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/DetectedObject.java rename to co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/DetectedObject.java index d26dceb2..2fcd67c8 100644 --- a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/DetectedObject.java +++ b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/DetectedObject.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.eclipse.mosaic.interactions.sensor; +package org.eclipse.mosaic.lib.objects.detector; import java.io.Serializable; import java.util.Arrays; diff --git a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/DetectionType.java b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/DetectionType.java similarity index 96% rename from co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/DetectionType.java rename to co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/DetectionType.java index 723f604a..c75aa06d 100644 --- a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/DetectionType.java +++ b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/DetectionType.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.eclipse.mosaic.interactions.sensor; +package org.eclipse.mosaic.lib.objects.detector; public enum DetectionType { diff --git a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/Sensor.java b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/Detector.java similarity index 88% rename from co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/Sensor.java rename to co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/Detector.java index feacbc8a..142abc0e 100644 --- a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/Sensor.java +++ b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/Detector.java @@ -13,21 +13,21 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.eclipse.mosaic.interactions.sensor; +package org.eclipse.mosaic.lib.objects.detector; import java.io.Serializable; import org.eclipse.mosaic.lib.geo.CartesianPoint; -public class Sensor implements Serializable { +public class Detector implements Serializable { private static final long serialVersionUID = 1L; private String sensorId; - private SensorType type; + private DetectorType type; private Orientation orientation; private CartesianPoint location; - public Sensor(String sensorId, SensorType type, Orientation orientation, CartesianPoint point) { + public Detector(String sensorId, DetectorType type, Orientation orientation, CartesianPoint point) { this.sensorId = sensorId; this.type = type; this.orientation = orientation; @@ -40,10 +40,10 @@ public String getSensorId() { public void setSensorId(String sensorId) { this.sensorId = sensorId; } - public SensorType getType() { + public DetectorType getType() { return type; } - public void setType(SensorType type) { + public void setType(DetectorType type) { this.type = type; } public Orientation getOrientation() { @@ -78,7 +78,7 @@ public boolean equals(Object obj) { return false; if (getClass() != obj.getClass()) return false; - Sensor other = (Sensor) obj; + Detector other = (Detector) obj; if (sensorId == null) { if (other.sensorId != null) return false; diff --git a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/SensorType.java b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/DetectorType.java similarity index 80% rename from co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/SensorType.java rename to co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/DetectorType.java index 7125c379..d6e5dc15 100644 --- a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/SensorType.java +++ b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/DetectorType.java @@ -13,14 +13,16 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.eclipse.mosaic.interactions.sensor; +package org.eclipse.mosaic.lib.objects.detector; -import org.eclipse.mosaic.interactions.sensor.gson.SensorTypeAdapter; + + +import org.eclipse.mosaic.lib.objects.detector.gson.DetectorTypeAdapter; import com.google.gson.annotations.JsonAdapter; -@JsonAdapter(SensorTypeAdapter.class) -public enum SensorType { +@JsonAdapter(DetectorTypeAdapter.class) +public enum DetectorType { SEMANTIC_LIDAR("SemanticLidar"), RADAR("Radar"), LIDAR("Lidar"), @@ -36,7 +38,7 @@ public enum SensorType { * * @param name String */ - SensorType(String name) { + DetectorType(String name) { this.label = name; } @@ -46,8 +48,8 @@ public enum SensorType { * @param name string. * @return the enum mapped from String name. */ - public static SensorType fromName(String name) { - for (SensorType type: SensorType.values()) { + public static DetectorType fromName(String name) { + for (DetectorType type: DetectorType.values()) { if (type.label.equals(name)) { return type; } diff --git a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/Orientation.java b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/Orientation.java similarity index 98% rename from co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/Orientation.java rename to co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/Orientation.java index 84c2f259..53d7c549 100644 --- a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/Orientation.java +++ b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/Orientation.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.eclipse.mosaic.interactions.sensor; +package org.eclipse.mosaic.lib.objects.detector; import java.io.Serializable; diff --git a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/Size.java b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/Size.java similarity index 98% rename from co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/Size.java rename to co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/Size.java index 1b286d16..2d3fd9f7 100644 --- a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/Size.java +++ b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/Size.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.eclipse.mosaic.interactions.sensor; +package org.eclipse.mosaic.lib.objects.detector; import java.io.Serializable; diff --git a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/gson/SensorTypeAdapter.java b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/gson/DetectorTypeAdapter.java similarity index 67% rename from co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/gson/SensorTypeAdapter.java rename to co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/gson/DetectorTypeAdapter.java index 26baf8ed..d3350fff 100644 --- a/co-simulation/lib/mosaic-interactions/src/main/java/org/eclipse/mosaic/interactions/sensor/gson/SensorTypeAdapter.java +++ b/co-simulation/lib/mosaic-objects/src/main/java/org/eclipse/mosaic/lib/objects/detector/gson/DetectorTypeAdapter.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.eclipse.mosaic.interactions.sensor.gson; +package org.eclipse.mosaic.lib.objects.detector.gson; import java.lang.reflect.Type; -import org.eclipse.mosaic.interactions.sensor.SensorType; +import org.eclipse.mosaic.lib.objects.detector.DetectorType; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; @@ -26,16 +26,16 @@ import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -public class SensorTypeAdapter implements JsonSerializer, JsonDeserializer { +public class DetectorTypeAdapter implements JsonSerializer, JsonDeserializer { @Override - public SensorType deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + public DetectorType deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - return SensorType.fromName(json.getAsString()); + return DetectorType.fromName(json.getAsString()); } @Override - public JsonElement serialize(SensorType src, Type typeOfSrc, JsonSerializationContext context) { + public JsonElement serialize(DetectorType src, Type typeOfSrc, JsonSerializationContext context) { return context.serialize(src.getLabel()); }