From 195840dfdc99fc9f5f1d0d908534d91944bd8360 Mon Sep 17 00:00:00 2001 From: Eren Date: Sat, 28 Mar 2026 09:56:03 +0100 Subject: [PATCH 1/5] Solution to my excercise 21 --- ArrayMinMax.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 ArrayMinMax.java diff --git a/ArrayMinMax.java b/ArrayMinMax.java new file mode 100644 index 0000000..e69de29 From 5f80e5703403dbf369b02a2a823d1311ef57034d Mon Sep 17 00:00:00 2001 From: Eren Date: Sat, 28 Mar 2026 09:57:42 +0100 Subject: [PATCH 2/5] Solution to my excercise 1 --- ArrayMinMax.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/ArrayMinMax.java b/ArrayMinMax.java index e69de29..9bb13cf 100644 --- a/ArrayMinMax.java +++ b/ArrayMinMax.java @@ -0,0 +1,59 @@ +package amazon.learn.week2.arrayList; + +import java.util.Random; + +public class ArrayMinMax { + + int size = 10; + int[] numbers = new int[size]; + + // fill the numbers + public void fillNumbers() { + Random random = new Random(); + for (int i = 0; i < numbers.length; i++) { + numbers[i] = random.nextInt(); + } + } + + // print them + public void printNumbers() { + Random random = new Random(); + for (int i = 0; i < numbers.length; i++) { + System.out.print(numbers[i] + " "); + } + System.out.println(); + } + + // sort them + public void sortNumbers() { + for (int j = 0; j < numbers.length; j++) { + for (int i = 0; i < numbers.length - 1; i++) { + if (numbers[i] > numbers[i + 1]) { + + int temp = numbers[i]; + numbers[i] = numbers[i + 1]; + numbers[i + 1] = temp; + } + } + } + } + + public static void main(String[] args) { + // print them + BubbleSort bs = new BubbleSort(); + + System.out.println("Before Sorting"); + bs.fillNumbers(); + //bs.printNumbers(); + + long before = System.currentTimeMillis(); // after 1.1.1978 + bs.sortNumbers(); + long after = System.currentTimeMillis(); + + System.out.println("Sorting took " + (after - before) + " ms"); + //bs.printNumbers(); + + + } + +} From e659dc38c777c900e86af3388de7a8e0242bef8a Mon Sep 17 00:00:00 2001 From: Eren Date: Sat, 28 Mar 2026 09:59:55 +0100 Subject: [PATCH 3/5] Solution to my excercise 1 --- ArrayMinMax.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ArrayMinMax.java b/ArrayMinMax.java index 9bb13cf..e840d23 100644 --- a/ArrayMinMax.java +++ b/ArrayMinMax.java @@ -21,7 +21,7 @@ public void printNumbers() { for (int i = 0; i < numbers.length; i++) { System.out.print(numbers[i] + " "); } - System.out.println(); + System.out.println("hello"); } // sort them From 7491c40a2161acc87b303267f7eef72838fe5969 Mon Sep 17 00:00:00 2001 From: kusimoto Date: Wed, 1 Apr 2026 17:51:58 +0200 Subject: [PATCH 4/5] Week 2 GitHub Tasts --- Task1and2/ArrayMinMax.java | 27 ++++++++++++++++++ Task1and2/ArraySecondMin.java | 23 +++++++++++++++ Task3and4and5/Company.java | 36 +++++++++++++++++++++++ Task3and4and5/Employee.java | 54 +++++++++++++++++++++++++++++++++++ Task3and4and5/Intern.java | 30 +++++++++++++++++++ lab-java-basics.iml | 11 +++++++ 6 files changed, 181 insertions(+) create mode 100644 Task1and2/ArrayMinMax.java create mode 100644 Task1and2/ArraySecondMin.java create mode 100644 Task3and4and5/Company.java create mode 100644 Task3and4and5/Employee.java create mode 100644 Task3and4and5/Intern.java create mode 100644 lab-java-basics.iml diff --git a/Task1and2/ArrayMinMax.java b/Task1and2/ArrayMinMax.java new file mode 100644 index 0000000..480db34 --- /dev/null +++ b/Task1and2/ArrayMinMax.java @@ -0,0 +1,27 @@ +package amazon.learn.week2.arrayList.Task1and2; + +public class ArrayMinMax { + + public static void main(String[] args) { + // Difference between smallest and largest array - integer + int[] bunchOfNumbers = {7, 15, 444, 80, 5, 29}; + + int largest = 0; + for (int i = 0; i < bunchOfNumbers.length; i++) { + if( bunchOfNumbers[i] > bunchOfNumbers[largest]) { + largest = i; + } + } + System.out.println("Largest number from the list is: " + bunchOfNumbers[largest]); + + int smallest = 0; + for (int i = 0; i < bunchOfNumbers.length; i++) { + if( bunchOfNumbers[i] < bunchOfNumbers[smallest]) { + smallest = i; + } + } + System.out.println("Smallest number from the list is: " + bunchOfNumbers[smallest]); + } +} + + diff --git a/Task1and2/ArraySecondMin.java b/Task1and2/ArraySecondMin.java new file mode 100644 index 0000000..8524a4c --- /dev/null +++ b/Task1and2/ArraySecondMin.java @@ -0,0 +1,23 @@ +package amazon.learn.week2.arrayList.Task1and2; + +public class ArraySecondMin { + + public static void main(String[] args) { + // Smallest and Second smallest value + int[] bunchOfNumbers = {2, 62, 84, 79, 4, 29}; + + int smallest = Integer.MAX_VALUE; + int secondSmallest = Integer.MAX_VALUE; + for (int bunchOfNumber : bunchOfNumbers) { + if (bunchOfNumber < smallest) { + secondSmallest = smallest; + smallest = bunchOfNumber; + } else if (bunchOfNumber < secondSmallest && bunchOfNumber != smallest) { + secondSmallest = bunchOfNumber; + } + } + + System.out.println("Smallest number: " + smallest); + System.out.println("Second smallest number: " + secondSmallest); + } +} \ No newline at end of file diff --git a/Task3and4and5/Company.java b/Task3and4and5/Company.java new file mode 100644 index 0000000..a5556d8 --- /dev/null +++ b/Task3and4and5/Company.java @@ -0,0 +1,36 @@ +package amazon.learn.week2.arrayList.Task3and4and5; + +import java.util.ArrayList; + +public class Company { + + ArrayList employees; + + public static void main(String[] args) { + + Company ironhack = new Company(); + ironhack.employees = new ArrayList<>(); + + ironhack.employees.add(new Employee("Jack", "Catman", 32500, 30)); + ironhack.employees.add(new Employee("Mark", "Dogman", 34500, 30)); + ironhack.employees.add(new Employee("Jenny", "Mouseman", 45000, 40)); + ironhack.employees.add(new Employee("Celine", "Zebraman", 45000, 40)); + ironhack.employees.add(new Employee("Maria", "Rabbitman", 42500, 40)); + ironhack.employees.add(new Employee("Murasaki", "Snakeman", 32500, 30)); + ironhack.employees.add(new Intern("Joe", "Giraffeman", 15000, 10)); + ironhack.employees.add(new Intern("Ellie", "Lionman", 15000, 10)); + ironhack.employees.add(new Employee("Marco", "Tigerman", 32500, 30)); + ironhack.employees.add(new Employee("Saya", "Hamsteraman", 34500, 30)); + + ironhack.employees.forEach(System.out::println); + System.out.println(); + + for (Employee emp : ironhack.employees) { + if (emp instanceof Intern) { + emp.setSalary(25000); + } + } + } +} + + diff --git a/Task3and4and5/Employee.java b/Task3and4and5/Employee.java new file mode 100644 index 0000000..1d5da6e --- /dev/null +++ b/Task3and4and5/Employee.java @@ -0,0 +1,54 @@ +package amazon.learn.week2.arrayList.Task3and4and5; + +public class Employee { + + private String name; + private String lastName; + private double workHours; + private int salary; + + public Employee(String name, String lastName, int salary, double workHours) { + this.name = name; + this.salary = salary; + this.workHours = workHours; + this.lastName = lastName; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getSalary() { + return salary; + } + + public int setSalary(int salary) { + this.salary = salary; + return salary; + } + + public double getWorkHours() { + return workHours; + } + + public void setWorkHours(double workHours) { + this.workHours = workHours; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + @Override + public String toString() { + return "Our Employee " + name + " " + lastName + " works " + workHours + " hours a week and has a salary of: " + salary + "$"; + } +} diff --git a/Task3and4and5/Intern.java b/Task3and4and5/Intern.java new file mode 100644 index 0000000..0f190c9 --- /dev/null +++ b/Task3and4and5/Intern.java @@ -0,0 +1,30 @@ +package amazon.learn.week2.arrayList.Task3and4and5; + +public class Intern extends Employee { + + public Intern(String name, String lastName, int salary, double workHours) { + super(name, lastName, salary, workHours); + } + + + + @Override + public int getSalary() { + return super.getSalary(); + } + + @Override + public int setSalary(int salary) { + if (salary > 0 && salary <= 20000) { + super.setSalary(salary); + } else { + System.out.println("Please enter a valid salary. Intern salary cannot exceed 20,000."); + } + return salary; + } + + @Override + public String toString() { + return "Our Intern " + getName() + " " + getLastName() + " works " + getWorkHours() + " hours a week and has a salary of: " + getSalary() + "$"; + } +} diff --git a/lab-java-basics.iml b/lab-java-basics.iml new file mode 100644 index 0000000..3d66bd0 --- /dev/null +++ b/lab-java-basics.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file From ab0fbcc7c4d94e29f2b0fea4b181abb98e13f7c4 Mon Sep 17 00:00:00 2001 From: Eren <78030053+ilearnprogramms@users.noreply.github.com> Date: Wed, 1 Apr 2026 17:54:26 +0200 Subject: [PATCH 5/5] Delete ArrayMinMax.java --- ArrayMinMax.java | 59 ------------------------------------------------ 1 file changed, 59 deletions(-) delete mode 100644 ArrayMinMax.java diff --git a/ArrayMinMax.java b/ArrayMinMax.java deleted file mode 100644 index e840d23..0000000 --- a/ArrayMinMax.java +++ /dev/null @@ -1,59 +0,0 @@ -package amazon.learn.week2.arrayList; - -import java.util.Random; - -public class ArrayMinMax { - - int size = 10; - int[] numbers = new int[size]; - - // fill the numbers - public void fillNumbers() { - Random random = new Random(); - for (int i = 0; i < numbers.length; i++) { - numbers[i] = random.nextInt(); - } - } - - // print them - public void printNumbers() { - Random random = new Random(); - for (int i = 0; i < numbers.length; i++) { - System.out.print(numbers[i] + " "); - } - System.out.println("hello"); - } - - // sort them - public void sortNumbers() { - for (int j = 0; j < numbers.length; j++) { - for (int i = 0; i < numbers.length - 1; i++) { - if (numbers[i] > numbers[i + 1]) { - - int temp = numbers[i]; - numbers[i] = numbers[i + 1]; - numbers[i + 1] = temp; - } - } - } - } - - public static void main(String[] args) { - // print them - BubbleSort bs = new BubbleSort(); - - System.out.println("Before Sorting"); - bs.fillNumbers(); - //bs.printNumbers(); - - long before = System.currentTimeMillis(); // after 1.1.1978 - bs.sortNumbers(); - long after = System.currentTimeMillis(); - - System.out.println("Sorting took " + (after - before) + " ms"); - //bs.printNumbers(); - - - } - -}