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..f4fe6ed
--- /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..883ce58 100644
--- a/src/main/java/dev/Main.java
+++ b/src/main/java/dev/Main.java
@@ -1,5 +1,6 @@
package dev;
+import dev.model.Student;
import dev.service.StudentManager;
import dev.thread.StudentLoader;
import dev.utils.FileManager;
@@ -33,32 +34,30 @@ public class Main {
List data = FileManager.loadStudents("students.txt");
- // TODO:
+ List part1 = data.subList(0, 20);
- // Split data into 3 parts
+ List part2 = data.subList(20, 40);
- List part1 = null;
+ List part3 = data.subList(40, 60);
- List part2 = null;
- List part3 = null;
+ StudentLoader t1 = new StudentLoader(part1);
- // TODO:
+ StudentLoader t2 = new StudentLoader(part2);
- StudentLoader t1 = null;
+ StudentLoader t3 = new StudentLoader(part3);
- StudentLoader t2 = null;
+ t1.start();
+ t2.start();
+ t3.start();
- StudentLoader t3 = null;
-
- // TODO:
-
- // start()
-
- // join()
-
- // merge results
+ t1.join();
+ t2.join();
+ t3.join();
+ manager.addStudents(t1.getStudents());
+ manager.addStudents(t2.getStudents());
+ manager.addStudents(t3.getStudents());
}
case 2 -> {
@@ -67,7 +66,8 @@ public class Main {
int id = scanner.nextInt();
- System.out.println(manager.searchStudent(id));
+ Student s = manager.searchStudent(id);
+ System.out.println(s != null ? s : "Not found");
}
diff --git a/src/main/java/dev/model/Student.java b/src/main/java/dev/model/Student.java
index f0484f4..54cb5dd 100644
--- a/src/main/java/dev/model/Student.java
+++ b/src/main/java/dev/model/Student.java
@@ -40,31 +40,16 @@ public class Student {
@Override
public int hashCode() {
-
- // TODO:
- // Return custom hash
-
- // Example:
- // return id % 97;
-
- return 0;
+ return this.id % 97;
}
@Override
public boolean equals(Object obj) {
- // TODO:
+ if (obj == null || getClass() != obj.getClass()) return false;
- // Step 1:
- // Check null
-
- // Step 2:
- // Convert obj to Student
-
- // Step 3:
- // Compare IDs
-
- return false;
+ Student s = (Student) obj;
+ return s.id == this.id;
}
@Override
diff --git a/src/main/java/dev/service/StudentManager.java b/src/main/java/dev/service/StudentManager.java
index 403a1c6..6125090 100644
--- a/src/main/java/dev/service/StudentManager.java
+++ b/src/main/java/dev/service/StudentManager.java
@@ -11,33 +11,31 @@ public class StudentManager {
public void addStudents(ArrayList newStudents) {
- // TODO:
-
- // Merge students
-
- // Hint:
- // addAll()
-
+ students.addAll(newStudents);
}
public Student searchStudent(int id) {
- // TODO:
-
- // Loop through students
-
- // Compare IDs
-
+ for (Student s : students)
+ {
+ if (id == s.getId())
+ {
+ return s;
+ }
+ }
return null;
}
public boolean removeStudent(int id) {
- // TODO:
-
- // Find student
-
- // Remove student
+ for (Student s : students)
+ {
+ if (id == s.getId())
+ {
+ 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..bcc9476 100644
--- a/src/main/java/dev/thread/StudentLoader.java
+++ b/src/main/java/dev/thread/StudentLoader.java
@@ -25,30 +25,17 @@ public class StudentLoader extends Thread {
@Override
public void run() {
- // TODO:
-
- /*
- Example line:
-
- 1001,Aryan,Computer Science,3.7
- */
-
for (String line : lines) {
- // TODO:
- // split line
-
- // TODO:
- // read values
-
- // TODO:
- // create Student
-
- // TODO:
- // add to students list
+ String[] parts = line.split(",");
+ int id = Integer.parseInt(parts[0]);
+ String name = parts[1];
+ String major = parts[2];
+ double gpa = Double.parseDouble(parts[3]);
+ Student student = new Student(id, name, major, gpa);
+ students.add(student);
}
-
}
public ArrayList getStudents() {
diff --git a/src/main/java/dev/utils/FileManager.java b/src/main/java/dev/utils/FileManager.java
index da7f6f5..075879c 100644
--- a/src/main/java/dev/utils/FileManager.java
+++ b/src/main/java/dev/utils/FileManager.java
@@ -18,9 +18,7 @@ public class FileManager {
while ((line = reader.readLine()) != null) {
- // TODO:
-
- // Add line to list
+ lines.add(line);
}