diff --git a/OOP Mini Project/.idea/vcs.xml b/OOP Mini Project/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/OOP Mini Project/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OOP Mini Project/src/ConsumerFactory.java b/OOP Mini Project/src/ConsumerFactory.java
index f8f5781..d207774 100644
--- a/OOP Mini Project/src/ConsumerFactory.java
+++ b/OOP Mini Project/src/ConsumerFactory.java
@@ -1,9 +1,8 @@
public class ConsumerFactory {
- public static Consumer createConsumer(int choice, String id, String name, double solar,
+ public static Consumer createConsumer(int choice, String id, String name, double solar,
double totalUsage, double dayUsage,
- double peakUsage, double offPeakUsage,
- String planName, String tariffCode) {
+ double peakUsage, double offPeakUsage) {
if (choice == 1) {
return new StandardConsumer(id, name, solar, totalUsage);
} else if (choice == 2) {
@@ -12,12 +11,12 @@ public static Consumer createConsumer(int choice, String id, String name, do
return null;
}
- public static boolean isValidChoice(int choice, String source) {
+ public static boolean isValidChoice(int choice) {
return choice == 1 || choice == 2;
}
}
-class consumer_type_helper {
+class ConsumerTypeHelper {
static String getLabel(int choice) {
if (choice == 1) return "Standard Domestic";
return "Time-of-Use (TOU)";
diff --git a/OOP Mini Project/src/ElecBillCalculator.java b/OOP Mini Project/src/ElecBillCalculator.java
index ed655f0..73dd929 100644
--- a/OOP Mini Project/src/ElecBillCalculator.java
+++ b/OOP Mini Project/src/ElecBillCalculator.java
@@ -26,7 +26,7 @@ public static void main(String[] args) {
System.out.print("Choice: ");
int choice = scanner.nextInt();
- if (!ConsumerFactory.isValidChoice(choice, "menu")) {
+ if (!ConsumerFactory.isValidChoice(choice)) {
System.out.println("Invalid choice. Exiting.");
scanner.close();
System.exit(0);
@@ -48,7 +48,7 @@ public static void main(String[] args) {
}
consumer = ConsumerFactory.createConsumer(choice, id, name, solar,
- total, day, peak, off, "domestic", "PUCSL-2025");
+ total, day, peak, off);
BillRecord record = engine.createBillRecord(consumer, rates);
engine.printBill(record, rates);
diff --git a/OOP Mini Project/src/TariffRate.java b/OOP Mini Project/src/TariffRate.java
index e3b9612..b219dbe 100644
--- a/OOP Mini Project/src/TariffRate.java
+++ b/OOP Mini Project/src/TariffRate.java
@@ -1,5 +1,3 @@
-import java.util.List;
-
public class TariffRate {
private final double domesticSlab1Rate = 4.50;
private final double domesticSlab2Rate = 8.00;