From 50ac708dbd521662d1ae3cfd5e656ddee545c78a Mon Sep 17 00:00:00 2001 From: TurinTech Bot Date: Mon, 20 Jan 2025 11:32:27 +0000 Subject: [PATCH] Artemis Changes --- app/src/main/java/control/Single.java | 26 +++++++------------ .../main/java/datastructures/DsVector.java | 14 +++------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/control/Single.java b/app/src/main/java/control/Single.java index 8fefbb8..45a3471 100644 --- a/app/src/main/java/control/Single.java +++ b/app/src/main/java/control/Single.java @@ -11,15 +11,7 @@ public class Single { * @return The sum of the first n natural numbers. */ public static int sumRange(int n) { - int[] arr = new int[n]; - int sum = 0; - for (int i = 0; i < n; i++) { - arr[i] = i; - } - for (int i : arr) { - sum += i; - } - return sum; + return n * (n - 1) / 2; } /** @@ -29,7 +21,10 @@ public static int sumRange(int n) { * @return The maximum value in the array. */ public static int maxArray(int[] arr) { - int max = 0; + if (arr == null || arr.length == 0) { + return Integer.MIN_VALUE; // Or throw an exception + } + int max = arr[0]; for (int i : arr) { if (i > max) { max = i; @@ -45,13 +40,10 @@ public static int maxArray(int[] arr) { * @param m The modulus. */ public static int sumModulus(int n, int m) { - Vector multiples = new Vector(); - for (int i = 0; i < n; i++) { - if (i % m == 0) { - multiples.add(i); - } + int sum = 0; + for (int i = 0; i < n; i += m) { + sum += i; } - - return multiples.stream().mapToInt(Integer::valueOf).sum(); + return sum; } } diff --git a/app/src/main/java/datastructures/DsVector.java b/app/src/main/java/datastructures/DsVector.java index 75f17ed..fc9d8cd 100644 --- a/app/src/main/java/datastructures/DsVector.java +++ b/app/src/main/java/datastructures/DsVector.java @@ -1,6 +1,7 @@ package datastructures; import java.util.Vector; +import java.util.Collections; public class DsVector { /** @@ -40,16 +41,7 @@ public static Vector searchVector(Vector v, int n) { */ public static Vector sortVector(Vector v) { Vector ret = new Vector(v); - - for (int i = 0; i < ret.size(); i++) { - for (int j = 0; j < ret.size() - 1; j++) { - if (ret.get(j) > ret.get(j + 1)) { - int temp = ret.get(j); - ret.set(j, ret.get(j + 1)); - ret.set(j + 1, temp); - } - } - } + Collections.sort(ret); return ret; } @@ -106,4 +98,4 @@ public static Vector mergeVectors(Vector v1, } return ret; } -} +} \ No newline at end of file