Skip to content

Artemis: Refactor Primes Class for Enhanced Efficiency and Code Quality #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mike-turintech wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Artemis: Refactor Primes Class for Enhanced Efficiency and Code Quality #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 21 additions & 11 deletions app/src/main/java/algorithms/Primes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package algorithms;
import java.util.Vector;
import java.util.ArrayList;

public class Primes {
/**
Expand All @@ -12,8 +12,9 @@ public static boolean IsPrime(int n) {
if (n < 2) {
return false;
}
for (int i = 2; i < n; i++) {
if (n % i == 0 && i != n) {
// Optimize prime checking with square root limit
for (int i = 2; i <= Math.sqrt(n); i++) {
if (n % i == 0) {
return false;
}
}
Expand All @@ -28,9 +29,9 @@ public static boolean IsPrime(int n) {
*/
public static int SumPrimes(int n) {
int sum = 0;
for (int i = 0; i < n; i++) {
for (int i = 2; i < n; i++) {
if (IsPrime(i)) {
sum = sum + i;
sum += i;
}
}
return sum;
Expand All @@ -42,14 +43,23 @@ 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<Integer> PrimeFactors(int n) {
Vector<Integer> ret = new Vector<Integer>();
public static ArrayList<Integer> PrimeFactors(int n) {
ArrayList<Integer> ret = new ArrayList<>();

for (int i = 2; i < n; i++) {
if (n % i == 0 && IsPrime(i)) {
ret.add(i);
for (int i = 2; i <= Math.sqrt(n); i++) {
while (n % i == 0) {
if (IsPrime(i)) {
ret.add(i);
}
n /= i;
}
}

// If n > 1, it means n itself is a prime factor
if (n > 1) {
ret.add(n);
}

return ret;
}
}
}