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..4f9985e
--- /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..1ff8462 100644
--- a/src/main/java/dev/Main.java
+++ b/src/main/java/dev/Main.java
@@ -1,9 +1,11 @@
package dev;
+import dev.model.Student;
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,31 +35,32 @@ public class Main {
List data = FileManager.loadStudents("students.txt");
- // TODO:
- // Split data into 3 parts
+ List part1 = data.subList(0,data.size()/3);
- List part1 = null;
+ List part2 = data.subList(data.size()/3,2 * data.size()/3);
- List part2 = null;
+ List part3 = data.subList(2 * data.size()/3,data.size());
- List part3 = null;
- // TODO:
+ StudentLoader t1 = new StudentLoader(part1);
- StudentLoader t1 = null;
+ StudentLoader t2 = new StudentLoader(part2);
- StudentLoader t2 = null;
+ StudentLoader t3 = new StudentLoader(part3);
- StudentLoader t3 = null;
- // TODO:
+ t1.start();
+ t2.start();
+ t3.start();
- // start()
+ t1.join();
+ t2.join();
+ t3.join();
- // join()
-
- // merge results
+ manager.addStudents(t1.getStudents());
+ manager.addStudents(t2.getStudents());
+ manager.addStudents(t3.getStudents());
}
diff --git a/src/main/java/dev/model/Student.java b/src/main/java/dev/model/Student.java
index f0484f4..b5023d5 100644
--- a/src/main/java/dev/model/Student.java
+++ b/src/main/java/dev/model/Student.java
@@ -40,31 +40,15 @@ public class Student {
@Override
public int hashCode() {
+ return id % 97;
- // TODO:
- // Return custom hash
-
- // Example:
- // return id % 97;
-
- return 0;
}
@Override
public boolean equals(Object obj) {
-
- // TODO:
-
- // Step 1:
- // Check null
-
- // Step 2:
- // Convert obj to Student
-
- // Step 3:
- // Compare IDs
-
- return false;
+ if (obj == null) return false;
+ Student student = (Student) obj;
+ return id == student.id;
}
@Override
diff --git a/src/main/java/dev/service/StudentManager.java b/src/main/java/dev/service/StudentManager.java
index 403a1c6..f35ec92 100644
--- a/src/main/java/dev/service/StudentManager.java
+++ b/src/main/java/dev/service/StudentManager.java
@@ -11,34 +11,25 @@ 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 student : students) {
+ if (student.getId() == id) {
+ return student;
+ }
+ }
return null;
}
public boolean removeStudent(int id) {
-
- // TODO:
-
- // Find student
-
- // Remove student
-
+ for (Student student : students) {
+ if (student.getId() == id) {
+ students.remove(student);
+ }
+ }
return false;
}
diff --git a/src/main/java/dev/thread/StudentLoader.java b/src/main/java/dev/thread/StudentLoader.java
index ab47522..9664c39 100644
--- a/src/main/java/dev/thread/StudentLoader.java
+++ b/src/main/java/dev/thread/StudentLoader.java
@@ -25,27 +25,15 @@ 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[] splits = line.split(",");
+ int id = Integer.parseInt(splits[0]);
+ String name = splits[1];
+ String major = splits[2];
+ double gpa = Double.parseDouble(splits[3]);
+ Student student = new Student(id, name, major, gpa);
+ students.add(student);
}
diff --git a/src/main/java/dev/utils/FileManager.java b/src/main/java/dev/utils/FileManager.java
index da7f6f5..133b842 100644
--- a/src/main/java/dev/utils/FileManager.java
+++ b/src/main/java/dev/utils/FileManager.java
@@ -17,11 +17,7 @@ public class FileManager {
String line;
while ((line = reader.readLine()) != null) {
-
- // TODO:
-
- // Add line to list
-
+ lines.add(line);
}
reader.close();