Chapter 9 examples updated

Author: pdeitel

examples/ch09/fig09_01-02/Account.h

@@ -1,5 +1,5 @@
 // Fig. 9.2: Account.h
-// Account class with a data member and 
+// Account class with a data member and
 // member functions to set and get its value.
 #include <string> 
 #include <string_view> 
@@ -13,7 +13,7 @@ class Account {
 
    // member function that retrieves the account name from the object
    const std::string& getName() const {
-      return m_name; // return the name to this function's caller 
+      return m_name; // return m_name's value to this function's caller 
    }
 private:
    std::string m_name; // data member containing account holder's name
@@ -22,8 +22,9 @@ class Account {
 
 
 
+
 /**************************************************************************
- * (C) Copyright 1992-2021 by Deitel & Associates, Inc. and               *
+ * (C) Copyright 1992-2022 by Deitel & Associates, Inc. and               *
  * Pearson Education, Inc. All Rights Reserved.                           *
  *                                                                        *
  * DISCLAIMER: The authors and publisher of this book have used their     *

examples/ch09/fig09_01-02/AccountTest.cpp

@@ -1,32 +1,30 @@
 // Fig. 9.1: AccountTest.cpp
 // Creating and manipulating an Account object.
+#include <fmt/format.h>
 #include <iostream>
 #include <string>
-#include <fmt/format.h> // In C++20, this will be #include <format> 
 #include "Account.h"
 
-using namespace std;
-
 int main() {
    Account myAccount{}; // create Account object myAccount
 
    // show that the initial value of myAccount's name is the empty string
-   cout << fmt::format("Initial account name: {}\n", myAccount.getName());
+   std::cout << fmt::format("Initial account name: {}\n",
+      myAccount.getName());
 
    // prompt for and read the name
-   cout << "Enter the account name: ";
-   string name{};
-   getline(cin, name); // read a line of text       
+   std::cout << "Enter the account name: ";
+   std::string name{};
+   std::getline(std::cin, name); // read a line of text       
    myAccount.setName(name); // put name in the myAccount object
 
    // display the name stored in object myAccount
-   cout << fmt::format("Updated account name: {}\n", myAccount.getName());
+   std::cout << fmt::format("Updated account name: {}\n",
+      myAccount.getName());
 }
 
-
-
 /**************************************************************************
- * (C) Copyright 1992-2021 by Deitel & Associates, Inc. and               *
+ * (C) Copyright 1992-2022 by Deitel & Associates, Inc. and               *
  * Pearson Education, Inc. All Rights Reserved.                           *
  *                                                                        *
  * DISCLAIMER: The authors and publisher of this book have used their     *

examples/ch09/fig09_03-04/Account.h

@@ -13,21 +13,21 @@ class Account {
 
    // function to set the account name
    void setName(std::string_view name) {
-      m_name = name; // replace m_name's value with name
+      m_name = name;
    }
 
    // function to retrieve the account name
    const std::string& getName() const {
       return m_name;
    }
 private:
-   std::string m_name; // account name data member
+   std::string m_name; // account name 
 }; // end class Account
 
 
 
 /**************************************************************************
- * (C) Copyright 1992-2021 by Deitel & Associates, Inc. and               *
+ * (C) Copyright 1992-2022 by Deitel & Associates, Inc. and               *
  * Pearson Education, Inc. All Rights Reserved.                           *
  *                                                                        *
  * DISCLAIMER: The authors and publisher of this book have used their     *

examples/ch09/fig09_03-04/AccountTest.cpp

@@ -1,26 +1,25 @@
 // Fig. 9.4: AccountTest.cpp
-// Using the Account constructor to initialize the m_name data
-// member at the time each Account object is created.
+// Using the Account constructor to initialize the m_name 
+// data member when each Account object is created.
+#include <fmt/format.h>
 #include <iostream>
-#include <fmt/format.h> // In C++20, this will be #include <format> 
 #include "Account.h"
 
-using namespace std;
-
 int main() {
    // create two Account objects
    Account account1{"Jane Green"};
    Account account2{"John Blue"};
 
    // display initial each Account's corresponding name
-   cout << fmt::format("account1 name is: {}\naccount2 name is: {}\n",
-              account1.getName(), account2.getName());
+   std::cout << fmt::format(
+      "account1 name is: {}\naccount2 name is: {}\n",
+      account1.getName(), account2.getName());
 }
 
 
 
 /**************************************************************************
- * (C) Copyright 1992-2021 by Deitel & Associates, Inc. and               *
+ * (C) Copyright 1992-2022 by Deitel & Associates, Inc. and               *
  * Pearson Education, Inc. All Rights Reserved.                           *
  *                                                                        *
  * DISCLAIMER: The authors and publisher of this book have used their     *

examples/ch09/fig09_05-06/Account.h

@@ -1,20 +1,16 @@
 // Fig. 9.5: Account.h
 // Account class with m_name and m_balance data members, and a 
 // constructor and deposit function that each perform validation.
+#include <algorithm>
 #include <string>
 #include <string_view>
 
 class Account {
 public:
    // Account constructor with two parameters  
    Account(std::string_view name, double balance)
-      : m_name{name} { // member initializer for m_name  
-
-      // validate that balance is greater than 0.0; if not,  
-      // data member m_balance keeps its default initial value of 0.0     
-      if (balance > 0.0) { // if the balance is valid     
-         m_balance = balance; // assign it to data member m_balance  
-      }
+      : m_name{name}, m_balance{std::max(0.0, balance)} { // member init
+      // empty body
    }
 
    // function that deposits (adds) only a valid amount to the balance
@@ -40,13 +36,14 @@ class Account {
    }
 private:
    std::string m_name; // account name data member 
-   double m_balance{0.0}; // data member with default initial value
+   double m_balance; // data member with default initial value
 }; // end class Account
 
 
 
+
 /**************************************************************************
- * (C) Copyright 1992-2021 by Deitel & Associates, Inc. and               *
+ * (C) Copyright 1992-2022 by Deitel & Associates, Inc. and               *
  * Pearson Education, Inc. All Rights Reserved.                           *
  *                                                                        *
  * DISCLAIMER: The authors and publisher of this book have used their     *

examples/ch09/fig09_05-06/AccountTest.cpp

@@ -1,47 +1,47 @@
 // Fig. 9.6: AccountTest.cpp
 // Displaying and updating Account balances.
+#include <fmt/format.h>
 #include <iostream>
-#include <fmt/format.h> // In C++20, this will be #include <format> 
 #include "Account.h"
 
-using namespace std;
-
 int main() {
    Account account1{"Jane Green", 50.00};
    Account account2{"John Blue", -7.00};
 
    // display initial balance of each object
-   cout << fmt::format("account1: {} balance is ${:.2f}\n",
+   std::cout << fmt::format("account1: {} balance is ${:.2f}\n",
       account1.getName(), account1.getBalance());
-   cout << fmt::format("account2: {} balance is ${:.2f}\n\n",
+   std::cout << fmt::format("account2: {} balance is ${:.2f}\n\n",
       account2.getName(), account2.getBalance());
 
-   cout << "Enter deposit amount for account1: "; // prompt
+   std::cout << "Enter deposit amount for account1: "; // prompt
    double amount;
-   cin >> amount; // obtain user input
-   cout << fmt::format("adding ${:.2f} to account1 balance\n\n", amount);
+   std::cin >> amount; // obtain user input
+   std::cout << fmt::format(
+      "adding ${:.2f} to account1 balance\n\n", amount);
    account1.deposit(amount); // add to account1's balance
 
    // display balances
-   cout << fmt::format("account1: {} balance is ${:.2f}\n",
+   std::cout << fmt::format("account1: {} balance is ${:.2f}\n",
       account1.getName(), account1.getBalance());
-   cout << fmt::format("account2: {} balance is ${:.2f}\n\n",
+   std::cout << fmt::format("account2: {} balance is ${:.2f}\n\n",
       account2.getName(), account2.getBalance());
 
-   cout << "Enter deposit amount for account2: "; // prompt
-   cin >> amount; // obtain user input
-   cout << fmt::format("adding ${:.2f} to account2 balance\n\n", amount);
+   std::cout << "Enter deposit amount for account2: "; // prompt
+   std::cin >> amount; // obtain user input
+   std::cout << fmt::format(
+      "adding ${:.2f} to account2 balance\n\n", amount);
    account2.deposit(amount); // add to account2 balance
 
    // display balances
-   cout << fmt::format("account1: {} balance is ${:.2f}\n",
+   std::cout << fmt::format("account1: {} balance is ${:.2f}\n",
       account1.getName(), account1.getBalance());
-   cout << fmt::format("account2: {} balance is ${:.2f}\n",
+   std::cout << fmt::format("account2: {} balance is ${:.2f}\n",
       account2.getName(), account2.getBalance());
 }
 
 /**************************************************************************
- * (C) Copyright 1992-2021 by Deitel & Associates, Inc. and               *
+ * (C) Copyright 1992-2022 by Deitel & Associates, Inc. and               *
  * Pearson Education, Inc. All Rights Reserved.                           *
  *                                                                        *
  * DISCLAIMER: The authors and publisher of this book have used their     *

examples/ch09/fig09_07-09/Time.cpp

@@ -1,18 +1,17 @@
 // Fig. 9.8: Time.cpp
 // Time class member-function definitions. 
+#include <fmt/format.h>
 #include <stdexcept> // for invalid_argument exception class     
 #include <string>
-#include <fmt/format.h> // In C++20, this will be #include <format> 
 #include "Time.h" // include definition of class Time from Time.h 
 
-using namespace std;
-
 // set new Time value using 24-hour time
 void Time::setTime(int hour, int minute, int second) {
    // validate hour, minute and second
    if ((hour < 0 || hour >= 24) || (minute < 0 || minute >= 60) ||
       (second < 0 || second >= 60)) {
-      throw invalid_argument{"hour, minute or second was out of range"};
+      throw std::invalid_argument{
+         "hour, minute or second was out of range"};
    }
 
    m_hour = hour;
@@ -21,21 +20,22 @@ void Time::setTime(int hour, int minute, int second) {
 }
 
 // return Time as a string in 24-hour format (HH:MM:SS)
-string Time::to24HourString() const {
+std::string Time::to24HourString() const {
    return fmt::format("{:02d}:{:02d}:{:02d}", m_hour, m_minute, m_second);
 }
 
 // return Time as string in 12-hour format (HH:MM:SS AM or PM)
-string Time::to12HourString() const {
+std::string Time::to12HourString() const {
    return fmt::format("{}:{:02d}:{:02d} {}",
       ((m_hour % 12 == 0) ? 12 : m_hour % 12), m_minute, m_second,
       (m_hour < 12 ? "AM" : "PM"));
 }
 
 
 
+
 /**************************************************************************
- * (C) Copyright 1992-2021 by Deitel & Associates, Inc. and               *
+ * (C) Copyright 1992-2022 by Deitel & Associates, Inc. and               *
  * Pearson Education, Inc. All Rights Reserved.                           *
  *                                                                        *
  * DISCLAIMER: The authors and publisher of this book have used their     *

examples/ch09/fig09_07-09/Time.h

@@ -18,7 +18,7 @@ class Time {
 
 
 /**************************************************************************
- * (C) Copyright 1992-2021 by Deitel & Associates, Inc. and               *
+ * (C) Copyright 1992-2022 by Deitel & Associates, Inc. and               *
  * Pearson Education, Inc. All Rights Reserved.                           *
  *                                                                        *
  * DISCLAIMER: The authors and publisher of this book have used their     *

examples/ch09/fig09_07-09/fig09_09.cpp

@@ -1,16 +1,15 @@
 // fig09_09.cpp
 // Program to test class Time.                     
-// NOTE: This file must be compiled with Time.cpp. 
+// NOTE: This file must be linked with Time.cpp. 
+#include <fmt/format.h>
 #include <iostream>
 #include <stdexcept> // invalid_argument exception class
 #include <string_view> 
-#include <fmt/format.h> // In C++20, this will be #include <format> 
 #include "Time.h" // definition of class Time from Time.h 
-using namespace std;
 
 // displays a Time in 24-hour and 12-hour formats
-void displayTime(string_view message, const Time& time) {
-   cout << fmt::format("{}\n24-hour time: {}\n12-hour time: {}\n\n",
+void displayTime(std::string_view message, const Time& time) {
+   std::cout << fmt::format("{}\n24-hour time: {}\n12-hour time: {}\n\n",
       message, time.to24HourString(), time.to12HourString());
 }
 
@@ -25,16 +24,16 @@ int main() {
    try {
       t.setTime(99, 99, 99); // all values out of range
    }
-   catch (const invalid_argument& e) {
-      cout << fmt::format("Exception: {}\n\n", e.what());
+   catch (const std::invalid_argument& e) {
+      std::cout << fmt::format("Exception: {}\n\n", e.what());
    }
 
    // display t's value after attempting to set an invalid time
    displayTime("After attempting to set an invalid time:", t);
 }
 
 /**************************************************************************
- * (C) Copyright 1992-2021 by Deitel & Associates, Inc. and               *
+ * (C) Copyright 1992-2022 by Deitel & Associates, Inc. and               *
  * Pearson Education, Inc. All Rights Reserved.                           *
  *                                                                        *
  * DISCLAIMER: The authors and publisher of this book have used their     *