From ed246e298eac7d197ecf41246f03b045b4df97ad Mon Sep 17 00:00:00 2001 From: angie-3 Date: Wed, 23 Oct 2024 11:42:20 +0000 Subject: [PATCH 1/5] changes made to lesson 12 stack and java. --- .../codedifferently/lesson12/Lesson12.java | 19 ++++++++++++++++++- .../com/codedifferently/lesson12/Stack.java | 12 ++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java b/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java index af7663e90..e7df80ac5 100644 --- a/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java +++ b/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java @@ -7,6 +7,23 @@ public class Lesson12 { * https://github.com/yang-su2000/Leetcode-algorithm-practice/tree/master/3062-winner-of-the-linked-list-game */ public String gameResult(ListNode head) { - return null; + + ListNode current = head; + int evenTeam = 0; + int oddTeam = 0; + while (current != null) { + if (current.val < current.next.val) { + oddTeam++; + } else if (current.val > current.next.val) { + evenTeam++; + } + current = current.next.next; + } + + if (evenTeam < oddTeam) { + return "oddTeamwins"; + } else if (evenTeam > oddTeam) { + return "eveTeamwins"; + } else return "tie"; } } diff --git a/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Stack.java b/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Stack.java index 8444fceca..56592d7d6 100644 --- a/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Stack.java +++ b/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Stack.java @@ -9,18 +9,22 @@ public Stack() { } public void push(int value) { - // Your code here + ListNode first = new ListNode(value); + first.next = top; + top = first; } public int pop() { - return 0; + int value = top.val; + top = top.next; + return value; } public int peek() { - return 0; + return top.val; } public boolean isEmpty() { - return true; + return top == null; } } From 84e285ad0f38558c57fb2fb91e4a82412cf716c0 Mon Sep 17 00:00:00 2001 From: angie-3 Date: Wed, 23 Oct 2024 11:50:40 +0000 Subject: [PATCH 2/5] feat: fixed changes --- .../src/main/java/com/codedifferently/lesson12/Lesson12.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java b/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java index e7df80ac5..d289d6df2 100644 --- a/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java +++ b/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java @@ -2,10 +2,7 @@ public class Lesson12 { - /** - * Provide the solution to LeetCode 3062 here: - * https://github.com/yang-su2000/Leetcode-algorithm-practice/tree/master/3062-winner-of-the-linked-list-game - */ + public String gameResult(ListNode head) { ListNode current = head; From 7cf7a9b5d72e8ec17b51e779105aed418bfd2b27 Mon Sep 17 00:00:00 2001 From: angie-3 Date: Wed, 23 Oct 2024 12:12:18 +0000 Subject: [PATCH 3/5] fix: bug in code --- .../main/java/com/codedifferently/lesson12/Lesson12.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java b/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java index d289d6df2..8e8fc889f 100644 --- a/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java +++ b/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java @@ -2,7 +2,10 @@ public class Lesson12 { - + /** + * Provide the solution to LeetCode 3062 here: + * https://github.com/yang-su2000/Leetcode-algorithm-practice/tree/master/3062-winner-of-the-linked-list-game + */ public String gameResult(ListNode head) { ListNode current = head; @@ -20,7 +23,7 @@ public String gameResult(ListNode head) { if (evenTeam < oddTeam) { return "oddTeamwins"; } else if (evenTeam > oddTeam) { - return "eveTeamwins"; + return "evenTeamwins"; } else return "tie"; } } From ea64f97d8cd2f2d0a04411771c51cc81649322a4 Mon Sep 17 00:00:00 2001 From: angie-3 Date: Wed, 23 Oct 2024 12:16:25 +0000 Subject: [PATCH 4/5] feature: fix error --- .../src/main/java/com/codedifferently/lesson12/Lesson12.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java b/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java index 8e8fc889f..9c1d3981b 100644 --- a/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java +++ b/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java @@ -21,9 +21,9 @@ public String gameResult(ListNode head) { } if (evenTeam < oddTeam) { - return "oddTeamwins"; + return "odd"; } else if (evenTeam > oddTeam) { - return "evenTeamwins"; + return "even"; } else return "tie"; } } From 3e580310947b117ab965d29bebb0e589a2f0dbe4 Mon Sep 17 00:00:00 2001 From: angie-3 Date: Wed, 23 Oct 2024 12:33:10 +0000 Subject: [PATCH 5/5] feat:fixed bug --- .../main/java/com/codedifferently/lesson12/Lesson12.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java b/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java index 9c1d3981b..42bc5c21b 100644 --- a/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java +++ b/lesson_12/structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java @@ -21,9 +21,9 @@ public String gameResult(ListNode head) { } if (evenTeam < oddTeam) { - return "odd"; + return "Odd"; } else if (evenTeam > oddTeam) { - return "even"; - } else return "tie"; + return "Even"; + } else return "Tie"; } }