Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Simonstrator
API
Commits
3ead306a
Commit
3ead306a
authored
Sep 14, 2017
by
Björn Richerzhagen
Browse files
Merge branch 'nr/debugMonitor-clemens' into 'master'
Merge nr/debug monitor clemens into master See merge request !9
parents
c8ea9a53
705610de
Changes
1
Show whitespace changes
Inline
Side-by-side
src/de/tudarmstadt/maki/simonstrator/api/common/metric/AbstractMetric.java
View file @
3ead306a
...
@@ -104,7 +104,7 @@ public abstract class AbstractMetric<M extends MetricValue<?>> implements
...
@@ -104,7 +104,7 @@ public abstract class AbstractMetric<M extends MetricValue<?>> implements
@Override
@Override
public
boolean
isOverallMetric
()
{
public
boolean
isOverallMetric
()
{
assert
(
perHost
==
null
&&
overallMetric
!=
null
)
assert
(
perHost
==
null
&&
overallMetric
!=
null
)
||
(
perHost
!=
null
&&
overallMetric
==
null
);
||
(
perHost
!=
null
&&
overallMetric
==
null
)
:
name
;
return
perHost
==
null
;
return
perHost
==
null
;
}
}
...
...
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