From a4d75088a44f88ff0ceda90448f653d6c0c26661 Mon Sep 17 00:00:00 2001 From: Cheng Yuan <84340069+chengyuan0124@users.noreply.github.com> Date: Sun, 5 May 2024 04:24:01 -0400 Subject: [PATCH 1/3] Update CarmaInstanceManager.java --- .../mosaic/fed/carma/ambassador/CarmaInstanceManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/co-simulation/fed/mosaic-carma/src/main/java/org/eclipse/mosaic/fed/carma/ambassador/CarmaInstanceManager.java b/co-simulation/fed/mosaic-carma/src/main/java/org/eclipse/mosaic/fed/carma/ambassador/CarmaInstanceManager.java index 59aaee9d..090f18c1 100644 --- a/co-simulation/fed/mosaic-carma/src/main/java/org/eclipse/mosaic/fed/carma/ambassador/CarmaInstanceManager.java +++ b/co-simulation/fed/mosaic-carma/src/main/java/org/eclipse/mosaic/fed/carma/ambassador/CarmaInstanceManager.java @@ -96,10 +96,11 @@ public V2xMessageTransmission onV2XMessageTx(InetAddress sourceAddr, CarmaV2xMes sender.getCarlaRoleName(), sender.getLocation()).viaChannel(AdHocChannel.CCH); // TODO: Get maximum broadcast radius from configuration file. MessageRouting routing = messageRoutingBuilder.geoBroadCast(new GeoCircle(sender.getLocation(), 300)); - log.debug("Generating V2XMessageTransmission interaction sim time: {}, sender id: {}, location: {}, payload: {}", + log.debug("Generating V2XMessageTransmission interaction sim time: {}, sender id: {}, location: {}, payload: {}, type: {}", time, sender.getCarmaVehicleId(), sender.getLocation(), + txMsg.getType(), txMsg.getPayload() ); return new V2xMessageTransmission( time, new ExternalV2xMessage(routing, From 6e1a3e24baca99233a8304b3934c3cec7d949f03 Mon Sep 17 00:00:00 2001 From: Cheng Yuan <84340069+chengyuan0124@users.noreply.github.com> Date: Sun, 5 May 2024 17:14:24 -0400 Subject: [PATCH 2/3] add log and change radius of rsu --- .../mosaic/fed/carma/ambassador/CarmaInstanceManager.java | 2 +- .../mosaic/fed/carma/ambassador/CarmaMessageAmbassador.java | 1 + .../ambassador/InfrastructureMessageAmbassador.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/co-simulation/fed/mosaic-carma/src/main/java/org/eclipse/mosaic/fed/carma/ambassador/CarmaInstanceManager.java b/co-simulation/fed/mosaic-carma/src/main/java/org/eclipse/mosaic/fed/carma/ambassador/CarmaInstanceManager.java index 090f18c1..e53d049b 100644 --- a/co-simulation/fed/mosaic-carma/src/main/java/org/eclipse/mosaic/fed/carma/ambassador/CarmaInstanceManager.java +++ b/co-simulation/fed/mosaic-carma/src/main/java/org/eclipse/mosaic/fed/carma/ambassador/CarmaInstanceManager.java @@ -96,7 +96,7 @@ public V2xMessageTransmission onV2XMessageTx(InetAddress sourceAddr, CarmaV2xMes sender.getCarlaRoleName(), sender.getLocation()).viaChannel(AdHocChannel.CCH); // TODO: Get maximum broadcast radius from configuration file. MessageRouting routing = messageRoutingBuilder.geoBroadCast(new GeoCircle(sender.getLocation(), 300)); - log.debug("Generating V2XMessageTransmission interaction sim time: {}, sender id: {}, location: {}, payload: {}, type: {}", + log.debug("Generating V2XMessageTransmission interaction sim time: {}, sender id: {}, location: {}, type: {}, payload: {}", time, sender.getCarmaVehicleId(), sender.getLocation(), diff --git a/co-simulation/fed/mosaic-carma/src/main/java/org/eclipse/mosaic/fed/carma/ambassador/CarmaMessageAmbassador.java b/co-simulation/fed/mosaic-carma/src/main/java/org/eclipse/mosaic/fed/carma/ambassador/CarmaMessageAmbassador.java index eec5c94f..5215000c 100644 --- a/co-simulation/fed/mosaic-carma/src/main/java/org/eclipse/mosaic/fed/carma/ambassador/CarmaMessageAmbassador.java +++ b/co-simulation/fed/mosaic-carma/src/main/java/org/eclipse/mosaic/fed/carma/ambassador/CarmaMessageAmbassador.java @@ -174,6 +174,7 @@ public synchronized void processTimeAdvanceGrant(long time) throws InternalFeder List> newMessages = v2xMessageReceiver.getReceivedMessages(); for (Tuple msg : newMessages) { V2xMessageTransmission msgInt = carmaInstanceManager.onV2XMessageTx(msg.getA(), msg.getB(), currentSimulationTime); + log.debug("Generated a message with ID: {}", msgInt.getMessageId()); SimulationKernel.SimulationKernel.getV2xMessageCache().putItem(currentSimulationTime, msgInt.getMessage()); rti.triggerInteraction(msgInt); } 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 8cceabdb..3743748a 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 @@ -230,7 +230,7 @@ private void onDsrcRegistrationRequest(String infrastructureId) throws UnknownHo .ip(rsuAddress) .subnet(IpResolver.getSingleton().getNetMask()) .power(50) - .radius(300.0) + .radius(500.0) .create(); // Create an AdHocConfiguration object to associate the Ad-Hoc interface From 8ccaa7b01f14702909ae4c7b15838365016f5a78 Mon Sep 17 00:00:00 2001 From: Cheng Yuan <84340069+chengyuan0124@users.noreply.github.com> Date: Mon, 6 May 2024 14:53:29 -0400 Subject: [PATCH 3/3] reverse radius --- .../ambassador/InfrastructureMessageAmbassador.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3743748a..8cceabdb 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 @@ -230,7 +230,7 @@ private void onDsrcRegistrationRequest(String infrastructureId) throws UnknownHo .ip(rsuAddress) .subnet(IpResolver.getSingleton().getNetMask()) .power(50) - .radius(500.0) + .radius(300.0) .create(); // Create an AdHocConfiguration object to associate the Ad-Hoc interface