From 67ff9a73df6d0a163b390c94fea79a8f61589c32 Mon Sep 17 00:00:00 2001 From: Yahli Date: Sun, 3 Aug 2025 16:37:52 +0300 Subject: [PATCH 01/18] Until exercise 5 --- src/src/Bed.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/src/Bed.java b/src/src/Bed.java index 075f78a..a339628 100644 --- a/src/src/Bed.java +++ b/src/src/Bed.java @@ -2,16 +2,22 @@ public class Bed { private double height; private int pillows; private String SheetsColor; + private int price; - public Bed (double height, int pillows, String SheetsColor) { + public Bed (double height, int pillows, String SheetsColor, int price) { this.height = height; this.pillows = pillows; this.SheetsColor = SheetsColor; + this.price = price; } public Bed (double height, String SheetsColor) { this.height = height; this.SheetsColor = SheetsColor; this.pillows = 1; + this.price = 100; + } + public int getPrice() { + return price; } public double getHeight() { return height; @@ -22,4 +28,7 @@ public int getPillows() { public String getSheetsColor() { return SheetsColor; } + public void setSheetsColor(String SheetsColor) { + this.SheetsColor = SheetsColor; + } } From 628fa8c49158210233efb7a5b3968befcd95e238 Mon Sep 17 00:00:00 2001 From: Yahli Date: Sun, 3 Aug 2025 16:52:56 +0300 Subject: [PATCH 02/18] Until exercise8 --- src/src/Closet.java | 23 +++++++++++++++++++++++ src/src/Shirt.java | 16 ++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 src/src/Closet.java create mode 100644 src/src/Shirt.java diff --git a/src/src/Closet.java b/src/src/Closet.java new file mode 100644 index 0000000..4caf8f6 --- /dev/null +++ b/src/src/Closet.java @@ -0,0 +1,23 @@ +public class Closet { + private Shirt[] Shirts; + + public Closet(Shirt[] Shirts) { + this.Shirts = Shirts; + } + + public Shirt[] getShirts() { + return Shirts; + } + + public Shirt[] getShirtsBySize(Shirt[] shirts, int size) { + int Size = 0; + Shirt[] shirtsBySize = new Shirt[Size]; + for (int i = 0; i < shirts.length; i++) { + if (shirts[i].getSize() == size) { + shirtsBySize[Size] = shirts[i]; + Size++; + } + } + return shirtsBySize; + } +} diff --git a/src/src/Shirt.java b/src/src/Shirt.java new file mode 100644 index 0000000..045205b --- /dev/null +++ b/src/src/Shirt.java @@ -0,0 +1,16 @@ +public class Shirt { + public int size; + public String color; + + public Shirt(int size, String color) { + this.size = size; + this.color = color; + } + public int getSize() { + return size; + } + public String getColor() { + return color; + } + +} From 8dfdbcfdcc2ef24d0bb8b0bfd46e61cd783c167b Mon Sep 17 00:00:00 2001 From: Yahli Date: Sun, 3 Aug 2025 17:09:24 +0300 Subject: [PATCH 03/18] Until exercise 11 --- src/src/Closet.java | 4 ++++ src/src/Util.java | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 src/src/Util.java diff --git a/src/src/Closet.java b/src/src/Closet.java index 4caf8f6..be554a0 100644 --- a/src/src/Closet.java +++ b/src/src/Closet.java @@ -20,4 +20,8 @@ public Shirt[] getShirtsBySize(Shirt[] shirts, int size) { } return shirtsBySize; } + + public Shirt[] addShirts(Shirt[] shirts, Shirt add) { + return Util.addShirt(Shirts, add); + } } diff --git a/src/src/Util.java b/src/src/Util.java new file mode 100644 index 0000000..ae0c1d5 --- /dev/null +++ b/src/src/Util.java @@ -0,0 +1,11 @@ +public class Util { + + protected static Shirt[] addShirt (Shirt[] shirts, Shirt add) { + Shirt[] newShirts = new Shirt[shirts.length + 1]; + for (int i = 0; i < shirts.length; i++) { + newShirts[i] = shirts[i]; + } + newShirts[shirts.length+1] = add; + return newShirts; + } +} From 94850d06ac9e31790f038972e7cfa59f4768aad0 Mon Sep 17 00:00:00 2001 From: Yahli Date: Sun, 3 Aug 2025 17:16:15 +0300 Subject: [PATCH 04/18] Until exercise 13 --- src/src/Room.java | 22 ++++++++++++++++++++++ src/src/YahliConstants.java | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 src/src/Room.java create mode 100644 src/src/YahliConstants.java diff --git a/src/src/Room.java b/src/src/Room.java new file mode 100644 index 0000000..6e0536d --- /dev/null +++ b/src/src/Room.java @@ -0,0 +1,22 @@ +public class Room { + private Closet closet; + private Bed bed; + + public Room (Closet closet, Bed bed) { + this.closet = closet; + this.bed = bed; + } + + public Room (Bed bed, Shirt[] shirts) { + this.bed = bed; + this.closet = new Closet(shirts); + } + public Closet getCloset() { + return closet; + } + + public Bed getBed() { + return bed; + } + +} diff --git a/src/src/YahliConstants.java b/src/src/YahliConstants.java new file mode 100644 index 0000000..cf6d204 --- /dev/null +++ b/src/src/YahliConstants.java @@ -0,0 +1,3 @@ +public class YahliConstants { + +} From 9e10189122285932acf0250c270c1565da4db1f2 Mon Sep 17 00:00:00 2001 From: Yahli Date: Sun, 3 Aug 2025 19:54:35 +0300 Subject: [PATCH 05/18] Update 1 --- src/src/Bed.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/src/Bed.java b/src/src/Bed.java index a339628..8c2a566 100644 --- a/src/src/Bed.java +++ b/src/src/Bed.java @@ -1,20 +1,17 @@ public class Bed { private double height; private int pillows; - private String SheetsColor; + private String sheetsColor; private int price; public Bed (double height, int pillows, String SheetsColor, int price) { this.height = height; this.pillows = pillows; - this.SheetsColor = SheetsColor; + this.sheetsColor = SheetsColor; this.price = price; } public Bed (double height, String SheetsColor) { - this.height = height; - this.SheetsColor = SheetsColor; - this.pillows = 1; - this.price = 100; + this(height,1,SheetsColor,100); } public int getPrice() { return price; @@ -26,9 +23,9 @@ public int getPillows() { return pillows; } public String getSheetsColor() { - return SheetsColor; + return sheetsColor; } public void setSheetsColor(String SheetsColor) { - this.SheetsColor = SheetsColor; + this.sheetsColor = SheetsColor; } } From 45993166e991c3289615e780005fb0a0fda8a551 Mon Sep 17 00:00:00 2001 From: Yahli Date: Sun, 3 Aug 2025 20:10:49 +0300 Subject: [PATCH 06/18] Update 2 --- src/src/Bed.java | 10 +++++----- src/src/Closet.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/src/Bed.java b/src/src/Bed.java index 8c2a566..504643b 100644 --- a/src/src/Bed.java +++ b/src/src/Bed.java @@ -2,19 +2,19 @@ public class Bed { private double height; private int pillows; private String sheetsColor; - private int price; + private final int BED_PRICE; - public Bed (double height, int pillows, String SheetsColor, int price) { + public Bed (double height, int pillows, String SheetsColor, int BED_PRICE) { this.height = height; this.pillows = pillows; this.sheetsColor = SheetsColor; - this.price = price; + this.BED_PRICE = BED_PRICE; } public Bed (double height, String SheetsColor) { this(height,1,SheetsColor,100); } - public int getPrice() { - return price; + public int getBED_PRICE() { + return BED_PRICE; } public double getHeight() { return height; diff --git a/src/src/Closet.java b/src/src/Closet.java index be554a0..303d292 100644 --- a/src/src/Closet.java +++ b/src/src/Closet.java @@ -10,12 +10,12 @@ public Shirt[] getShirts() { } public Shirt[] getShirtsBySize(Shirt[] shirts, int size) { - int Size = 0; - Shirt[] shirtsBySize = new Shirt[Size]; + int arrSize = 1; + Shirt[] shirtsBySize = new Shirt[arrSize]; for (int i = 0; i < shirts.length; i++) { if (shirts[i].getSize() == size) { - shirtsBySize[Size] = shirts[i]; - Size++; + shirtsBySize[arrSize-1] = shirts[i]; + arrSize++; } } return shirtsBySize; From a7c16b838cafcbf40c811cd2bf284b1a92368164 Mon Sep 17 00:00:00 2001 From: Yahli Date: Wed, 6 Aug 2025 15:27:25 +0300 Subject: [PATCH 07/18] Update 2 --- src/src/Bed.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/src/Bed.java b/src/src/Bed.java index 504643b..58b66c5 100644 --- a/src/src/Bed.java +++ b/src/src/Bed.java @@ -4,14 +4,14 @@ public class Bed { private String sheetsColor; private final int BED_PRICE; - public Bed (double height, int pillows, String SheetsColor, int BED_PRICE) { + public Bed (double height, int pillows, String sheetsColor, int BED_PRICE) { this.height = height; this.pillows = pillows; - this.sheetsColor = SheetsColor; + this.sheetsColor = sheetsColor; this.BED_PRICE = BED_PRICE; } - public Bed (double height, String SheetsColor) { - this(height,1,SheetsColor,100); + public Bed (double height, String sheetsColor) { + this(height,1,sheetsColor,100); } public int getBED_PRICE() { return BED_PRICE; @@ -25,7 +25,7 @@ public int getPillows() { public String getSheetsColor() { return sheetsColor; } - public void setSheetsColor(String SheetsColor) { - this.sheetsColor = SheetsColor; + public void setSheetsColor(String sheetsColor) { + this.sheetsColor = sheetsColor; } } From 41f74c2cba54a0f06dfc52c8869549889851e822 Mon Sep 17 00:00:00 2001 From: Yahli Date: Wed, 6 Aug 2025 15:44:26 +0300 Subject: [PATCH 08/18] Update 3 --- src/src/Bed.java | 3 ++- src/src/Closet.java | 2 +- src/src/Room.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/src/Bed.java b/src/src/Bed.java index 58b66c5..507abfa 100644 --- a/src/src/Bed.java +++ b/src/src/Bed.java @@ -3,6 +3,7 @@ public class Bed { private int pillows; private String sheetsColor; private final int BED_PRICE; + private static final int default_BED_PRICE = 100; public Bed (double height, int pillows, String sheetsColor, int BED_PRICE) { this.height = height; @@ -11,7 +12,7 @@ public Bed (double height, int pillows, String sheetsColor, int BED_PRICE) { this.BED_PRICE = BED_PRICE; } public Bed (double height, String sheetsColor) { - this(height,1,sheetsColor,100); + this(height,1,sheetsColor,default_BED_PRICE); } public int getBED_PRICE() { return BED_PRICE; diff --git a/src/src/Closet.java b/src/src/Closet.java index 303d292..bdfe826 100644 --- a/src/src/Closet.java +++ b/src/src/Closet.java @@ -21,7 +21,7 @@ public Shirt[] getShirtsBySize(Shirt[] shirts, int size) { return shirtsBySize; } - public Shirt[] addShirts(Shirt[] shirts, Shirt add) { + public Shirt[] addShirts(Shirt add) { return Util.addShirt(Shirts, add); } } diff --git a/src/src/Room.java b/src/src/Room.java index 6e0536d..96c6cbc 100644 --- a/src/src/Room.java +++ b/src/src/Room.java @@ -1,6 +1,6 @@ public class Room { - private Closet closet; - private Bed bed; + private final Closet closet; + private final Bed bed; public Room (Closet closet, Bed bed) { this.closet = closet; From 933f6160cc9869aaa22d110c355537d5fbd75ad4 Mon Sep 17 00:00:00 2001 From: Yahli Date: Wed, 6 Aug 2025 15:58:48 +0300 Subject: [PATCH 09/18] Update 4 --- src/src/Bed.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/src/Bed.java b/src/src/Bed.java index 507abfa..41e4239 100644 --- a/src/src/Bed.java +++ b/src/src/Bed.java @@ -2,20 +2,20 @@ public class Bed { private double height; private int pillows; private String sheetsColor; - private final int BED_PRICE; - private static final int default_BED_PRICE = 100; + private final int price; + private static final int DEFAULT_BED_PRICE = 100; - public Bed (double height, int pillows, String sheetsColor, int BED_PRICE) { + public Bed (double height, int pillows, String sheetsColor, int price) { this.height = height; this.pillows = pillows; this.sheetsColor = sheetsColor; - this.BED_PRICE = BED_PRICE; + this.price = price; } public Bed (double height, String sheetsColor) { - this(height,1,sheetsColor,default_BED_PRICE); + this(height,1,sheetsColor,DEFAULT_BED_PRICE); } public int getBED_PRICE() { - return BED_PRICE; + return price; } public double getHeight() { return height; From ff1f25fce223d44fbd45ff7c5bfce58073c4efba Mon Sep 17 00:00:00 2001 From: Yahli Date: Wed, 6 Aug 2025 16:41:38 +0300 Subject: [PATCH 10/18] Update 5 --- src/src/Bed.java | 2 +- src/src/Closet.java | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/src/Bed.java b/src/src/Bed.java index 41e4239..8372c5a 100644 --- a/src/src/Bed.java +++ b/src/src/Bed.java @@ -14,7 +14,7 @@ public Bed (double height, int pillows, String sheetsColor, int price) { public Bed (double height, String sheetsColor) { this(height,1,sheetsColor,DEFAULT_BED_PRICE); } - public int getBED_PRICE() { + public int getPrice() { return price; } public double getHeight() { diff --git a/src/src/Closet.java b/src/src/Closet.java index bdfe826..8c56bbb 100644 --- a/src/src/Closet.java +++ b/src/src/Closet.java @@ -1,27 +1,33 @@ public class Closet { - private Shirt[] Shirts; + private Shirt[] shirts; public Closet(Shirt[] Shirts) { - this.Shirts = Shirts; + this.shirts = Shirts; } public Shirt[] getShirts() { - return Shirts; + return shirts; } public Shirt[] getShirtsBySize(Shirt[] shirts, int size) { - int arrSize = 1; - Shirt[] shirtsBySize = new Shirt[arrSize]; + int arrSize = 0; for (int i = 0; i < shirts.length; i++) { if (shirts[i].getSize() == size) { - shirtsBySize[arrSize-1] = shirts[i]; arrSize++; } } + int index = 0; + Shirt[] shirtsBySize = new Shirt[arrSize]; + for (int i = 0; i < shirts.length; i++) { + if (shirts[i].getSize() == size) { + shirtsBySize[index] = shirts[i]; + index++; + } + } return shirtsBySize; } - public Shirt[] addShirts(Shirt add) { - return Util.addShirt(Shirts, add); + public void addShirts(Shirt add) { + shirts = Util.addShirt(shirts, add); } } From dddf30c981150876c7d8a93f0edf3e7352897cf7 Mon Sep 17 00:00:00 2001 From: Yahli Date: Wed, 6 Aug 2025 17:11:34 +0300 Subject: [PATCH 11/18] Update 6 --- src/src/Main.java | 18 +++++++----------- src/src/YahliConstants.java | 3 ++- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/src/Main.java b/src/src/Main.java index 930198c..161b569 100644 --- a/src/src/Main.java +++ b/src/src/Main.java @@ -1,15 +1,11 @@ -//TIP To Run code, press or -// click the icon in the gutter. public class Main { public static void main(String[] args) { - //TIP Press with your caret at the highlighted text - // to see how IntelliJ IDEA suggests fixing it. - System.out.printf("Hello and welcome!"); - - for (int i = 1; i <= 5; i++) { - //TIP Press to start debugging your code. We have set one breakpoint - // for you, but you can always add more by pressing . - System.out.println("i = " + i); - } + ex_15(); + } + public static void ex_15() { + Shirt [] shirts = new Shirt[10]; + Closet closet = new Closet(shirts); + Room r1 = new Room(closet, new Bed(8,2,"Blue",700) ); + r1.set } } \ No newline at end of file diff --git a/src/src/YahliConstants.java b/src/src/YahliConstants.java index cf6d204..f274ff8 100644 --- a/src/src/YahliConstants.java +++ b/src/src/YahliConstants.java @@ -1,3 +1,4 @@ public class YahliConstants { - + private static final int SHIRT_SIZE = 54; + private static final String FAVORITE_COLOR = "Blue"; } From e25d0d65c9db399d9a009c08733e46eb7d2d5baf Mon Sep 17 00:00:00 2001 From: Yahli Date: Sat, 9 Aug 2025 13:47:57 +0300 Subject: [PATCH 12/18] Until exercise 16 --- src/src/Main.java | 5 +++-- src/src/YahliConstants.java | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/src/Main.java b/src/src/Main.java index 161b569..ca584fa 100644 --- a/src/src/Main.java +++ b/src/src/Main.java @@ -5,7 +5,8 @@ public static void main(String[] args) { public static void ex_15() { Shirt [] shirts = new Shirt[10]; Closet closet = new Closet(shirts); - Room r1 = new Room(closet, new Bed(8,2,"Blue",700) ); - r1.set + Bed bed = new Bed(10,"Black"); + Room r1 = new Room(closet, bed ); + bed.setSheetsColor(YahliConstants.getFavoriteColor()); } } \ No newline at end of file diff --git a/src/src/YahliConstants.java b/src/src/YahliConstants.java index f274ff8..ceb73b9 100644 --- a/src/src/YahliConstants.java +++ b/src/src/YahliConstants.java @@ -1,4 +1,8 @@ public class YahliConstants { private static final int SHIRT_SIZE = 54; private static final String FAVORITE_COLOR = "Blue"; + + public static String getFavoriteColor() { + return FAVORITE_COLOR; + } } From d0e14c92feba9dc5773bf17c44b04a76b04e91ab Mon Sep 17 00:00:00 2001 From: Yahli Date: Sat, 9 Aug 2025 14:02:37 +0300 Subject: [PATCH 13/18] Until exercise 17 --- src/src/Main.java | 22 +++++++++++++++++++--- src/src/YahliConstants.java | 4 ++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/src/Main.java b/src/src/Main.java index ca584fa..590483d 100644 --- a/src/src/Main.java +++ b/src/src/Main.java @@ -3,10 +3,26 @@ public static void main(String[] args) { ex_15(); } public static void ex_15() { - Shirt [] shirts = new Shirt[10]; + Shirt[] shirts = new Shirt[10]; Closet closet = new Closet(shirts); - Bed bed = new Bed(10,"Black"); - Room r1 = new Room(closet, bed ); + Bed bed = new Bed(10, "Black"); + Room r1 = new Room(closet, bed); bed.setSheetsColor(YahliConstants.getFavoriteColor()); + + Shirt[] shirtsBySize = closet.getShirtsBySize(shirts, YahliConstants.getShirtSize()); + + int count = 0; + int index = 0; + for (int i = 0; i < shirtsBySize.length; i++) { + if (shirtsBySize[i].getColor().equals(YahliConstants.getFavoriteColor())) { + count++; + } + } + Shirt[] shirtsBySizeAndColor = new Shirt[count]; + for (int i = 0; i < shirtsBySizeAndColor.length; i++) { + if (shirtsBySize[i].getColor().equals(YahliConstants.getFavoriteColor())) { + shirtsBySizeAndColor[index] = shirtsBySize[i]; + } + } } } \ No newline at end of file diff --git a/src/src/YahliConstants.java b/src/src/YahliConstants.java index ceb73b9..6e417d0 100644 --- a/src/src/YahliConstants.java +++ b/src/src/YahliConstants.java @@ -5,4 +5,8 @@ public class YahliConstants { public static String getFavoriteColor() { return FAVORITE_COLOR; } + + public static int getShirtSize() { + return SHIRT_SIZE; + } } From 96354c13a0d7029dbd196705c89823c86bd7195d Mon Sep 17 00:00:00 2001 From: Yahli Date: Sun, 17 Aug 2025 15:50:26 +0300 Subject: [PATCH 14/18] Finished --- src/src/Bed.java | 6 +++++- src/src/Main2.java | 5 +++++ src/src/Util.java | 5 +++++ src/src/YahliConstants.java | 6 ++++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/src/Main2.java diff --git a/src/src/Bed.java b/src/src/Bed.java index 8372c5a..70c09ae 100644 --- a/src/src/Bed.java +++ b/src/src/Bed.java @@ -3,7 +3,11 @@ public class Bed { private int pillows; private String sheetsColor; private final int price; - private static final int DEFAULT_BED_PRICE = 100; + private static final int DEFAULT_BED_PRICE = 1000; + + public static int getDefaultBedPrice() { + return DEFAULT_BED_PRICE; + } public Bed (double height, int pillows, String sheetsColor, int price) { this.height = height; diff --git a/src/src/Main2.java b/src/src/Main2.java new file mode 100644 index 0000000..8d27941 --- /dev/null +++ b/src/src/Main2.java @@ -0,0 +1,5 @@ +public class Main2 { + public static void main(String[] args) { + System.out.println(Util.tolerance(YahliConstants.getHighestPrice(),Bed.getDefaultBedPrice(),YahliConstants.getToleranceForPriceOfBed())); + } +} diff --git a/src/src/Util.java b/src/src/Util.java index ae0c1d5..b0633a1 100644 --- a/src/src/Util.java +++ b/src/src/Util.java @@ -8,4 +8,9 @@ protected static Shirt[] addShirt (Shirt[] shirts, Shirt add) { newShirts[shirts.length+1] = add; return newShirts; } + + protected static boolean tolerance(double wanted, double num, double tolerance) { + + return (num >= wanted - tolerance) && (num <= wanted + tolerance); + } } diff --git a/src/src/YahliConstants.java b/src/src/YahliConstants.java index 6e417d0..5e3b953 100644 --- a/src/src/YahliConstants.java +++ b/src/src/YahliConstants.java @@ -1,6 +1,8 @@ public class YahliConstants { private static final int SHIRT_SIZE = 54; private static final String FAVORITE_COLOR = "Blue"; + private static final double HIGHEST_PRICE_FOR_BED = 2000; + private static final double TOLERANCE_FOR_PRICE_OF_BED = 500; public static String getFavoriteColor() { return FAVORITE_COLOR; @@ -9,4 +11,8 @@ public static String getFavoriteColor() { public static int getShirtSize() { return SHIRT_SIZE; } + + public static double getHighestPrice(){return HIGHEST_PRICE_FOR_BED;} + + public static double getToleranceForPriceOfBed(){return TOLERANCE_FOR_PRICE_OF_BED;} } From 4cc608b31a9ab676cc398c0483e893019ee6e177 Mon Sep 17 00:00:00 2001 From: Yahli Date: Sun, 17 Aug 2025 16:02:48 +0300 Subject: [PATCH 15/18] Update 1 --- src/src/Main2.java | 2 +- src/src/Room.java | 8 ++++---- src/src/YahliConstants.java | 20 ++++---------------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/src/Main2.java b/src/src/Main2.java index 8d27941..4ee38f1 100644 --- a/src/src/Main2.java +++ b/src/src/Main2.java @@ -1,5 +1,5 @@ public class Main2 { public static void main(String[] args) { - System.out.println(Util.tolerance(YahliConstants.getHighestPrice(),Bed.getDefaultBedPrice(),YahliConstants.getToleranceForPriceOfBed())); + System.out.println(Util.tolerance(YahliConstants.HIGHEST_PRICE_FOR_BED,Bed.getDefaultBedPrice(),YahliConstants.TOLERANCE_FOR_PRICE_OF_BED)); } } diff --git a/src/src/Room.java b/src/src/Room.java index 96c6cbc..2f047c6 100644 --- a/src/src/Room.java +++ b/src/src/Room.java @@ -1,6 +1,6 @@ public class Room { - private final Closet closet; - private final Bed bed; + private Closet closet; + private Bed bed; public Room (Closet closet, Bed bed) { this.closet = closet; @@ -8,8 +8,8 @@ public Room (Closet closet, Bed bed) { } public Room (Bed bed, Shirt[] shirts) { - this.bed = bed; - this.closet = new Closet(shirts); + Closet closet1 = new Closet(shirts); + new Room(closet1, bed); } public Closet getCloset() { return closet; diff --git a/src/src/YahliConstants.java b/src/src/YahliConstants.java index 5e3b953..77d1533 100644 --- a/src/src/YahliConstants.java +++ b/src/src/YahliConstants.java @@ -1,18 +1,6 @@ public class YahliConstants { - private static final int SHIRT_SIZE = 54; - private static final String FAVORITE_COLOR = "Blue"; - private static final double HIGHEST_PRICE_FOR_BED = 2000; - private static final double TOLERANCE_FOR_PRICE_OF_BED = 500; - - public static String getFavoriteColor() { - return FAVORITE_COLOR; - } - - public static int getShirtSize() { - return SHIRT_SIZE; - } - - public static double getHighestPrice(){return HIGHEST_PRICE_FOR_BED;} - - public static double getToleranceForPriceOfBed(){return TOLERANCE_FOR_PRICE_OF_BED;} + public static final int SHIRT_SIZE = 54; + public static final String FAVORITE_COLOR = "Blue"; + public static final double HIGHEST_PRICE_FOR_BED = 2000; + public static final double TOLERANCE_FOR_PRICE_OF_BED = 500; } From 081080fb1cda61f1dc77a61a1ee167570c64cad8 Mon Sep 17 00:00:00 2001 From: Yahli Date: Sun, 17 Aug 2025 16:38:01 +0300 Subject: [PATCH 16/18] Update 3 --- src/src/Main.java | 14 ++++++++++---- src/src/Main2.java | 5 ----- 2 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 src/src/Main2.java diff --git a/src/src/Main.java b/src/src/Main.java index 590483d..6c11b59 100644 --- a/src/src/Main.java +++ b/src/src/Main.java @@ -1,26 +1,32 @@ public class Main { public static void main(String[] args) { ex_15(); + ex_20(); } + + public static void ex_20() { + System.out.println(Util.tolerance(YahliConstants.HIGHEST_PRICE_FOR_BED,Bed.getDefaultBedPrice(),YahliConstants.TOLERANCE_FOR_PRICE_OF_BED)); + } + public static void ex_15() { Shirt[] shirts = new Shirt[10]; Closet closet = new Closet(shirts); Bed bed = new Bed(10, "Black"); Room r1 = new Room(closet, bed); - bed.setSheetsColor(YahliConstants.getFavoriteColor()); + bed.setSheetsColor(YahliConstants.FAVORITE_COLOR); - Shirt[] shirtsBySize = closet.getShirtsBySize(shirts, YahliConstants.getShirtSize()); + Shirt[] shirtsBySize = closet.getShirtsBySize(shirts, YahliConstants.SHIRT_SIZE); int count = 0; int index = 0; for (int i = 0; i < shirtsBySize.length; i++) { - if (shirtsBySize[i].getColor().equals(YahliConstants.getFavoriteColor())) { + if (shirtsBySize[i].getColor().equals(YahliConstants.FAVORITE_COLOR)) { count++; } } Shirt[] shirtsBySizeAndColor = new Shirt[count]; for (int i = 0; i < shirtsBySizeAndColor.length; i++) { - if (shirtsBySize[i].getColor().equals(YahliConstants.getFavoriteColor())) { + if (shirtsBySize[i].getColor().equals(YahliConstants.FAVORITE_COLOR)) { shirtsBySizeAndColor[index] = shirtsBySize[i]; } } diff --git a/src/src/Main2.java b/src/src/Main2.java deleted file mode 100644 index 4ee38f1..0000000 --- a/src/src/Main2.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Main2 { - public static void main(String[] args) { - System.out.println(Util.tolerance(YahliConstants.HIGHEST_PRICE_FOR_BED,Bed.getDefaultBedPrice(),YahliConstants.TOLERANCE_FOR_PRICE_OF_BED)); - } -} From a636dc801487d360a5b3074583de83ae35f70787 Mon Sep 17 00:00:00 2001 From: Yahli Date: Sun, 17 Aug 2025 16:41:44 +0300 Subject: [PATCH 17/18] Update 3 --- src/src/Main.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/src/Main.java b/src/src/Main.java index 6c11b59..4ab5faa 100644 --- a/src/src/Main.java +++ b/src/src/Main.java @@ -1,11 +1,12 @@ public class Main { + public static void main(String[] args) { ex_15(); ex_20(); } public static void ex_20() { - System.out.println(Util.tolerance(YahliConstants.HIGHEST_PRICE_FOR_BED,Bed.getDefaultBedPrice(),YahliConstants.TOLERANCE_FOR_PRICE_OF_BED)); + System.out.println(Util.tolerance(YahliConstants.HIGHEST_PRICE_FOR_BED, Bed.getDefaultBedPrice(),YahliConstants.TOLERANCE_FOR_PRICE_OF_BED)); } public static void ex_15() { From 14430553de64c285eeaccf180b10885dd93f3067 Mon Sep 17 00:00:00 2001 From: Yahli Date: Wed, 20 Aug 2025 15:42:30 +0300 Subject: [PATCH 18/18] Update 4 --- src/Records/src/Classroom.java | 5 +++++ src/src/Bed.java | 11 ++++++++--- src/src/Closet.java | 2 ++ src/src/Main.java | 7 ++++--- src/src/Room.java | 1 + src/src/Shirt.java | 1 + src/src/Util.java | 1 + src/src/YahliConstants.java | 4 +++- 8 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 src/Records/src/Classroom.java diff --git a/src/Records/src/Classroom.java b/src/Records/src/Classroom.java new file mode 100644 index 0000000..1f84f4f --- /dev/null +++ b/src/Records/src/Classroom.java @@ -0,0 +1,5 @@ +public record Classroom(int grade, Student[] students, int classNum) { + + + +} diff --git a/src/src/Bed.java b/src/src/Bed.java index 70c09ae..b915dc9 100644 --- a/src/src/Bed.java +++ b/src/src/Bed.java @@ -1,13 +1,11 @@ public class Bed { + private double height; private int pillows; private String sheetsColor; private final int price; private static final int DEFAULT_BED_PRICE = 1000; - public static int getDefaultBedPrice() { - return DEFAULT_BED_PRICE; - } public Bed (double height, int pillows, String sheetsColor, int price) { this.height = height; @@ -15,9 +13,11 @@ public Bed (double height, int pillows, String sheetsColor, int price) { this.sheetsColor = sheetsColor; this.price = price; } + public Bed (double height, String sheetsColor) { this(height,1,sheetsColor,DEFAULT_BED_PRICE); } + public int getPrice() { return price; } @@ -33,4 +33,9 @@ public String getSheetsColor() { public void setSheetsColor(String sheetsColor) { this.sheetsColor = sheetsColor; } + public static int getDefaultBedPrice() { + return DEFAULT_BED_PRICE; + } + } + diff --git a/src/src/Closet.java b/src/src/Closet.java index 8c56bbb..6ad9cca 100644 --- a/src/src/Closet.java +++ b/src/src/Closet.java @@ -1,4 +1,5 @@ public class Closet { + private Shirt[] shirts; public Closet(Shirt[] Shirts) { @@ -30,4 +31,5 @@ public Shirt[] getShirtsBySize(Shirt[] shirts, int size) { public void addShirts(Shirt add) { shirts = Util.addShirt(shirts, add); } + } diff --git a/src/src/Main.java b/src/src/Main.java index 4ab5faa..7cbb8ad 100644 --- a/src/src/Main.java +++ b/src/src/Main.java @@ -21,10 +21,10 @@ public static void ex_15() { int count = 0; int index = 0; for (int i = 0; i < shirtsBySize.length; i++) { - if (shirtsBySize[i].getColor().equals(YahliConstants.FAVORITE_COLOR)) { - count++; + if (shirtsBySize[i].getColor().equals(YahliConstants.FAVORITE_COLOR)) { + count++; + } } - } Shirt[] shirtsBySizeAndColor = new Shirt[count]; for (int i = 0; i < shirtsBySizeAndColor.length; i++) { if (shirtsBySize[i].getColor().equals(YahliConstants.FAVORITE_COLOR)) { @@ -32,4 +32,5 @@ public static void ex_15() { } } } + } \ No newline at end of file diff --git a/src/src/Room.java b/src/src/Room.java index 2f047c6..d916e64 100644 --- a/src/src/Room.java +++ b/src/src/Room.java @@ -1,4 +1,5 @@ public class Room { + private Closet closet; private Bed bed; diff --git a/src/src/Shirt.java b/src/src/Shirt.java index 045205b..67ab4dc 100644 --- a/src/src/Shirt.java +++ b/src/src/Shirt.java @@ -1,4 +1,5 @@ public class Shirt { + public int size; public String color; diff --git a/src/src/Util.java b/src/src/Util.java index b0633a1..f6c874a 100644 --- a/src/src/Util.java +++ b/src/src/Util.java @@ -13,4 +13,5 @@ protected static boolean tolerance(double wanted, double num, double tolerance) return (num >= wanted - tolerance) && (num <= wanted + tolerance); } + } diff --git a/src/src/YahliConstants.java b/src/src/YahliConstants.java index 77d1533..9c86d3f 100644 --- a/src/src/YahliConstants.java +++ b/src/src/YahliConstants.java @@ -1,6 +1,8 @@ public class YahliConstants { + public static final int SHIRT_SIZE = 54; public static final String FAVORITE_COLOR = "Blue"; - public static final double HIGHEST_PRICE_FOR_BED = 2000; + public static final double HIGHEST_PRICE_FOR_BED = 2000; public static final double TOLERANCE_FOR_PRICE_OF_BED = 500; + }