From 19aefb5e5f1002392c255c6e3c715cf5b4d7bd49 Mon Sep 17 00:00:00 2001 From: Samuel Oberhofer Date: Fri, 24 Jun 2022 16:40:38 +0200 Subject: [PATCH] Final --- Uebung 5/Uebung5_2/Drone.cpp | 1 + Uebung 5/Uebung5_2/main.cpp | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Uebung 5/Uebung5_2/Drone.cpp b/Uebung 5/Uebung5_2/Drone.cpp index 2973f0e..01bbd62 100644 --- a/Uebung 5/Uebung5_2/Drone.cpp +++ b/Uebung 5/Uebung5_2/Drone.cpp @@ -9,6 +9,7 @@ float Drone::calculateChange(float total, float paid) { return paid - total; } void Drone::returnChange(float change) { float restChange = change; std::cout << "Restbetrag: " << restChange << std::endl; + std::cout << "Restgeld: " << std::flush; std::sort(availableCashInstances, availableCashInstances + CashInstanceSize, std::greater<>()); for (int i = 0; i < CashInstanceSize; i++) { diff --git a/Uebung 5/Uebung5_2/main.cpp b/Uebung 5/Uebung5_2/main.cpp index 75dfa2b..34a174e 100644 --- a/Uebung 5/Uebung5_2/main.cpp +++ b/Uebung 5/Uebung5_2/main.cpp @@ -1,12 +1,15 @@ #include "Drone.h" - +#define NCashInstances 8 int main() { - CashInstance wallet[8] = {CashInstance(0.01, 0), CashInstance(0.02, 0), - CashInstance(0.05, 0), CashInstance(0.1, 3), - CashInstance(0.2, 0), CashInstance(0.5, 10), - CashInstance(1.0, 4), CashInstance(2, 4)}; - Drone drone(wallet, 8); + CashInstance wallet[NCashInstances] = { + CashInstance(0.01, 0), CashInstance(0.02, 0), CashInstance(0.05, 0), + CashInstance(0.1, 3), CashInstance(0.2, 2), CashInstance(0.5, 10), + CashInstance(1.0, 4), CashInstance(2, 4)}; + Drone drone(wallet, NCashInstances); float change = drone.calculateChange(5.2, 20); + for (int i = 0; i < NCashInstances; i++) { + drone.availableCashInstances[i].print(); + } drone.returnChange(change); return 0; } \ No newline at end of file