From 6dd9c30f87ca5a460b65eb95ffce84b418cc80a5 Mon Sep 17 00:00:00 2001 From: TurinTech Bot Date: Wed, 22 Jan 2025 12:28:55 +0000 Subject: [PATCH] Artemis Changes --- app/src/main/java/algorithms/Primes.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/algorithms/Primes.java b/app/src/main/java/algorithms/Primes.java index bfa903e..9243a8f 100644 --- a/app/src/main/java/algorithms/Primes.java +++ b/app/src/main/java/algorithms/Primes.java @@ -1,4 +1,6 @@ package algorithms; +import java.util.List; +import java.util.ArrayList; import java.util.Vector; public class Primes { @@ -28,11 +30,15 @@ public static boolean IsPrime(int n) { */ public static int SumPrimes(int n) { int sum = 0; - for (int i = 0; i < n; i++) { + List primes = new ArrayList<>(); + for (int i = 2; i <= n; i++) { if (IsPrime(i)) { - sum = sum + i; + primes.add(i); } } + for (int p : primes) { + sum += p; + } return sum; } @@ -42,8 +48,8 @@ public static int SumPrimes(int n) { * @param n The number to find the prime factors of. * @return An vector of all prime factors of n. */ - public static Vector PrimeFactors(int n) { - Vector ret = new Vector(); + public static List PrimeFactors(int n) { + List ret = new ArrayList<>(); for (int i = 2; i * i <= n; i++) { // Optimized loop condition while (n % i == 0 && IsPrime(i)) { // Optimized to handle repeated factors