Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(output): exit simulation if output configuration is erroneous #478

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix(output): exit simulation if output configuration is erroneous #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
524d231
fix: duplicate output id fails silently
hoelger Feb 7, 2025
bdf4dbc
fix: hard exit when e.g. time filter has unreadable values
hoelger Feb 17, 2025
4a377b8
fix: fail hard when input file is not valid
hoelger Mar 10, 2025
a7557ce
feat: change default separator to ','
hoelger Mar 18, 2025
9aae380
refactor: remove dead code
hoelger Mar 18, 2025
19b0d92
feat: Improve error messages for now-failing-missing-config-file
hoelger Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions fed/mosaic-cell/src/main/java/org/eclipse/mosaic/fed/cell/ambassador/CellAmbassador.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,13 +421,9 @@ private void process(CellularCommunicationConfiguration interaction) throws Inte
} else if (registeredServers.containsKey(nodeId)) { // handle servers (nodes in Internet, w/o radio region)
handleServerCellConfiguration(nodeId, cellConfiguration, interactionTime);
} else {
if (cellConfiguration.isEnabled()) {
throw new InternalFederateException(
"Cell Ambassador: Cannot activate Cell module for \"" + nodeId + "\" because the id is unknown"
);
} else {
log.debug("Tried to deactivate the Cell module for a node with the unknown id: {}", nodeId);
}
throw new InternalFederateException(
"Cell Ambassador: Cannot activate Cell module for \"" + nodeId + "\" because the id is unknown"
);
}
} else {
if (isVehicle) {
Expand Down
10 changes: 6 additions & 4 deletions ...aic-cell/src/main/java/org/eclipse/mosaic/fed/cell/viz/PerRegionBandwidthMeasurement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public class PerRegionBandwidthMeasurement implements StreamListener {

final static String WILDCARD_ALL = "*";

private final static char SEPARATOR = ',';

private final File parentDir;
/**
* The region id of the region that is the initiator of the transmission.
Expand Down Expand Up @@ -184,7 +186,7 @@ private void initCsv() {
StringBuilder b = new StringBuilder();
b.append("time");
for (int i = 0; i < indexMap.size(); i++) {
b.append(";").append(indexMap.inverse().get(i));
b.append(SEPARATOR).append(indexMap.inverse().get(i));
}
writeToCsv(b.toString());
flushCsv();
Expand Down Expand Up @@ -339,7 +341,7 @@ private void updateCsv(boolean everything) {

/* Previous version:
* for (Long transmitted: transmittedDataList.get(rowIndex)) {
* b.append(";").append(ObjectUtils.defaultIfNull(transmitted, 0).toString());
* b.append(SEPARATOR).append(ObjectUtils.defaultIfNull(transmitted, 0).toString());
* }
* was quite slow; especially due to inefficient iteration over the array and
* frequent conversions of zeros to string. */
Expand All @@ -348,9 +350,9 @@ private void updateCsv(boolean everything) {
for (int i = 0; i < row.size(); i++) {
transmitted = row.get(i);
if (transmitted == 0L) {
b.append(";0");
b.append(SEPARATOR).append("0");
} else {
b.append(";").append(Long.toUnsignedString(transmitted));
b.append(SEPARATOR).append(Long.toUnsignedString(transmitted));
}
}
transmittedData.clearRow(rowIndex);
Expand Down
Loading