From 86b8daa49b626cc38653cb52822e5389fe28d3ed Mon Sep 17 00:00:00 2001 From: Stefanurkal Date: Tue, 6 May 2025 20:32:57 -0700 Subject: [PATCH 1/2] completed watching panopto video --- .../github/auberonedu/equalsLivecode/App.java | 16 +++++-- .../auberonedu/equalsLivecode/Centroid.java | 46 +++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/github/auberonedu/equalsLivecode/App.java b/src/main/java/io/github/auberonedu/equalsLivecode/App.java index 53efd3e..e2ef20f 100644 --- a/src/main/java/io/github/auberonedu/equalsLivecode/App.java +++ b/src/main/java/io/github/auberonedu/equalsLivecode/App.java @@ -13,11 +13,21 @@ public static void main(String[] args) { Centroid locA = new Centroid(4, 9, "Salamander"); Centroid locB = new Centroid(4, 9, "Salamander"); + Centroid locC = locA; - 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 == locC " + (locA == locC)); + System.out.println("Result of locA.equals(locB) " + locA.equals(locA)); - videoDemo(); + Set centroids = new HashSet<>(); + System.out.println(locA.hashCode()); + System.out.println(locB.hashCode()); + centroids.add(locA); + centroids.add(locB); + System.out.println(centroids.size()); + + + + //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..85b234f 100644 --- a/src/main/java/io/github/auberonedu/equalsLivecode/Centroid.java +++ b/src/main/java/io/github/auberonedu/equalsLivecode/Centroid.java @@ -22,4 +22,50 @@ 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) { + // if (o == null) return false; + // if (getClass() != o.getClass()) return false; + // Centroid other = (Centroid) o; + // if(r != other.r) return false; + // if(c != other.c) return false; + // if(name == null){ + // if(other.name == null) return true; + // if(other.name != null) return false; + // } + // if(!name.equals(other.name)) return false; + // return true; + // } } From 291d0688ad5e4ea3daf75fbc2975f0a97aa28d5d Mon Sep 17 00:00:00 2001 From: Stefanurkal Date: Tue, 6 May 2025 20:39:29 -0700 Subject: [PATCH 2/2] completed via panopto recording --- .../github/auberonedu/equalsLivecode/App.java | 26 +++++++++++-------- .../auberonedu/equalsLivecode/Location.java | 7 +++++ 2 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 src/main/java/io/github/auberonedu/equalsLivecode/Location.java diff --git a/src/main/java/io/github/auberonedu/equalsLivecode/App.java b/src/main/java/io/github/auberonedu/equalsLivecode/App.java index e2ef20f..2a6c706 100644 --- a/src/main/java/io/github/auberonedu/equalsLivecode/App.java +++ b/src/main/java/io/github/auberonedu/equalsLivecode/App.java @@ -11,20 +11,24 @@ 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 locC = locA; + // Centroid locA = new Centroid(4, 9, "Salamander"); + // Centroid locB = new Centroid(4, 9, "Salamander"); + // Centroid locC = locA; - System.out.println("Result of locA == locC " + (locA == locC)); - System.out.println("Result of locA.equals(locB) " + locA.equals(locA)); + // System.out.println("Result of locA == locC " + (locA == locC)); + // System.out.println("Result of locA.equals(locB) " + locA.equals(locA)); - Set centroids = new HashSet<>(); - System.out.println(locA.hashCode()); - System.out.println(locB.hashCode()); - centroids.add(locA); - centroids.add(locB); - System.out.println(centroids.size()); + // Set centroids = new HashSet<>(); + // System.out.println(locA.hashCode()); + // System.out.println(locB.hashCode()); + // centroids.add(locA); + // centroids.add(locB); + // System.out.println(centroids.size()); + Location a = new Location(5, 1, "food"); + Location b = new Location(5,1,"food"); + + System.out.println(a.equals(b)); //videoDemo(); diff --git a/src/main/java/io/github/auberonedu/equalsLivecode/Location.java b/src/main/java/io/github/auberonedu/equalsLivecode/Location.java new file mode 100644 index 0000000..021c974 --- /dev/null +++ b/src/main/java/io/github/auberonedu/equalsLivecode/Location.java @@ -0,0 +1,7 @@ +package io.github.auberonedu.equalsLivecode; + +public record Location (int x, int y, String label){ + +} + +