Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/main/java/io/github/auberonedu/equalsLivecode/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ 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, null);
// Centroid locB = new Centroid(2, 9, null);

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
public static void videoDemo() {
List<char[][]> video = List.of(
// Frame 0: Salamander is at [2, 3] (all locations in [row, column] format)
// Frame 1: Salamander is at [2, 3] (all locations in [row, column] format)
// Food is at [4, 5]
new char[][]{{'.','.','.','.','.','.','.',},
{'.','.','.','.','.','.','.',},
Expand Down Expand Up @@ -94,5 +94,4 @@ public static void videoDemo() {
boolean hasOverlap = !Collections.disjoint(salamanderLocations, foodLocations);
System.out.println("Do the salamander locations overlap with the food locations: " + hasOverlap);
}

}
63 changes: 63 additions & 0 deletions src/main/java/io/github/auberonedu/equalsLivecode/Centroid.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,67 @@ 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 (!getClass().equals(o.getClass())) {
// return false;
// }

// Centroid other = (Centroid) o;

// if (r != other.r) return false;
// if (c != other.c) return false;

// //if (!this.name.equals(other.name)) return false;
// if (name == null) {
// return other.name == null;
// // if (other.name == null) {
// // return true;
// // } else {
// // return false
// // };
// }

// return (name.equals(other.name));
// // if (!name.equals(other.name)) return false;
// // else return true;
// }
}