Skip to content
Snippets Groups Projects
Commit 2c72cdaa authored by User expired's avatar User expired
Browse files

minor improvements in hashCode/equals method (using algorithm's name

instead of full class object)
parent f9671885
No related branches found
No related tags found
No related merge requests found
...@@ -4,11 +4,13 @@ import it.unibz.inf.isochrone.algorithm.Isochrone; ...@@ -4,11 +4,13 @@ import it.unibz.inf.isochrone.algorithm.Isochrone;
public class AlgorithmConfiguration { public class AlgorithmConfiguration {
private final Class<? extends Isochrone> algorithmClass; private final Class<? extends Isochrone> algorithmClass;
private final String algorithmName;
private final TestParameters params; private final TestParameters params;
private final boolean expireNodes; private final boolean expireNodes;
public AlgorithmConfiguration(final Class<? extends Isochrone> algorithmClass, final TestParameters params, final boolean expireNodes) { public AlgorithmConfiguration(final Class<? extends Isochrone> algorithmClass, final TestParameters params, final boolean expireNodes) {
this.algorithmClass = algorithmClass; this.algorithmClass = algorithmClass;
this.algorithmName = algorithmClass.getSimpleName();
this.params = params; this.params = params;
this.expireNodes = expireNodes; this.expireNodes = expireNodes;
} }
...@@ -37,11 +39,9 @@ public class AlgorithmConfiguration { ...@@ -37,11 +39,9 @@ public class AlgorithmConfiguration {
public int hashCode() { public int hashCode() {
final int prime = 31; final int prime = 31;
int result = 1; int result = 1;
// CHECKSTYLE:OFF MagicNumber result = prime * result + ((algorithmName == null) ? 0 : algorithmName.hashCode());
result = prime * result + ((algorithmClass == null) ? 0 : algorithmClass.hashCode()); result = prime * result + Boolean.hashCode(expireNodes);
result = prime * result + (expireNodes ? 1231 : 1237);
result = prime * result + ((params == null) ? 0 : params.hashCode()); result = prime * result + ((params == null) ? 0 : params.hashCode());
// CHECKSTYLE:ON MagicNumber
return result; return result;
} }
...@@ -56,13 +56,12 @@ public class AlgorithmConfiguration { ...@@ -56,13 +56,12 @@ public class AlgorithmConfiguration {
if (getClass() != obj.getClass()) { if (getClass() != obj.getClass()) {
return false; return false;
} }
final AlgorithmConfiguration other = (AlgorithmConfiguration) obj; final AlgorithmConfiguration other = (AlgorithmConfiguration) obj;
if (algorithmClass == null) { if (algorithmName == null) {
if (other.algorithmClass != null) { if (other.algorithmName != null) {
return false; return false;
} }
} else if (!algorithmClass.equals(other.algorithmClass)) { } else if (!algorithmName.equals(other.algorithmName)) {
return false; return false;
} }
if (expireNodes != other.expireNodes) { if (expireNodes != other.expireNodes) {
...@@ -75,13 +74,12 @@ public class AlgorithmConfiguration { ...@@ -75,13 +74,12 @@ public class AlgorithmConfiguration {
} else if (!params.equals(other.params)) { } else if (!params.equals(other.params)) {
return false; return false;
} }
return true; return true;
} }
@Override @Override
public String toString() { public String toString() {
return "CachingKey [class=" + algorithmClass.getSimpleName() + ", duration=" + params.getDuration() + ", expireNodes=" + expireNodes + "]"; return "AlgorithmConfiguration [algorithmName=" + algorithmName + ", duration=" + params.getDuration() + ", expireNodes=" + expireNodes + "]";
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment