Commits · 4dc3bf8d7bd7a2df4a5e4b6e45b6d96f4be3c571 · vadere / vadere · GitLab

01 Mar, 2019 5 commits
- Merge branch 'master' into event_handling · 4dc3bf8d
  Benedikt Kleinmeier authored Mar 01, 2019
```
# Conflicts:
#	README.md
#	VadereSimulator/pom.xml
#	VadereUtils/src/org/vadere/util/opencl/CLUtils.java
```
  4dc3bf8d
- Update README.md · 47f4bdd9
  Daniel Lehmberg authored Mar 01, 2019
  
  47f4bdd9
- Update Changelog.md · e064aa08
  Daniel Lehmberg authored Mar 01, 2019
  
  e064aa08
- Merge branch 'java_migration' into 'master' · 9c8b9a99
  Daniel Lehmberg authored Mar 01, 2019
```
Migration to OpenJDK 11, solves #218 #217 #195 #210 #209

Closes #209

See merge request !47
```
  9c8b9a99
- Migration to OpenJDK 11, solves #218 #217 #195 #210 #209 · b558728f
  Benedikt Kleinmeier authored Mar 01, 2019 and Daniel Lehmberg committed Mar 01, 2019
  
  b558728f
28 Feb, 2019 1 commit
- In "Events" tab, added menu to load presettings. · 30a8af67
  Benedikt Kleinmeier authored Feb 28, 2019
  
  30a8af67
27 Feb, 2019 8 commits
- Merge branch 'java_migration' into event_handling · bd787ec5
  Benedikt Kleinmeier authored Feb 27, 2019
  
  bd787ec5
- bug search. · bc498893
  Benedikt Zoennchen authored Feb 27, 2019
  
  bc498893
- bug search. · dfaf5a6f
  Benedikt Zoennchen authored Feb 27, 2019
  
  dfaf5a6f
- add external repository again. · 3bf5297e
  Benedikt Zoennchen authored Feb 27, 2019
  
  3bf5297e
- In "pom.xml" added workaround to avoid assertion in Maven's compiler plugin. · 5f4a7875
  Benedikt Kleinmeier authored Feb 27, 2019
  
  5f4a7875
- WIP: minor · 156b4e9a
  Daniel Lehmberg authored Feb 27, 2019
  
  156b4e9a
- Merge branch 'java_migration' into event_handling · ba8e4f92
  Benedikt Kleinmeier authored Feb 27, 2019
  
  ba8e4f92
- merge from master · c8360445
  Daniel Lehmberg authored Feb 27, 2019
  
  c8360445
26 Feb, 2019 7 commits
- refactor poms: remove duplicated and / or unused entries. · 8a4a85d6
  Benedikt Zoennchen authored Feb 26, 2019
  
  8a4a85d6
- In "UpdateSchemeEventDriven", fixed "FIXME" to avoid an endless loop. · 0bc321bd
  Benedikt Kleinmeier authored Feb 26, 2019
  
  0bc321bd
- Merge branch 'master' of https://gitlab.lrz.de/vadere/vadere · 26068c1e
  Benedikt Zoennchen authored Feb 26, 2019
  
  26068c1e
- testing parallel event driven update. · cf4ab731
  Benedikt Zoennchen authored Feb 26, 2019
  
  cf4ab731
- Merge branch 'java_migration' into event_handling · 3d1bcfd8
  Benedikt Kleinmeier authored Feb 26, 2019
  
  3d1bcfd8
- Grouped all event tests in directory "VadereModelTests/TestEvents" and... · 88edd80b
  Benedikt Kleinmeier authored Feb 26, 2019
```
Grouped all event tests in directory "VadereModelTests/TestEvents" and lowercased all test files (to be consistent with existing model tests).
```
  88edd80b
- Implemented "OSMBehaviorController" and use it in "UpdateSchemeEventDriven"... · 4f7df0d6
  Benedikt Kleinmeier authored Feb 26, 2019
```
Implemented "OSMBehaviorController" and use it in "UpdateSchemeEventDriven" and "UpdateSchemeSequential".
```
  4f7df0d6
25 Feb, 2019 19 commits
- prevent generally output folders in vadereanalysistool · 76fc8c5a
  Daniel Lehmberg authored Feb 25, 2019
  
  76fc8c5a
- remove s2ucre output folder, solves #217 · 40b22f5c
  Daniel Lehmberg authored Feb 25, 2019
  
  40b22f5c
- update README.md · 03a1349e
  Daniel Lehmberg authored Feb 25, 2019
  
  03a1349e
- fix (for now) for the Python script · 6dc6dbc8
  Daniel Lehmberg authored Feb 25, 2019
  
  6dc6dbc8
- WIP: check · c951ddc1
  Daniel Lehmberg authored Feb 25, 2019
  
  c951ddc1
- Merge branch 'java_migration' into event_handling · 9064cd9f
  Benedikt Kleinmeier authored Feb 25, 2019
  
  9064cd9f
- WIP check for coverage · 683973fe
  Daniel Lehmberg authored Feb 25, 2019
  
  683973fe
- test commit for coverage and regex · 97fd9e91
  Daniel Lehmberg authored Feb 25, 2019
  
  97fd9e91
- Merge branch 'master' of gitlab.lrz.de:vadere/vadere · baaefc49
  Benedikt Kleinmeier authored Feb 25, 2019
  
  baaefc49
- Deleted Git merge artifacts suffixed with ".orig". · e4ec0e4c
  Benedikt Kleinmeier authored Feb 25, 2019
  
  e4ec0e4c
- fix test case · a6d7cf61
  Daniel Lehmberg authored Feb 25, 2019
  
  a6d7cf61
- replace InternalException by RuntimeException. · 750034d9
  Benedikt Zoennchen authored Feb 25, 2019
  
  750034d9
- Merge branch 'master' of https://gitlab.lrz.de/vadere/vadere · 776e2de8
  Benedikt Zoennchen authored Feb 25, 2019
  
  776e2de8
- remove testData directory: output data and scenario · 6f67426a
  Benedikt Zoennchen authored Feb 25, 2019
  
  6f67426a
- Merge branch 'java_migration' of https://gitlab.lrz.de/vadere/vadere into java_migration · a5f023d1
  Benedikt Zoennchen authored Feb 25, 2019
  
  a5f023d1
- replace some deprecated calls. · 0f6f88ee
  Benedikt Zoennchen authored Feb 25, 2019
  
  0f6f88ee
- In "collect_line_and_branch_coverage.py", added TODO about broken regex on Windows. · 35e24d1f
  Benedikt Kleinmeier authored Feb 25, 2019
  
  35e24d1f
- In "pom.xml" and "VadereGui/pom.xml", use latest version of Maven's Mockito... · a567c866
  Benedikt Kleinmeier authored Feb 25, 2019
```
In "pom.xml" and "VadereGui/pom.xml", use latest version of Maven's Mockito plugin to avoid mocking errors during unit test phase.

See:
- https://github.com/calypsonet/keyple-java/issues/443
- https://mvnrepository.com/artifact/org.mockito/mockito-core
- https://mvnrepository.com/artifact/org.mockito/mockito-all/1.9.5
```
  a567c866
- In ".gitlab-ci.yml", adapted path to coverage reports. · 3424af6d
  Benedikt Kleinmeier authored Feb 25, 2019
  
  3424af6d