Skip to content
GitLab
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
Hide whitespace changes
Inline Side-by-side
VadereGui/src/org/vadere/gui/postvisualization/PostVisualisation.java
View file @ b71c6533
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.projectview.VadereApplication;
import org.vadere.util.io.VadereArgumentParser;
import org.vadere.util.logging.Logger;
import org.vadere.util.logging.StdOutErrLog;
public class PostVisualisation {
// TODO: Move logic to read/write config file to "VadereConfig.java".
private static Logger logger = Logger.getLogger(PostVisualisation.class);
public static void main(String[] args) {
StdOutErrLog.addStdOutErrToLog();
logger.info("starting post visualization ...");
// load settings
logger.info("preferences started");
// start main gui
logger.info("starting Vadere PostVisualization...");
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);
PostvisualizationWindow.start();
logger.info("post visualization started");
}
}
VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java
View file @ b71c6533
......@@ -42,9 +42,6 @@ import java.util.Optional;
/**
* Main Window of the new post visualization.
*
* @Version 1.0
*
*/
public class PostvisualizationWindow extends JPanel implements Observer, DropTargetListener {
private static final long serialVersionUID = -8177132133860336295L;
......
VadereGui/src/org/vadere/gui/projectview/VadereApplication.java
View file @ b71c6533
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.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.StdOutErrLog;
......@@ -20,10 +22,24 @@ public class VadereApplication {
StdOutErrLog.addStdOutErrToLog();
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);
// start main gui
ProjectView.start();
}
......
VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "basic_2_density_discrete_ca",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -70,7 +69,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "basic_2_density_pso",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -58,7 +57,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "chicken_floorfield_displaced_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -69,7 +68,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "chicken_floorfield_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -79,7 +78,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "corner_waiting_time_processor_test",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -79,7 +78,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "narrow_passage_discrete_CA_fail",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -61,7 +60,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "narrow_passage_nelder_mead_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -77,7 +76,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "narrow_passage_pso_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -77,7 +76,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "queueing_dynamic_floorfield_visual_check",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -53,7 +52,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 5.0,
"pedestrianDynamicWeight" : 1.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "regular_wall_discrete_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -68,7 +67,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "regular_wall_nelder_mead_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -68,7 +67,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "regular_wall_pso_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -68,7 +67,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "rimea_01_pathway_discrete_brute_force",
"description" : "numberOfCircles = 4, stepCircleResolution = 30, DISCRETE",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -78,7 +77,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "rimea_01_pathway_discrete_ca",
"description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -78,7 +77,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_osm1_025_d",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_osm1_025_up",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
View file @ b71c6533
......@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_osm1_050_d",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......
Supports Markdown
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

LRZ Homepage | Datenschutz | Dokumentation und Betriebsbedingungen | Impressum