Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
V
vadere
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
110
Issues
110
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
4
Merge Requests
4
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vadere
vadere
Commits
e3c08bfb
Commit
e3c08bfb
authored
Jul 17, 2018
by
Benedikt Zoennchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://gitlab.lrz.de/vadere/vadere
into develop
parents
4ddf575d
9c1c6465
Pipeline
#62377
failed with stages
in 1 minute and 24 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
67 additions
and
1 deletion
+67
-1
.gitlab-ci.yml
.gitlab-ci.yml
+9
-0
Tools/run_vadere_console_with_all_scneario_files.py
Tools/run_vadere_console_with_all_scneario_files.py
+54
-0
VadereSimulator/src/org/vadere/simulator/entrypoints/VadereConsole.java
...r/src/org/vadere/simulator/entrypoints/VadereConsole.java
+2
-1
VadereUtils/tests/org/vadere/util/math/TestCLLinkedList.java
VadereUtils/tests/org/vadere/util/math/TestCLLinkedList.java
+2
-0
No files found.
.gitlab-ci.yml
View file @
e3c08bfb
...
...
@@ -30,3 +30,12 @@ unit_tests_with_coverage:
-
mvn clean
-
mvn test -Dtest=!TestConvolution,!TestBitonicSort,!TestCLLinkedList
-
python3 Tools/collect_line_and_branch_coverage.py
run_scenario_files
:
stage
:
deploy
script
:
-
mvn clean
-
mvn package
-
python3 Tools/run_vadere_console_with_all_scneario_files.py
Tools/run_vadere_console_with_all_scneario_files.py
0 → 100644
View file @
e3c08bfb
# Use "vadere-console.jar", which is created by "mvn package", to run all
# scenario files under "VadereModelTests" subdirectory.
#
# Note: script contains some print statements so that progress can be tracked
# a little bit
# Wach out: call this script from root directory of project. E.g.
#
# python Tools/my_script.py
import
fnmatch
import
os
import
shutil
import
subprocess
def
find_scenario_files
(
path
=
"VadereModelTests"
):
scenario_search_pattern
=
"*.scenario"
scenario_files
=
[]
for
root
,
dirnames
,
filenames
in
os
.
walk
(
path
):
for
filename
in
fnmatch
.
filter
(
filenames
,
scenario_search_pattern
):
scenario_path
=
os
.
path
.
join
(
root
,
filename
)
scenario_files
.
append
(
scenario_path
)
print
(
"Total scenario files: {}"
.
format
(
len
(
scenario_files
)))
return
scenario_files
def
run_scenario_files_with_vadere_console
(
scenario_files
,
vadere_console
=
"VadereGui/target/vadere-console.jar"
,
scenario_timeout_in_sec
=
60
):
output_dir
=
"output"
if
not
os
.
path
.
exists
(
output_dir
):
print
(
"Creating output directory: {}"
.
format
(
output_dir
))
os
.
makedirs
(
output_dir
)
print
(
"Created output directory: {}"
.
format
(
output_dir
))
for
scenario_file
in
scenario_files
:
print
(
"Running scenario file: {}"
.
format
(
scenario_file
))
# Use timout feature, check return value and capture stdout/stderr to a PIPE (use completed_process.stdout to get it).
completed_process
=
subprocess
.
run
(
args
=
[
"java"
,
"-jar"
,
vadere_console
,
scenario_file
,
output_dir
],
timeout
=
scenario_timeout_in_sec
,
check
=
True
,
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
)
print
(
"Finished scenario file: {}"
.
format
(
scenario_file
))
if
os
.
path
.
exists
(
output_dir
):
print
(
"Deleting output directory: {}"
.
format
(
output_dir
))
shutil
.
rmtree
(
output_dir
)
print
(
"Deleted output directory: {}"
.
format
(
output_dir
))
if
__name__
==
"__main__"
:
scenario_files
=
find_scenario_files
()
run_scenario_files_with_vadere_console
(
scenario_files
)
VadereSimulator/src/org/vadere/simulator/entrypoints/VadereConsole.java
View file @
e3c08bfb
...
...
@@ -69,8 +69,9 @@ public class VadereConsole {
new
ScenarioRun
(
scenario
,
null
).
run
();
}
}
catch
(
IO
Exception
e
)
{
}
catch
(
Exception
e
)
{
logger
.
error
(
e
);
System
.
exit
(-
1
);
}
}
...
...
VadereUtils/tests/org/vadere/util/math/TestCLLinkedList.java
View file @
e3c08bfb
...
...
@@ -153,12 +153,14 @@ public class TestCLLinkedList {
int
cellStart
=
gridCells
.
cellStarts
[
cell
];
int
cellEnd
=
gridCells
.
cellEnds
[
cell
];
/*
for(int i = cellStart; i < cellEnd; i++) {
VPoint point = new VPoint(gridCells.reorderedPositions[i*2], gridCells.reorderedPositions[i*2+1]);
int[] gridPosition = getGridPosition(point, clUniformHashedGrid.getCellSize(), clUniformHashedGrid.getWorldOrign());
int gridHash = getGridHash(gridPosition, clUniformHashedGrid.getGridSize());
assertEquals(gridHash, cell);
}
*/
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment