Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

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

Merge branch 'master' into...

Merge branch 'master' into 241-new-flag-to-compute-metric-for-the-quality-of-the-stepcircleoptimizer

# Conflicts:
#	VadereUtils/src/org/vadere/util/config/VadereConfig.java
parents 4a8f17e3 25bcc7b9
package org.vadere.gui.postvisualization; package org.vadere.gui.postvisualization;
import net.sourceforge.argparse4j.inf.ArgumentParser;
import net.sourceforge.argparse4j.inf.ArgumentParserException;
import org.vadere.gui.components.utils.Messages;
import org.vadere.gui.postvisualization.view.PostvisualizationWindow; import org.vadere.gui.postvisualization.view.PostvisualizationWindow;
import org.vadere.gui.projectview.VadereApplication;
import org.vadere.util.io.VadereArgumentParser;
import org.vadere.util.logging.Logger; import org.vadere.util.logging.Logger;
import org.vadere.util.logging.StdOutErrLog; import org.vadere.util.logging.StdOutErrLog;
public class PostVisualisation { public class PostVisualisation {
// TODO: Move logic to read/write config file to "VadereConfig.java".
private static Logger logger = Logger.getLogger(PostVisualisation.class); private static Logger logger = Logger.getLogger(PostVisualisation.class);
public static void main(String[] args) { public static void main(String[] args) {
StdOutErrLog.addStdOutErrToLog(); StdOutErrLog.addStdOutErrToLog();
logger.info("starting post visualization ..."); logger.info("starting Vadere PostVisualization...");
// load settings
logger.info("preferences started"); VadereArgumentParser vadereArgumentParser = new VadereArgumentParser();
// start main gui ArgumentParser argumentParser = vadereArgumentParser.getArgumentParser();
try {
vadereArgumentParser.parseArgsAndProcessOptions(args);
} catch (UnsatisfiedLinkError linkError) {
System.err.println("[LWJGL]: " + linkError.getMessage());
} catch (ArgumentParserException e) {
argumentParser.handleError(e);
System.exit(1);
} catch (Exception e) {
System.err.println("Cannot start vadere: " + e.getMessage());
e.printStackTrace();
System.exit(1);
}
Messages.loadLanguageFromPreferences(VadereApplication.class);
PostvisualizationWindow.start(); PostvisualizationWindow.start();
logger.info("post visualization started");
} }
} }
...@@ -42,9 +42,6 @@ import java.util.Optional; ...@@ -42,9 +42,6 @@ import java.util.Optional;
/** /**
* Main Window of the new post visualization. * Main Window of the new post visualization.
*
* @Version 1.0
*
*/ */
public class PostvisualizationWindow extends JPanel implements Observer, DropTargetListener { public class PostvisualizationWindow extends JPanel implements Observer, DropTargetListener {
private static final long serialVersionUID = -8177132133860336295L; private static final long serialVersionUID = -8177132133860336295L;
......
package org.vadere.gui.projectview; package org.vadere.gui.projectview;
import net.sourceforge.argparse4j.inf.ArgumentParser;
import net.sourceforge.argparse4j.inf.ArgumentParserException;
import org.vadere.gui.components.utils.Messages; import org.vadere.gui.components.utils.Messages;
import org.vadere.gui.projectview.view.ProjectView; import org.vadere.gui.projectview.view.ProjectView;
import org.vadere.util.config.VadereConfig; import org.vadere.util.io.VadereArgumentParser;
import org.vadere.util.logging.Logger; import org.vadere.util.logging.Logger;
import org.vadere.util.logging.StdOutErrLog; import org.vadere.util.logging.StdOutErrLog;
...@@ -20,10 +22,24 @@ public class VadereApplication { ...@@ -20,10 +22,24 @@ public class VadereApplication {
StdOutErrLog.addStdOutErrToLog(); StdOutErrLog.addStdOutErrToLog();
logger.info("starting Vadere GUI..."); logger.info("starting Vadere GUI...");
// set locale VadereArgumentParser vadereArgumentParser = new VadereArgumentParser();
ArgumentParser argumentParser = vadereArgumentParser.getArgumentParser();
try {
vadereArgumentParser.parseArgsAndProcessOptions(args);
} catch (UnsatisfiedLinkError linkError) {
System.err.println("[LWJGL]: " + linkError.getMessage());
} catch (ArgumentParserException e) {
argumentParser.handleError(e);
System.exit(1);
} catch (Exception e) {
System.err.println("Cannot start vadere: " + e.getMessage());
e.printStackTrace();
System.exit(1);
}
Messages.loadLanguageFromPreferences(VadereApplication.class); Messages.loadLanguageFromPreferences(VadereApplication.class);
// start main gui
ProjectView.start(); ProjectView.start();
} }
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "basic_2_density_discrete_ca", "name" : "basic_2_density_discrete_ca",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -70,7 +69,9 @@ ...@@ -70,7 +69,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "basic_2_density_pso", "name" : "basic_2_density_pso",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -58,7 +57,9 @@ ...@@ -58,7 +57,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "chicken_floorfield_displaced_ok", "name" : "chicken_floorfield_displaced_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -69,7 +68,9 @@ ...@@ -69,7 +68,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "chicken_floorfield_ok", "name" : "chicken_floorfield_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -79,7 +78,9 @@ ...@@ -79,7 +78,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "corner_waiting_time_processor_test", "name" : "corner_waiting_time_processor_test",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -79,7 +78,9 @@ ...@@ -79,7 +78,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "narrow_passage_discrete_CA_fail", "name" : "narrow_passage_discrete_CA_fail",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -61,7 +60,9 @@ ...@@ -61,7 +60,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "narrow_passage_nelder_mead_ok", "name" : "narrow_passage_nelder_mead_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -77,7 +76,9 @@ ...@@ -77,7 +76,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "narrow_passage_pso_ok", "name" : "narrow_passage_pso_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -77,7 +76,9 @@ ...@@ -77,7 +76,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "queueing_dynamic_floorfield_visual_check", "name" : "queueing_dynamic_floorfield_visual_check",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -53,7 +52,9 @@ ...@@ -53,7 +52,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 5.0, "queueWidthLoading" : 5.0,
"pedestrianDynamicWeight" : 1.0, "pedestrianDynamicWeight" : 1.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "regular_wall_discrete_ok", "name" : "regular_wall_discrete_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -68,7 +67,9 @@ ...@@ -68,7 +67,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "regular_wall_nelder_mead_ok", "name" : "regular_wall_nelder_mead_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -68,7 +67,9 @@ ...@@ -68,7 +67,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "regular_wall_pso_ok", "name" : "regular_wall_pso_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -68,7 +67,9 @@ ...@@ -68,7 +67,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_01_pathway_discrete_brute_force", "name" : "rimea_01_pathway_discrete_brute_force",
"description" : "numberOfCircles = 4, stepCircleResolution = 30, DISCRETE", "description" : "numberOfCircles = 4, stepCircleResolution = 30, DISCRETE",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -78,7 +77,9 @@ ...@@ -78,7 +77,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_01_pathway_discrete_ca", "name" : "rimea_01_pathway_discrete_ca",
"description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE", "description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -78,7 +77,9 @@ ...@@ -78,7 +77,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_osm1_025_d", "name" : "rimea_04_flow_osm1_025_d",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
...@@ -43,7 +42,9 @@ ...@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_osm1_025_up", "name" : "rimea_04_flow_osm1_025_up",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
...@@ -43,7 +42,9 @@ ...@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_osm1_050_d", "name" : "rimea_04_flow_osm1_050_d",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
...@@ -43,7 +42,9 @@ ...@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,