diff --git a/src/main/java/io/github/auberonedu/equalsLivecode/App.java b/src/main/java/io/github/auberonedu/equalsLivecode/App.java index 44717b0..ffc44b9 100644 --- a/src/main/java/io/github/auberonedu/equalsLivecode/App.java +++ b/src/main/java/io/github/auberonedu/equalsLivecode/App.java @@ -11,13 +11,13 @@ public static void main(String[] args) { // To start, look at Centroid.java // BEFORE running the code, make a prediction of what the following will print: - Centroid locA = new Centroid(4, 9, "Salamander"); - Centroid locB = new Centroid(4, 9, "Salamander"); + // Centroid locA = new Centroid(4, 9, "Salamander"); + // Centroid locB = new Centroid(4, 9, "Salamander"); - System.out.println("Result of locA == locB " + (locA == locB)); - System.out.println("Result of locA.equals(locB) " + locA.equals(locB)); + // System.out.println("Result of locA == locB " + (locA == locB)); + // System.out.println("Result of locA.equals(locB) " + locA.equals(locB)); - //videoDemo(); + videoDemo(); } // We will look at this a bit later in the livecode, please ignore for first part diff --git a/src/main/java/io/github/auberonedu/equalsLivecode/Centroid.java b/src/main/java/io/github/auberonedu/equalsLivecode/Centroid.java index b0e343a..c32d2c8 100644 --- a/src/main/java/io/github/auberonedu/equalsLivecode/Centroid.java +++ b/src/main/java/io/github/auberonedu/equalsLivecode/Centroid.java @@ -22,4 +22,70 @@ public int getC() { public String getName() { return name; } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + r; + result = prime * result + c; + // result = prime * result + ((name == null) ? 0 : name.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Centroid other = (Centroid) obj; + if (r != other.r) + return false; + if (c != other.c) + return false; + // if (name == null) { + // if (other.name != null) + // return false; + // } else if (!name.equals(other.name)) + // return false; + return true; + } + + + + // @Override + // public boolean equals(Object o) { + // // is this equal to o? + // // ensure r, c, and name are all equal between this and o + // // ensure we meet Java equals contract + // if (o == null) return false; + + // if(!this.getClass().equals(o.getClass())) { + // return false; + // } + + // Centroid other = (Centroid) o; + + // if (this.r != other.r) return false; + // if (this.c != other.c) return false; + + // if (this.name == null) { + // return other.name == null; + + // // if (other.name == null) { + // // return true; + // // } else { // other.name is not null + // // return false; + // // } + // } + + // if (!this.name.equals(other.name)) { + // return false; + // } else { + // return true; + // } + // } } diff --git a/src/main/java/io/github/auberonedu/equalsLivecode/NamedCentroid.java b/src/main/java/io/github/auberonedu/equalsLivecode/NamedCentroid.java new file mode 100644 index 0000000..9939716 --- /dev/null +++ b/src/main/java/io/github/auberonedu/equalsLivecode/NamedCentroid.java @@ -0,0 +1,4 @@ +package io.github.auberonedu.equalsLivecode; +// this takes care of everything we had to set up / boilerplate +public record NamedCentroid(String name, int r, int c) { +}