diff --git a/src/test/java/it/unibz/inf/isochrone/network/AlgorithmConfiguration.java b/src/test/java/it/unibz/inf/isochrone/network/AlgorithmConfiguration.java index 39c5d70f066d65525a2310b6817469e6bfbdfe17..d61702f778061d8f4212ff547320b2aaaaad2b04 100644 --- a/src/test/java/it/unibz/inf/isochrone/network/AlgorithmConfiguration.java +++ b/src/test/java/it/unibz/inf/isochrone/network/AlgorithmConfiguration.java @@ -4,11 +4,13 @@ import it.unibz.inf.isochrone.algorithm.Isochrone; public class AlgorithmConfiguration { private final Class<? extends Isochrone> algorithmClass; + private final String algorithmName; private final TestParameters params; private final boolean expireNodes; public AlgorithmConfiguration(final Class<? extends Isochrone> algorithmClass, final TestParameters params, final boolean expireNodes) { this.algorithmClass = algorithmClass; + this.algorithmName = algorithmClass.getSimpleName(); this.params = params; this.expireNodes = expireNodes; } @@ -37,11 +39,9 @@ public class AlgorithmConfiguration { public int hashCode() { final int prime = 31; int result = 1; - // CHECKSTYLE:OFF MagicNumber - result = prime * result + ((algorithmClass == null) ? 0 : algorithmClass.hashCode()); - result = prime * result + (expireNodes ? 1231 : 1237); + result = prime * result + ((algorithmName == null) ? 0 : algorithmName.hashCode()); + result = prime * result + Boolean.hashCode(expireNodes); result = prime * result + ((params == null) ? 0 : params.hashCode()); - // CHECKSTYLE:ON MagicNumber return result; } @@ -56,13 +56,12 @@ public class AlgorithmConfiguration { if (getClass() != obj.getClass()) { return false; } - final AlgorithmConfiguration other = (AlgorithmConfiguration) obj; - if (algorithmClass == null) { - if (other.algorithmClass != null) { + if (algorithmName == null) { + if (other.algorithmName != null) { return false; } - } else if (!algorithmClass.equals(other.algorithmClass)) { + } else if (!algorithmName.equals(other.algorithmName)) { return false; } if (expireNodes != other.expireNodes) { @@ -75,13 +74,12 @@ public class AlgorithmConfiguration { } else if (!params.equals(other.params)) { return false; } - return true; } @Override public String toString() { - return "CachingKey [class=" + algorithmClass.getSimpleName() + ", duration=" + params.getDuration() + ", expireNodes=" + expireNodes + "]"; + return "AlgorithmConfiguration [algorithmName=" + algorithmName + ", duration=" + params.getDuration() + ", expireNodes=" + expireNodes + "]"; } }