Notice to GitKraken users: A vulnerability has been found in the SSH key generation of GitKraken versions 7.6.0 to 8.0.0 ( If you use GitKraken and have generated a SSH key using one of these versions, please remove it both from your local workstation and from your LRZ GitLab profile.

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

Commit 3432eab5 authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck
Browse files

Merge branch 'deterministic_output_path_traci' into 'master'

override timestap if using remoteScenarioRun

See merge request !130
parents e012fe0f 6c0e4bbc
Pipeline #261266 passed with stages
in 134 minutes and 8 seconds
......@@ -21,7 +21,8 @@ public class RemoteScenarioRun extends ScenarioRun implements RemoteRunListener
public RemoteScenarioRun(Scenario scenario, Path outputDir, RunnableFinishedListener scenarioFinishedListener, Path scenarioPath, ScenarioCache scenarioCache) {
super(scenario, outputDir.toString(), scenarioFinishedListener, scenarioPath, scenarioCache);
// overwriteTimestampSetting. In RemoteScenarioRun the caller defines where the output should go.
super(scenario, outputDir.toString(), true,scenarioFinishedListener, scenarioPath, scenarioCache);
this.singleStepMode = true;
this.waitForLoopEnd = new Object();
this.lock = new ReentrantLock();
......@@ -73,19 +73,10 @@ public class SimulationCfg {
public String outputPath() {
if (outputVecFile.endsWith(".vec")) {
return outputVecFile.substring(0, outputVecFile.length() - 4);
if (outputScalarFile.endsWith(".sca")) {
return outputScalarFile.substring(0, outputScalarFile.length() - 4);
return String.format("%s/%s/%s/%s_vars_%s_rep_%s",
return String.format("%s/%s_%s/vadere.d",
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