diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..ab1f416
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,10 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..a590144
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..aa00ffa
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..105dbd3
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..eba6e1f
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/dev/Main.java b/src/main/java/dev/Main.java
index 19ca657..c5d94e3 100644
--- a/src/main/java/dev/Main.java
+++ b/src/main/java/dev/Main.java
@@ -4,6 +4,7 @@ import dev.service.StudentManager;
import dev.thread.StudentLoader;
import dev.utils.FileManager;
+import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
@@ -33,32 +34,37 @@ public class Main {
List data = FileManager.loadStudents("students.txt");
- // TODO:
+ ArrayList part1 = new ArrayList<>();
+ ArrayList part2 = new ArrayList<>();
+ ArrayList part3 = new ArrayList<>();
- // Split data into 3 parts
+ for(int i=0; i part1 = null;
+ StudentLoader t1 = new StudentLoader(part1);
+ StudentLoader t2 = new StudentLoader(part2);
+ StudentLoader t3 = new StudentLoader(part3);
- List part2 = null;
+ t1.start();
+ t2.start();
+ t3.start();
- List part3 = null;
+ t1.join();
+ t2.join();
+ t3.join();
- // TODO:
-
- StudentLoader t1 = null;
-
- StudentLoader t2 = null;
-
- StudentLoader t3 = null;
-
- // TODO:
-
- // start()
-
- // join()
-
- // merge results
+ manager.addStudents(t1.getStudents());
+ manager.addStudents(t2.getStudents());
+ manager.addStudents(t3.getStudents());
+ System.out.println("Students loaded successfully.");
}
case 2 -> {
diff --git a/src/main/java/dev/model/Student.java b/src/main/java/dev/model/Student.java
index f0484f4..ef5804e 100644
--- a/src/main/java/dev/model/Student.java
+++ b/src/main/java/dev/model/Student.java
@@ -40,31 +40,20 @@ public class Student {
@Override
public int hashCode() {
-
- // TODO:
- // Return custom hash
-
- // Example:
- // return id % 97;
-
- return 0;
+ return this.getId() % 97;
}
@Override
public boolean equals(Object obj) {
+ if (obj == null) return false;
- // TODO:
+ if (this == obj) return true;
- // Step 1:
- // Check null
+ if (this.getClass() != obj.getClass()) return false;
- // Step 2:
- // Convert obj to Student
+ Student other = (Student) obj;
- // Step 3:
- // Compare IDs
-
- return false;
+ return this.id == other.id;
}
@Override
diff --git a/src/main/java/dev/service/StudentManager.java b/src/main/java/dev/service/StudentManager.java
index 403a1c6..83bdb30 100644
--- a/src/main/java/dev/service/StudentManager.java
+++ b/src/main/java/dev/service/StudentManager.java
@@ -10,34 +10,28 @@ public class StudentManager {
private final ArrayList students = new ArrayList<>();
public void addStudents(ArrayList newStudents) {
-
- // TODO:
-
- // Merge students
-
- // Hint:
- // addAll()
-
+ if (newStudents != null && !newStudents.isEmpty()) {
+ students.addAll(newStudents);
+ }
}
public Student searchStudent(int id) {
-
- // TODO:
-
- // Loop through students
-
- // Compare IDs
+ for (Student student: students) {
+ if (student.getId() == id) {
+ return student;
+ }
+ }
return null;
}
public boolean removeStudent(int id) {
+ Student s = searchStudent(id);
- // TODO:
-
- // Find student
-
- // Remove student
+ if (s != null) {
+ students.remove(s);
+ return true;
+ }
return false;
}
diff --git a/src/main/java/dev/thread/StudentLoader.java b/src/main/java/dev/thread/StudentLoader.java
index ab47522..2c0dfd4 100644
--- a/src/main/java/dev/thread/StudentLoader.java
+++ b/src/main/java/dev/thread/StudentLoader.java
@@ -24,35 +24,27 @@ public class StudentLoader extends Thread {
@Override
public void run() {
-
- // TODO:
-
- /*
- Example line:
-
- 1001,Aryan,Computer Science,3.7
- */
-
for (String line : lines) {
+ try {
+ String[] parts = line.split(",");
- // TODO:
- // split line
+ if(parts.length == 4) {
+ int id = Integer.parseInt(parts[0].trim());
+ String name = parts[1].trim();
+ String major = parts[2].trim();
+ double gpa = Double.parseDouble(parts[3].trim());
- // TODO:
- // read values
-
- // TODO:
- // create Student
-
- // TODO:
- // add to students list
+ Student student = new Student(id,name,major,gpa);
+ students.add(student);
+ }
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ }
}
-
}
public ArrayList getStudents() {
-
return students;
}
diff --git a/src/main/java/dev/utils/FileManager.java b/src/main/java/dev/utils/FileManager.java
index da7f6f5..d66f1b2 100644
--- a/src/main/java/dev/utils/FileManager.java
+++ b/src/main/java/dev/utils/FileManager.java
@@ -17,11 +17,9 @@ public class FileManager {
String line;
while ((line = reader.readLine()) != null) {
-
- // TODO:
-
- // Add line to list
-
+ if (!line.trim().isEmpty()) {
+ lines.add(line);
+ }
}
reader.close();