16.12.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit c5650886 authored by Daniel Lehmberg's avatar Daniel Lehmberg
Browse files

add changelog

parent 53b6aca1
......@@ -27,6 +27,8 @@
sub-command. This will will turn the ScenarioChecker on or off for the command
line. If the Checker detects an error the simulation will not be executed.
- `OutputFile`: In code distinguish between indices (rows) and headers (columns). Resolve naming conflicts in headers of output files (see #201).
### Changed
- Removed directory `Documentation/version-control` which contained the Git hooks. The Git hooks are not required anymore. Instead, added `git rev-parse HEAD` to file `VadereSimulator/pom.xml` to create `VadereSimulator/resources/current_commit_hash.txt` during each build via `mvn compile`.
......
......@@ -53,7 +53,7 @@ public abstract class OutputFile<K extends DataKey<K>> {
private boolean isAddedProcessors;
private String separator;
private final String nameConflictAdd = "-Proc?"; // the # is replaced with the processor id
private final static String nameConflictAdd = "-Proc?"; // the # is replaced with the processor id
private VadereWriterFactory writerFactory;
private VadereWriter writer;
......@@ -65,20 +65,19 @@ public abstract class OutputFile<K extends DataKey<K>> {
}
public void setAbsoluteFileName(final String fileName) {
this.absoluteFileName = fileName;
this.absoluteFileName = fileName;
}
public void setRelativeFileName(final String fileName) {
this.fileName = fileName;
}
public String getSeparator() {
return this.separator;
return this.separator;
}
public void setSeparator(final String separator) {
this.separator = separator;
this.separator = separator;
}
@SuppressWarnings("unchecked")
......@@ -95,7 +94,8 @@ public abstract class OutputFile<K extends DataKey<K>> {
public void write() {
if (!isEmpty()) {
try (VadereWriter out = writerFactory.create(absoluteFileName)) {
writer = out;
writer = out;
printHeader(out);
this.dataProcessors.stream().flatMap(p -> p.getKeys().stream())
......@@ -173,7 +173,7 @@ public abstract class OutputFile<K extends DataKey<K>> {
for (String h: list) {
// ... but now add the processor id
headers.addLast(h +
this.nameConflictAdd.replace('?', (char) (l.getId()+'0')));
nameConflictAdd.replace('?', (char) (l.getId()+'0')));
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment