From af22e11d5d0b024cc1b35231c6bcfafc5dcd9f8a Mon Sep 17 00:00:00 2001 From: Tobias Meuser Date: Wed, 2 May 2018 17:25:08 +0200 Subject: [PATCH] Fixed bug to enable CorrectInformationRatio metric --- .../sensor/environment/data/BumpProperty.java | 10 ++++++++++ .../component/sensor/environment/data/FogProperty.java | 10 ++++++++++ .../sensor/environment/data/HazardProperty.java | 10 ++++++++++ .../component/sensor/environment/data/JamProperty.java | 10 ++++++++++ .../sensor/environment/data/RainProperty.java | 10 ++++++++++ .../sensor/environment/data/TrafficSignProperty.java | 10 ++++++++++ 6 files changed, 60 insertions(+) diff --git a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/BumpProperty.java b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/BumpProperty.java index bfe81581..446dcf7d 100644 --- a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/BumpProperty.java +++ b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/BumpProperty.java @@ -68,4 +68,14 @@ public class BumpProperty implements RoadProperty { return new BumpProperty(_location, _edge, false); } + @Override + public boolean equals(Object obj) { + if (obj instanceof BumpProperty) { + BumpProperty bumpProperty = (BumpProperty) obj; + + return bumpProperty.getEdge().equals(getEdge()) && (bumpProperty.hasBump() == hasBump()); + } + return super.equals(obj); + } + } diff --git a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/FogProperty.java b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/FogProperty.java index 0066019e..df2b2230 100644 --- a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/FogProperty.java +++ b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/FogProperty.java @@ -68,4 +68,14 @@ public class FogProperty implements RoadProperty { return new FogProperty(_location, _edge, false); } + @Override + public boolean equals(Object obj) { + if (obj instanceof FogProperty) { + FogProperty fogProperty = (FogProperty) obj; + + return fogProperty.getEdge().equals(getEdge()) && (fogProperty.hasFog() == hasFog()); + } + return super.equals(obj); + } + } diff --git a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/HazardProperty.java b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/HazardProperty.java index 67c54a1d..9134f610 100644 --- a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/HazardProperty.java +++ b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/HazardProperty.java @@ -68,4 +68,14 @@ public class HazardProperty implements RoadProperty { return new HazardProperty(_location, _edge, false); } + @Override + public boolean equals(Object obj) { + if (obj instanceof HazardProperty) { + HazardProperty hazardProperty = (HazardProperty) obj; + + return hazardProperty.getEdge().equals(getEdge()) && (hazardProperty.hasHazard() == hasHazard()); + } + return super.equals(obj); + } + } diff --git a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/JamProperty.java b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/JamProperty.java index 4d9498b5..66b87bea 100755 --- a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/JamProperty.java +++ b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/JamProperty.java @@ -68,4 +68,14 @@ public class JamProperty implements RoadProperty { return new JamProperty(_location, _edge, false); } + @Override + public boolean equals(Object obj) { + if (obj instanceof JamProperty) { + JamProperty jamProperty = (JamProperty) obj; + + return jamProperty.getEdge().equals(getEdge()) && (jamProperty.isJammed() == isJammed()); + } + return super.equals(obj); + } + } diff --git a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/RainProperty.java b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/RainProperty.java index 640239a6..394ede7e 100644 --- a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/RainProperty.java +++ b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/RainProperty.java @@ -68,4 +68,14 @@ public class RainProperty implements RoadProperty { return new RainProperty(_location, _edge, false); } + @Override + public boolean equals(Object obj) { + if (obj instanceof RainProperty) { + RainProperty rainProperty = (RainProperty) obj; + + return rainProperty.getEdge().equals(getEdge()) && (rainProperty.hasRain() == hasRain()); + } + return super.equals(obj); + } + } diff --git a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/TrafficSignProperty.java b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/TrafficSignProperty.java index a9ba9315..1731ddb6 100644 --- a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/TrafficSignProperty.java +++ b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/TrafficSignProperty.java @@ -68,4 +68,14 @@ public class TrafficSignProperty implements RoadProperty { return new TrafficSignProperty(_location, _edge, false); } + @Override + public boolean equals(Object obj) { + if (obj instanceof TrafficSignProperty) { + TrafficSignProperty signProperty = (TrafficSignProperty) obj; + + return signProperty.getEdge().equals(getEdge()) && (signProperty.hasSign() == hasSign()); + } + return super.equals(obj); + } + } -- GitLab