Commits · cab7d43784fd5dc53ff40a3b09494ddf743d4c0e · vadere / vadere

13 Jul, 2018 2 commits

Merge branch 'issue#96' into 'develop' · cab7d437

Benedikt Zoennchen authored Jul 13, 2018

add some comments for the docu, refactoring of duplicated code, improve…

See merge request !31

cab7d437

add some comments for the docu, refactoring of duplicated code, improve... · acf3fd13

Benedikt Zoennchen authored Jul 13, 2018

add some comments for the docu, refactoring of duplicated code, improve performance of the transformation of the output into trajectory jave objects.

acf3fd13

12 Jul, 2018 7 commits
- Merge branch 'develop' of https://gitlab.lrz.de/vadere/vadere into develop · f5fa7acc
  Benedikt Zoennchen authored Jul 12, 2018
  
  f5fa7acc
- documentation (adding comments), the hardware parameters are no longer hardcoded for the sorting. · 36865d52
  Benedikt Zoennchen authored Jul 12, 2018
  
  36865d52
- Update .gitlab-ci.yml · fb77f3c4
  Benedikt Zoennchen authored Jul 12, 2018
  
  fb77f3c4
- Merge branch 'develop' of https://gitlab.lrz.de/vadere/vadere into develop · fdc22cfc
  Benedikt Zoennchen authored Jul 12, 2018
  
  fdc22cfc
- implement the linked cell on the GPU. JUnit tests included. · a9edc936
  Benedikt Zoennchen authored Jul 12, 2018
  
  a9edc936
- implement the linked cell on the GPU. · a58b9135
  Benedikt Zoennchen authored Jul 12, 2018
  
  a58b9135
- Merge branch 'group_models' into develop · 8962a443
  Benedikt Kleinmeier authored Jul 12, 2018
```
# Conflicts:
#	VadereSimulator/src/org/vadere/simulator/projects/ScenarioRun.java
```
  8962a443
10 Jul, 2018 9 commits
- Update .gitlab-ci.yml · 9cad2a18
  Benedikt Zoennchen authored Jul 10, 2018
  
  9cad2a18
- junit skip test. · cdeac38d
  Benedikt Zoennchen authored Jul 10, 2018
  
  cdeac38d
- junit skip test. · 52604d4e
  Benedikt Zoennchen authored Jul 10, 2018
  
  52604d4e
- junit skip test. · dbaabd7b
  Benedikt Zoennchen authored Jul 10, 2018
  
  dbaabd7b
- junit skip test. · b6643ea0
  Benedikt Zoennchen authored Jul 10, 2018
  
  b6643ea0
- junit skip test. · 804e2257
  Benedikt Zoennchen authored Jul 10, 2018
  
  804e2257
- junit skip test. · deb465f4
  Benedikt Zoennchen authored Jul 10, 2018
  
  deb465f4
- Merge branch 'develop' of gitlab.lrz.de:vadere/vadere into develop · 3da97584
  Benedikt Kleinmeier authored Jul 10, 2018
  
  3da97584
- In ".gitlab-ci.yml", added description skip multiple tests. · e52611ce
  Benedikt Kleinmeier authored Jul 10, 2018
  
  e52611ce
09 Jul, 2018 5 commits
- reduce the local work group size for bitonic sort such that the test does not fail. · dbb6b563
  Benedikt Zoennchen authored Jul 09, 2018
  
  dbb6b563
- Merge branch 'dev/bitonicSort' into 'develop' · 08d978f0
  Benedikt Zoennchen authored Jul 09, 2018
```
implementation of Bitonic sort on the GPU.

See merge request !30
```
  08d978f0
- implementation of Bitonic sort on the GPU. · adc98fe6
  Benedikt Zoennchen authored Jul 09, 2018
  
  adc98fe6
- Merge branch 'develop' of https://gitlab.lrz.de/vadere/vadere into develop · caff4ed7
  Benedikt Zoennchen authored Jul 09, 2018
  
  caff4ed7
- refector ScenarioStore: use private variables instead of public. · 941c94cd
  Benedikt Zoennchen authored Jul 09, 2018
  
  941c94cd
06 Jul, 2018 1 commit
- cleaner ABC: subclasses have to throw themselves an Unupported Exception (like for getShape) · 024057fa
  Daniel Lehmberg authored Jul 06, 2018
  
  024057fa
05 Jul, 2018 1 commit
- In "TikZGenerator.java", added preliminary code generate groups (but code should be refactored). · b1c53536
  Benedikt Kleinmeier authored Jul 05, 2018
  
  b1c53536
03 Jul, 2018 13 commits
- In "TikzGenerator.java", highlight currently selected agent with colored border. · 0c20647f
  Benedikt Kleinmeier authored Jul 03, 2018
```
In "PostvisualizationWindow.java", added button to generate TikZ image.
```
  0c20647f
- rebase group_models to develop branch · 15699d73
  Stefan Schuhbaeck authored Jul 03, 2018
  
  15699d73
- rebase group_models to develop branch · 27380b79
  Stefan Schuhbaeck authored Jul 03, 2018
  
  27380b79
- Merge branch 'develop' of gitlab.lrz.de:vadere/vadere into develop · a9caddb3
  Stefan Schuhbaeck authored Jul 03, 2018
  
  a9caddb3
- add .txt suffix so exclude rule in .gitignore works · 7c07e2e8
  Stefan Schuhbaeck authored Jul 03, 2018
  
  7c07e2e8
- resolve merge conflict. · a523b13a
  Benedikt Zoennchen authored Jul 03, 2018
  
  a523b13a
- increase the nTrail for the seating test since it is a test that involves... · cff6acbd
  Benedikt Zoennchen authored Jul 03, 2018
```
increase the nTrail for the seating test since it is a test that involves probability therefore a larger sample is necessary.
```
  cff6acbd
- resolve merge conflict. · bb7e35d0
  Benedikt Zoennchen authored Jul 03, 2018
  
  bb7e35d0
- resolve merge conflict. · 7ecc4813
  Benedikt Zoennchen authored Jul 03, 2018
  
  7ecc4813
- synchronize scenarioStore access. Use exact exponential function for... · 4846b945
  Benedikt Zoennchen authored Jul 03, 2018
```
synchronize scenarioStore access. Use exact exponential function for pedestrian and obstacle potential calculation
```
  4846b945
- Merge branch 'remove_reflection' into 'develop' · 145f1026
  Benedikt Zoennchen authored Jul 03, 2018
```
Remove reflection where reasonable; closes #91 and fixes #86

See merge request !28
```
  145f1026
- resolve merge conflict of develop -> remove_reflection · 4a1d1bf3
  Daniel Lehmberg authored Jul 03, 2018
  
  4a1d1bf3
- remove reflection in ReflectionAttriuteModifier; include new ABC for Attributes with shape · 7254bec4
  Daniel Lehmberg authored Jul 03, 2018
  
  7254bec4
02 Jul, 2018 2 commits
- Added comments to soft shell potential (variable names according to sivers-2016b). · d7f24dfa
  Marion Goedel authored Jul 02, 2018
  
  d7f24dfa
- Merge branch 'develop' of https://gitlab.lrz.de/vadere/vadere into develop · 7dc0825d
  Marion Goedel authored Jul 02, 2018
  
  7dc0825d