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
caff4ed7
Commit
caff4ed7
authored
Jul 09, 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
941c94cd
024057fa
Pipeline
#61099
passed with stage
in 49 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
VadereState/src/org/vadere/state/scenario/ScenarioElement.java
...eState/src/org/vadere/state/scenario/ScenarioElement.java
+1
-3
VadereState/src/org/vadere/state/scenario/Teleporter.java
VadereState/src/org/vadere/state/scenario/Teleporter.java
+5
-0
VadereUtils/tests/org/vadere/util/geometry/TestPolygon.java
VadereUtils/tests/org/vadere/util/geometry/TestPolygon.java
+1
-1
No files found.
VadereState/src/org/vadere/state/scenario/ScenarioElement.java
View file @
caff4ed7
...
...
@@ -8,9 +8,7 @@ public abstract class ScenarioElement {
public
abstract
VShape
getShape
();
public
void
setShape
(
VShape
newShape
)
{
throw
new
UnsupportedOperationException
(
"This concrete scenario element does not support setting the shape."
);
}
public
abstract
void
setShape
(
VShape
newShape
);
public
abstract
int
getId
();
...
...
VadereState/src/org/vadere/state/scenario/Teleporter.java
View file @
caff4ed7
...
...
@@ -28,6 +28,11 @@ public class Teleporter extends ScenarioElement {
throw
new
UnsupportedOperationException
(
"A teleporter does not have a shape."
);
}
@Override
public
void
setShape
(
VShape
newShape
)
{
throw
new
UnsupportedOperationException
(
"A teleporter does not have a shape."
);
}
@Override
public
int
getId
()
{
return
-
1
;
...
...
VadereUtils/tests/org/vadere/util/geometry/TestPolygon.java
View file @
caff4ed7
...
...
@@ -97,7 +97,7 @@ public class TestPolygon {
// print evaluated grid
String
g2string
=
GeometryPrinter
.
grid2string
(
grid
);
IOUtils
.
printDataFile
(
Paths
.
get
(
"testreports"
,
"test_polygon2d_closestPoint"
),
IOUtils
.
printDataFile
(
Paths
.
get
(
"testreports"
,
"test_polygon2d_closestPoint
.txt
"
),
g2string
);
}
...
...
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