diff --git a/bundle/src/assembly/resources/scenarios/Barnim/output/output_config.xml b/bundle/src/assembly/resources/scenarios/Barnim/output/output_config.xml index c4473811b..e7ca8297c 100644 --- a/bundle/src/assembly/resources/scenarios/Barnim/output/output_config.xml +++ b/bundle/src/assembly/resources/scenarios/Barnim/output/output_config.xml @@ -51,6 +51,7 @@ MessageId ReceiverName ReceiverInformation.ReceiveSignalStrength + Message.Payload.EffectiveLength @@ -66,6 +67,7 @@ Message.Routing.Destination.Type Message.Routing.Destination.Address.IPv4Address Message.Routing.Destination.AdhocChannelId + Message.Payload.EffectiveLength diff --git a/fed/mosaic-output/src/main/java/org/eclipse/mosaic/fed/output/generator/file/format/ExtendedMethodSet.java b/fed/mosaic-output/src/main/java/org/eclipse/mosaic/fed/output/generator/file/format/ExtendedMethodSet.java index 94f5391fd..f94ec1fca 100644 --- a/fed/mosaic-output/src/main/java/org/eclipse/mosaic/fed/output/generator/file/format/ExtendedMethodSet.java +++ b/fed/mosaic-output/src/main/java/org/eclipse/mosaic/fed/output/generator/file/format/ExtendedMethodSet.java @@ -38,7 +38,7 @@ public static void putV2xMessage(V2xMessage message) { V2X_MESSAGES.put(message.getId(), message); } - static public Object getType(V2xMessageReception interaction) { + static public Object getType(V2xMessageTransmission interaction) { V2xMessage message = Objects.requireNonNull(V2X_MESSAGES.get(interaction.getMessageId())); if (message instanceof GenericV2xMessage) { return ((GenericV2xMessage) message).getMessageType(); @@ -46,7 +46,7 @@ static public Object getType(V2xMessageReception interaction) { return message.getSimpleClassName(); } - static public Object getType(V2xMessageTransmission interaction) { + static public Object getType(V2xMessageReception interaction) { V2xMessage message = Objects.requireNonNull(V2X_MESSAGES.get(interaction.getMessageId())); if (message instanceof GenericV2xMessage) { return ((GenericV2xMessage) message).getMessageType(); @@ -54,6 +54,10 @@ static public Object getType(V2xMessageTransmission interaction) { return message.getSimpleClassName(); } + static public V2xMessage getMessage(V2xMessageReception interaction) { + return Objects.requireNonNull(V2X_MESSAGES.get(interaction.getMessageId())); + } + static public Object getTimeInSec(Interaction interaction) { return interaction == null ? "" : interaction.getTime() / TIME.SECOND; }