vadere merge requestshttps://gitlab.lrz.de/vadere/vadere/-/merge_requests2019-09-17T15:25:10+02:00https://gitlab.lrz.de/vadere/vadere/-/merge_requests/83Resolve "Change PedestrianPositionProcessor to use interpolation of Pedestria...2019-09-17T15:25:10+02:00Ghost UserResolve "Change PedestrianPositionProcessor to use interpolation of PedestrianFootStepProcessor"Closes #260
Closes #262
* [x] Simplify tests
* [x] Write text into CHANGELOG
* [x] Write tests for the interpolation method
* [x] overwrite `Pedestrian.getPosition()` with `Pedestrian.getPosition(simTimeSec)`, which would then u...Closes #260
Closes #262
* [x] Simplify tests
* [x] Write text into CHANGELOG
* [x] Write tests for the interpolation method
* [x] overwrite `Pedestrian.getPosition()` with `Pedestrian.getPosition(simTimeSec)`, which would then use the interpolation method?
* [x] in `clearFootSteps()` should we keep the last entry (which can be used for interpolation)? --> No, new field `currentFootStep`, this is because there the whole list is saved & used in "FootStepProcessors" and they would need to make sure to ignore double occurrences
* [x] Look at code where pedestrian.getPosition() would make sense to get exchanged to the interpolated position? E.g. in NelderMead or OverlapProcessor? --> This would be in a new issue/branch then
* [x] Remove the "currentFootStep" field in Pedestrian again and use the "LastFootSteps" provided in VTrajectory (then with a minimum capacity of 1)?
* [x] resolve #263 first
* [x] How to deal with requested interpolation if a Pedestrian has an outdated FootStep? Check with @hm-kleinmei
```
if(currentFootStep == null){
return getPosition();
}else{
if(time > currentFootStep.getEndTime()){
// This happens for example if a pedestrian is waiting (see Events)
// TODO: check with Bene K. if this is okay, or a better way?
return currentFootStep.getEnd();
}else{
return FootStep.interpolateFootStep(currentFootStep, time);
}
}
```https://gitlab.lrz.de/vadere/vadere/-/merge_requests/82Coordiate reference2019-07-31T18:33:03+02:00Schuhbaeck, StefanCoordiate reference* add coordinate reference to topography (close #251)
* refactor osm2vadere.py and add additional features to convert openstreetmap xml data into vadere topography
* new version 1.3* add coordinate reference to topography (close #251)
* refactor osm2vadere.py and add additional features to convert openstreetmap xml data into vadere topography
* new version 1.3https://gitlab.lrz.de/vadere/vadere/-/merge_requests/81Misc gui fixes2019-07-31T18:06:16+02:00Schuhbaeck, StefanMisc gui fixes* make SplitPane's resizable (close #24)
* introduce line numbers to json text views
* introduce code folding to json text views* make SplitPane's resizable (close #24)
* introduce line numbers to json text views
* introduce code folding to json text viewshttps://gitlab.lrz.de/vadere/vadere/-/merge_requests/80Dev/poly gui2019-07-26T15:14:57+02:00Zoennchen, BenediktDev/poly gui+ Improvements to EikMesh: EikMesh is now able to mesh very thin corridors using less mesh points.
+ .poly files which define the geometry of the topography can now generated in the topographyCreator tab i.e. without starting the simulat...+ Improvements to EikMesh: EikMesh is now able to mesh very thin corridors using less mesh points.
+ .poly files which define the geometry of the topography can now generated in the topographyCreator tab i.e. without starting the simulation beforehand.https://gitlab.lrz.de/vadere/vadere/-/merge_requests/79Vadere manager2019-07-18T10:51:20+02:00Schuhbaeck, StefanVadere managerSchuhbaeck, StefanSchuhbaeck, Stefanhttps://gitlab.lrz.de/vadere/vadere/-/merge_requests/78Migration issue 2542019-07-15T09:01:43+02:00Schuhbaeck, StefanMigration issue 254* fix #254: Migration assistant will add default values for new members.
* migrate to version 1.1: include default values for new members in json* fix #254: Migration assistant will add default values for new members.
* migrate to version 1.1: include default values for new members in jsonhttps://gitlab.lrz.de/vadere/vadere/-/merge_requests/77Check to catch undetected error in TestEvacuationTimeProcessor2019-07-15T09:17:23+02:00Ghost UserCheck to catch undetected error in TestEvacuationTimeProcessorsee https://gitlab.lrz.de/vadere/vadere/issues/249#note_396973see https://gitlab.lrz.de/vadere/vadere/issues/249#note_396973https://gitlab.lrz.de/vadere/vadere/-/merge_requests/76add features to TikzGenerator2019-07-12T18:33:27+02:00Schuhbaeck, Stefanadd features to TikzGenerator* Add config to choose if all or only alive trajectories are drawn
* Draw walking direction in Tikz
* create nodes for pedestrian instead of circles. Each pedestrian node
has a name 'ped_ID' to reference the node in tikz.
* add named c...* Add config to choose if all or only alive trajectories are drawn
* Draw walking direction in Tikz
* create nodes for pedestrian instead of circles. Each pedestrian node
has a name 'ped_ID' to reference the node in tikz.
* add named coordinate at Centroid for all scenario elements:
* source: (src_<ID>)
* target: (trg_<ID>)
* absorbingArea: (absorb_<ID>)
* obstacle: (obs_<ID>)
* stairs: (str_<ID>)
* measurementArea: (mrmtA_<ID>)
* add style classes:
* trajectory: i.e. thickness
* pedestrian: default color
* ped_circle: defines shape of circular pedestrians (not for groups)
* selected: style for selected pedestrian
* group: styl (all) groups.https://gitlab.lrz.de/vadere/vadere/-/merge_requests/75Encapsulated logic to parse CLI arguments into new class "VadereArgumentParser"2019-07-11T17:55:30+02:00Ghost UserEncapsulated logic to parse CLI arguments into new class "VadereArgumentParser"This new class is used by:
- VadereApplication
- VadereConsole
- PostVisualization
Now, all Vadere applications have a unified interface to pass arguments on command line.
Watch out: The method "VadereConsole.addSubCommandsToPar...This new class is used by:
- VadereApplication
- VadereConsole
- PostVisualization
Now, all Vadere applications have a unified interface to pass arguments on command line.
Watch out: The method "VadereConsole.addSubCommandsToParser()" should be moved to "VadereArgumentParser".https://gitlab.lrz.de/vadere/vadere/-/merge_requests/74Insert missing scenario parameters2019-07-09T16:47:48+02:00Ghost UserInsert missing scenario parametershttps://gitlab.lrz.de/vadere/vadere/-/merge_requests/73Dev/meshing2019-07-04T13:18:11+02:00Zoennchen, BenediktDev/meshinghttps://gitlab.lrz.de/vadere/vadere/-/merge_requests/72Dev/granular post vis2019-06-28T15:54:25+02:00Zoennchen, BenediktDev/granular post vis[PostVis]:
+ This branch fixes a Bug for the PNG and Video-Making. Before choosing non default image sizes causes wrong results. Now the picture and video should display what the user is currently seeing in the PostVis.
+ The PostVis-M...[PostVis]:
+ This branch fixes a Bug for the PNG and Video-Making. Before choosing non default image sizes causes wrong results. Now the picture and video should display what the user is currently seeing in the PostVis.
+ The PostVis-Model, and the Player is now working with simulation time in seconds instead of time steps. Positions will be interpolated e.g. if an agent is at position x1 at step 1 and x2 at step 2 and the step length is 0.4s the position at time 0.2s will be x1 + (x2-x1) / 2. The user can now jump to a specific simulation time. Reducing incrementation time makes lets the Player displays the simulation more smoothly. Making a video will adopt this too.https://gitlab.lrz.de/vadere/vadere/-/merge_requests/71add stand alone features from VadereManagement module:2019-06-25T08:18:44+02:00Schuhbaeck, Stefanadd stand alone features from VadereManagement module:* single step mode in GUI:
Allows the user to step through the simulation one step at a time to
identify bugs.
* simplify obstacles:
Merge multiple obstacles based on the convex hull their points create.
The merge can be undon
* ...* single step mode in GUI:
Allows the user to step through the simulation one step at a time to
identify bugs.
* simplify obstacles:
Merge multiple obstacles based on the convex hull their points create.
The merge can be undon
* add features to open street map (osm) importer:
1) import 'open' paths as polygons with a specified width. With this
it is possible to create walls or subway entrance
2) add option to include osm ids into each obstacleSchuhbaeck, StefanSchuhbaeck, Stefanhttps://gitlab.lrz.de/vadere/vadere/-/merge_requests/70Single config2019-07-12T10:50:46+02:00Ghost UserSingle configAccording to #243, Vadere should read all configuration parameters from a single file.
Provide following functionality:
- Use OS-specific location to store config file (home directory preferred).
- Write default config file if no ...According to #243, Vadere should read all configuration parameters from a single file.
Provide following functionality:
- Use OS-specific location to store config file (home directory preferred).
- Write default config file if no config file exists or errors occur while reading existing config file.
- Add flag `--config-file <path/to/file>` to all(!) Vadere applications (i.e., GUI, Console, PostVis, ...).
Furthermore, remove old config code. I.e., the `preferences.put(...)` calls and the corresponding `ApplicationWriter.savePreferences()` calls.https://gitlab.lrz.de/vadere/vadere/-/merge_requests/69Resolve "New dependency data science library for Vadere"2019-06-26T15:54:05+02:00Ghost UserResolve "New dependency data science library for Vadere"Closes #247Closes #247https://gitlab.lrz.de/vadere/vadere/-/merge_requests/68Salient behavior2019-05-22T11:02:21+02:00Ghost UserSalient behaviorMerge salient behavior branch into master:
Salient behavior branch introduces following new parameters (with default values):
- "useSalientBehavior" : false"
- "footStepsToStore" : 4,
- "searchRadius" : 1.0,
- "angleCalculationTyp...Merge salient behavior branch into master:
Salient behavior branch introduces following new parameters (with default values):
- "useSalientBehavior" : false"
- "footStepsToStore" : 4,
- "searchRadius" : 1.0,
- "angleCalculationType" : "USE_CENTER",
- "targetOrientationAngleThreshold" : 45.0https://gitlab.lrz.de/vadere/vadere/-/merge_requests/67Resolve "Include to every header name the processor id"2019-05-21T18:06:38+02:00Ghost UserResolve "Include to every header name the processor id"Closes #246Closes #246https://gitlab.lrz.de/vadere/vadere/-/merge_requests/66fix issue #242.2019-06-14T15:00:22+02:00Zoennchen, Benediktfix issue #242.fix of issue #242fix of issue #242Zoennchen, BenediktZoennchen, Benedikthttps://gitlab.lrz.de/vadere/vadere/-/merge_requests/65Resolve "New flag to compute metric for the quality of the StepCircleOptimizer"2019-07-30T15:09:52+02:00Ghost UserResolve "New flag to compute metric for the quality of the StepCircleOptimizer"Closes #241
Closes #256
## TODO
* [x] use new scenarios and measure optimal/found solution
* [x] write test processor
* compute max/min/mean/stddev between optimal and found solution
* write tests that check for certa...Closes #241
Closes #256
## TODO
* [x] use new scenarios and measure optimal/found solution
* [x] write test processor
* compute max/min/mean/stddev between optimal and found solution
* write tests that check for certain values
* [x] Change the footstep processor to the new `EventtimePedestrianIdKey`, this makes reading data a lot easier (no variable column size for each row).
* [x] There needs to be a configuration to turn this feature on (IMPORTANT: for testing, the feature is set to true hard coded!!)
* [x] Integrate TestProcessor which checks that all pedestrians get to the source. -> Not possible, processors are buggy #249
* [x] First solve #256, otherwise the vadere.conf files break without manual adaptation on local computer
Wait for #242 and #243 to be solved.
https://gitlab.lrz.de/vadere/vadere/-/merge_requests/63Dev/bhm2019-05-15T16:47:55+02:00Zoennchen, BenediktDev/bhmZoennchen, BenediktZoennchen, Benedikt