fix ch1

Author: AceCoooool

ch1/10_Date/CMakeLists.txt

@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.12)
 project(10_Date)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
-set(SOURCE_FILES main.cpp ../head/BinarySearch.h ../head/Knuth.h ../head/Counter.h ../head/StaticSetofInts.h ../head/Vector.h ../head/Date.h ../head/Transaction.h ../head/Point2D.h ../head/Interval1D.h ../head/Interval2D.h ../head/RectHV.h ../head/Accumulator.h ../head/ResizingArrayStack.h ../head/LinkedStack.h ../head/Stack.h ../head/ResizingArrayQueue.h ../head/LinkedQueue.h ../head/Queue.h ../head/ResizingArrayBag.h ../head/LinkedBag.h ../head/Bag.h ../head/Stopwatch.h ../head/ThreeSum.h ../head/ThreeSumFast.h ../head/DoublingTest.h ../head/QuickFindUF.h ../head/QuickUnionUF.h ../head/WeightedQuickUnionUF.h ../head/UF.h ../head/LinearRegression.h)
+set(SOURCE_FILES main.cpp  ../head/Date.h)
 add_executable(10_Date ${SOURCE_FILES})

ch1/11_Transaction/CMakeLists.txt

@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.12)
 project(11_Transaction)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
-set(SOURCE_FILES main.cpp)
+set(SOURCE_FILES main.cpp ../head/Transaction.h)
 add_executable(11_Transaction ${SOURCE_FILES})

ch1/11_Transaction/main.cpp

@@ -10,27 +10,31 @@ using namespace std;
  * @param args the command-line arguments
  */
 int main() {
-    vector<Transaction> a;
-    a.push_back(Transaction("Turing 6/17/1990 644.08"));
-    a.push_back(Transaction("Tarjan 3/26/2002 4121.85"));
-    a.push_back(Transaction("Dijkstra 8/22/2007 2678.40"));
+    vector<Transaction *> a;
+    a.push_back(new Transaction("Turing 6/17/1990 644.08"));
+    a.push_back(new Transaction("Tarjan 3/26/2002 4121.85"));
+    a.push_back(new Transaction("Knuth 6/14/1999 288.34"));
+    a.push_back(new Transaction("Dijkstra 8/22/2007 2678.40"));
 
     cout << "Unsorted" << endl;
     for (int i = 0; i < a.size(); ++i)
-        cout << a[i] << endl;
+        cout << *a[i] << endl;
+    cout << endl;
 
     cout << "Sorted by date" << endl;
     sort(a.begin(), a.end(), Transaction::WhenOrder);
     for (int i = 0; i < a.size(); ++i)
-        cout << a[i] << endl;
+        cout << *a[i] << endl;
+    cout << endl;
 
     cout << "Sorted by customer" << endl;
     sort(a.begin(), a.end(), Transaction::WhoOrder);
     for (int i = 0; i < a.size(); ++i)
-        cout << a[i] << endl;
+        cout << *a[i] << endl;
+    cout << endl;
 
     cout << "Sorted by amount" << endl;
     sort(a.begin(), a.end(), Transaction::HowMuchOrder);
     for (int i = 0; i < a.size(); ++i)
-        cout << a[i] << endl;
+        cout << *a[i] << endl;
 }

ch1/12_Point2D/CMakeLists.txt

@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.12)
 project(12_Point2D)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
-set(SOURCE_FILES main.cpp)
+set(SOURCE_FILES main.cpp ../head/Point2D.h)
 add_executable(12_Point2D ${SOURCE_FILES})

ch1/12_Point2D/main.cpp

@@ -18,6 +18,8 @@ int main() {
     cout << "Unsorted: " << endl;
     for (auto a: vec)
         cout << a << endl;
+    cout << endl;
+
     cout << "sorted with x: " << endl;
     sort(vec.begin(), vec.end(), Point2D::XOrder);
     for (auto a: vec)

ch1/13_RectHV/CMakeLists.txt

@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.12)
 project(13_RectHV)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
-set(SOURCE_FILES main.cpp)
+set(SOURCE_FILES main.cpp ../head/RectHV.h)
 add_executable(13_RectHV ${SOURCE_FILES})

ch1/head/BinarySearch.h

@@ -19,6 +19,10 @@ using std::vector;
  */
 class BinarySearch {
 public:
+    /**
+     * This class should not be instantiated.
+     */
+    BinarySearch() = delete;
     /**
     * Returns the index of the specified key in the specified array.
     *

ch1/head/Counter.h

@@ -63,8 +63,8 @@ class Counter {
     friend bool operator<(Counter &a1, Counter &a2);
 
 private:
-    const string name;
-    int count;
+    const string name;   // counter name
+    int count;           // current value
 };
 
 ostream &operator<<(ostream &stream, const Counter &item) {

ch1/head/Date.h

@@ -36,6 +36,19 @@ auto split = [](string s, char delim) {
  *  @author Kevin Wayne
  */
 class Date {
+private:
+    const static vector<int> DAYS;
+    int month;   // month (between 1 and 12)
+    int day;     // day   (between 1 and DAYS[month]
+    int year;    // year
+
+public:
+    // some friend function
+    friend ostream &operator<<(ostream &stream, const Date &item);
+    friend bool operator==(const Date &d1, const Date &d2);
+    friend bool operator<(const Date &d1, const Date &d2);
+    friend bool operator>(const Date &d1, const Date &d2);
+
 public:
     /**
      * Initializes a new date from the month, day, and year.
@@ -54,7 +67,7 @@ class Date {
      * @param date the string representation of this date
      * @throws IllegalArgumentException if this date is invalid
      */
-    Date(string date) {
+    explicit Date(string date) {
         vector<string> fields = split(date, '/');
         if (fields.size() != 3)
             throw runtime_error("Invalid data");
@@ -71,23 +84,23 @@ class Date {
      * Return the month.
      * @return the month (an integer between 1 and 12)
      */
-    int month_() const {
+    int month_() const noexcept {
         return month;
     }
 
     /**
      * Returns the day.
      * @return the day (an integer between 1 and 31)
      */
-    int day_() const {
+    int day_() const noexcept {
         return day;
     }
 
     /**
      * Returns the year.
      * @return the year
      */
-    int year_() {
+    int year_() const noexcept {
         return year;
     }
 
@@ -102,14 +115,15 @@ class Date {
         else return Date(1, 1, year + 1);
     }
 
+
     /**
      * Compares two dates chronologically.
      *
      * @param  that the other date
      * @return {@code true} if this date is after that date; {@code false} otherwise
      */
-    bool isAfter(const Date &that) {
-        return compareTo(that) > 0;
+    bool isAfter(const Date &that) const {
+        return (*this) > that;
     }
 
     /**
@@ -118,18 +132,10 @@ class Date {
      * @param  that the other date
      * @return {@code true} if this date is before that date; {@code false} otherwise
      */
-    bool isBefore(Date that) {
-        return compareTo(that) < 0;
+    bool isBefore(const Date &that) const {
+        return (*this) < that;
     }
 
-    // 输入输出运算符为非成员函数
-    friend ostream &operator<<(ostream &stream, const Date &item);
-
-    // 算术和关系运算符一般也定义成非成员函数
-    friend bool operator==(const Date &d1, const Date &d2);
-
-    friend bool operator<(const Date &d1, const Date &d2);
-
 
 private:
     // is the given date valid?
@@ -147,29 +153,6 @@ class Date {
         return y % 4 == 0;
     }
 
-    /**
-    * Compares two dates chronologically.
-    *
-    * @return the value {@code 0} if the argument date is equal to this date;
-    *         a negative integer if this date is chronologically less than
-    *         the argument date; and a positive ineger if this date is chronologically
-    *         after the argument date
-    */
-    int compareTo(const Date &that) {
-        if (year < that.year) return -1;
-        if (year > that.year) return +1;
-        if (month < that.month) return -1;
-        if (month > that.month) return +1;
-        if (day < that.day) return -1;
-        if (day > that.day) return +1;
-        return 0;
-    }
-
-private:
-    const static vector<int> DAYS;
-    int month;   // month (between 1 and 12)
-    int day;     // day   (between 1 and DAYS[month]
-    int year;    // year
 };
 
 const vector<int> Date::DAYS = {0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
@@ -193,6 +176,14 @@ bool operator==(const Date &d1, const Date &d2) {
     return (d1.month == d2.month) && (d1.day == d2.day) && (d1.year == d2.year);
 }
 
+/**
+ * Compares two dates chronologically.
+ *
+ * @return the value {@code 0} if the argument date is equal to this date;
+ *         a negative integer if this date is chronologically less than
+ *         the argument date; and a positive ineger if this date is chronologically
+ *         after the argument date
+ */
 bool operator<(const Date &d1, const Date &d2) {
     if (d1.year < d2.year) return true;
     if (d1.year > d2.year) return false;
@@ -203,4 +194,14 @@ bool operator<(const Date &d1, const Date &d2) {
     return false;
 }
 
+bool operator>(const Date &d1, const Date &d2) {
+    if (d1.year > d2.year) return true;
+    if (d1.year < d2.year) return false;
+    if (d1.month > d2.month) return true;
+    if (d1.month < d2.month) return false;
+    if (d1.day > d2.day) return true;
+    if (d1.day < d2.day) return false;
+    return false;
+}
+
 #endif //CH1_DATE_H

ch1/head/Knuth.h

@@ -30,6 +30,7 @@ std::mt19937 gen(rd());
  */
 class Knuth {
 public:
+    // this class should not be instantiated
     Knuth() = delete;
 
     /**