update ch1

Author: AceCoooool

ch1/20_ResizingArrayQueue/main.cpp

@@ -4,9 +4,13 @@
 
 using namespace std;
 
-
+/**
+* Unit tests the {@code ResizingArrayQueue} data type.
+*
+* @param args the command-line arguments
+*/
 int main() {
-    ifstream file("/home/ace/AceDev/C++/algorithm/ch1/data/tobe.txt");
+    ifstream file("./data/tobe.txt");
     ResizingArrayQueue<string> queue;
     string tmp;
     while (file >> tmp) {

ch1/21_LinkedQueue/main.cpp

@@ -2,15 +2,16 @@
 #include <fstream>
 #include "../head/LinkedQueue.h"
 
-#include <memory>
 
 using namespace std;
 
-
+/**
+ * Unit tests the {@code LinkedQueue} data type.
+ *
+ * @param args the command-line arguments
+ */
 int main() {
-//    unique_ptr<int> p(nullptr);
-//    cout << (p == nullptr) << endl;
-    ifstream file("/home/ace/AceDev/C++/algorithm/ch1/data/tobe.txt");
+    ifstream file("./data/tobe.txt");
     LinkedQueue<string> queue;
     string tmp;
     while (file >> tmp) {

ch1/22_Queue/main.cpp

@@ -4,9 +4,13 @@
 
 using namespace std;
 
-
+/**
+ * Unit tests the {@code Queue} data type.
+ *
+ * @param args the command-line arguments
+ */
 int main() {
-    ifstream file("/home/ace/AceDev/C++/algorithm/ch1/data/tobe.txt");
+    ifstream file("./data/tobe.txt");
     Queue<string> queue;
     string tmp;
     while (file >> tmp) {

ch1/23_ResizingArrayBag/main.cpp

@@ -4,9 +4,13 @@
 
 using namespace std;
 
-
+/**
+ * Unit tests the {@code ResizingArrayBag} data type.
+ *
+ * @param args the command-line arguments
+ */
 int main() {
-    ifstream file("/home/ace/AceDev/C++/algorithm/ch1/data/tobe.txt");
+    ifstream file("./data/tobe.txt");
     ResizingArrayBag<string> bag;
     bag.add("Hello");
     bag.add("World");

ch1/24_LinkedBag/main.cpp

@@ -4,9 +4,13 @@
 
 using namespace std;
 
-
+/**
+ * Unit tests the {@code LinkedBag} data type.
+ *
+ * @param args the command-line arguments
+ */
 int main() {
-    ifstream file("/home/ace/AceDev/C++/algorithm/ch1/data/tobe.txt");
+    ifstream file("./data/tobe.txt");
     LinkedBag<string> bag;
     string tmp;
     while (file >> tmp) {

ch1/25_Bag/main.cpp

@@ -4,9 +4,13 @@
 
 using namespace std;
 
-
+/**
+ * Unit tests the {@code Bag} data type.
+ *
+ * @param args the command-line arguments
+ */
 int main() {
-    ifstream file("/home/ace/AceDev/C++/algorithm/ch1/data/tobe.txt");
+    ifstream file("./data/tobe.txt");
     Bag<string> bag;
     string tmp;
     while (file >> tmp) {

ch1/26_Stopwatch/main.cpp

@@ -4,7 +4,11 @@
 
 using namespace std;
 
-
+/**
+ * Unit tests the {@code Bag} data type.
+ *
+ * @param args the command-line arguments
+ */
 int main() {
     int n = 10000;
     // sum of square roots of integers from 1 to n using Math.sqrt(x).

ch1/28_LinearRegression/main.cpp

@@ -3,7 +3,10 @@
 
 using namespace std;
 
-
+/**
+ * simple test
+ * @return 
+ */
 int main() {
     vector<double> a{1.0, 2.0, 3.0, 4.1}, b{1.01, 2.01, 2.99, 4.0};
     LinearRegression lr(a, b);

ch1/29_ThreeSum/main.cpp

@@ -13,7 +13,7 @@ using namespace std;
  * @param args the command-line arguments
  */
 int main() {
-    ifstream file("/home/ace/AceDev/C++/algorithm/ch1/data/2Kints.txt");
+    ifstream file("./data/2Kints.txt");
     vector<int> vec;
     int tmp;
     while (file >> tmp)

ch1/30_ThreeSumFast/main.cpp

@@ -13,7 +13,7 @@ using namespace std;
  * @param args the command-line arguments
  */
 int main() {
-    ifstream file("/home/ace/AceDev/C++/algorithm/ch1/data/1Kints.txt");
+    ifstream file("./data/1Kints.txt");
     vector<int> vec;
     int tmp;
     while (file >> tmp)

ch1/31_DoublingTest/main.cpp

@@ -1,5 +1,4 @@
 #include <istream>
-#include <fstream>
 #include "../head/DoublingTest.h"
 
 using namespace std;

ch1/33_QuickFindUF/main.cpp

@@ -13,7 +13,7 @@ using namespace std;
  * @param args the command-line arguments
  */
 int main() {
-    fstream file("/home/ace/AceDev/C++/algorithm/ch1/data/tinyUF.txt");
+    fstream file("./data/tinyUF.txt");
     int n, p, q;
     file >> n;
     QuickFindUF uf(n);
@@ -22,5 +22,5 @@ int main() {
         uf.union_op(p, q);
         cout << p << " " << q << endl;
     }
-    cout << uf.getcount() << " components" << endl;
+    cout << uf.count_() << " components" << endl;
 }

ch1/34_QuickUnionUF/main.cpp

@@ -13,7 +13,7 @@ using namespace std;
  * @param args the command-line arguments
  */
 int main() {
-    fstream file("/home/ace/AceDev/C++/algorithm/ch1/data/tinyUF.txt");
+    fstream file("./data/tinyUF.txt");
     int n, p, q;
     file >> n;
     QuickUnionUF uf(n);
@@ -22,5 +22,5 @@ int main() {
         uf.union_op(p, q);
         cout << p << " " << q << endl;
     }
-    cout << uf.getcount() << " components" << endl;
+    cout << uf.count_() << " components" << endl;
 }

ch1/35_WeightedQuickUnionUF/main.cpp

@@ -13,7 +13,7 @@ using namespace std;
  * @param args the command-line arguments
  */
 int main() {
-    fstream file("/home/ace/AceDev/C++/algorithm/ch1/data/largeUF.txt");
+    fstream file("./data/largeUF.txt");
     int n, p, q;
     file >> n;
     WeightedQuickUnionUF uf(n);
@@ -22,5 +22,5 @@ int main() {
         uf.union_op(p, q);
         cout << p << " " << q << endl;
     }
-    cout << uf.getcount() << " components" << endl;
+    cout << uf.count_() << " components" << endl;
 }

ch1/36_UF/main.cpp

@@ -13,7 +13,7 @@ using namespace std;
  * @param args the command-line arguments
  */
 int main() {
-    fstream file("/home/ace/AceDev/C++/algorithm/ch1/data/largeUF.txt");
+    fstream file("./data/largeUF.txt");
     int n, p, q;
     file >> n;
     UF uf(n);
@@ -22,5 +22,5 @@ int main() {
         uf.union_op(p, q);
         cout << p << " " << q << endl;
     }
-    cout << uf.getcount() << " components" << endl;
+    cout << uf.count_() << " components" << endl;
 }

ch1/head/Accumulator.h

@@ -51,15 +51,15 @@ class Accumulator {
      * Returns the mean of the data values.
      * @return the mean of the data values
      */
-    double mean() {
+    double mean() const {
         return mu;
     }
 
     /**
      * Returns the sample variance of the data values.
      * @return the sample variance of the data values
      */
-    double var() {
+    double var() const {
         if (n <= 1) return numeric_limits<double>::quiet_NaN();
         return sumval / (n - 1);
     }
@@ -68,15 +68,15 @@ class Accumulator {
      * Returns the sample standard deviation of the data values.
      * @return the sample standard deviation of the data values
      */
-    double stddev() {
+    double stddev() const {
         return sqrt(var());
     }
 
     /**
      * Returns the number of data values.
      * @return the number of data values
      */
-    int count() {
+    int count() const {
         return n;
     }
 

ch1/head/Bag.h

@@ -1,10 +1,6 @@
 #ifndef CH1_BAG_H
 #define CH1_BAG_H
 
-#include <memory>
-
-using std::unique_ptr;
-
 
 /**
  *  The {@code Bag} class represents a bag (or multiset) of
@@ -34,6 +30,14 @@ class Bag {
      */
     Bag() : first(nullptr), n(0) {}
 
+    ~Bag() {
+        while (first) {
+            auto tmp = first;
+            first = first->next;
+            delete (tmp);
+        }
+    }
+
     /**
      * Is this bag empty?
      * @return true if this bag is empty; false otherwise
@@ -55,36 +59,39 @@ class Bag {
      * @param item the item to add to this bag
      */
     void add(T item) {
-        auto oldfirst = move(first);
-        first.reset(new Node());
-        first->item = item;
-        first->next = move(oldfirst);
+        auto tmp = first;
+        first = new Node(item);
+        first->next = tmp;
         n++;
     }
 
 private:
     class Node {
     public:
+        Node() : next(nullptr) {}
+
+        Node(T item) : item(item), next(nullptr) {}
+
         T item;
-        unique_ptr<Node> next;
+        Node *next;
     };
 
     // an iterator
     class Iterator {
-        unique_ptr<Node> data;
+        Node *data;
         int pos;
         int n;
     public:
         // initial iterator
-        Iterator(Node *data_, int pos_, int n_) : pos(pos_), n(n_) { data.reset(data_); }
+        Iterator(Node *data_, int pos_, int n_) : pos(pos_), n(n_), data(data_) {}
 
         // get current value
-        T &operator*() { return data.get()->item; }
+        T &operator*() { return data->item; }
 
         // next iterator
         Iterator &operator++() {
             if (++pos == n)pos = 0;
-            data = move(data->next);
+            data = data->next;
             return *this;
         }
 
@@ -94,22 +101,20 @@ class Bag {
 
     // a const iterator
     class ConstIterator {
-        unique_ptr<Node> data;
+        Node *data;
         int pos;
         int n;
     public:
         // initial iterator
-        ConstIterator(Node *data_, int pos_, int n_) : pos(pos_), n(n_) {
-            data.reset(data_);
-        }
+        ConstIterator(Node *data_, int pos_, int n_) : pos(pos_), n(n_), data(data_) {}
 
         // get current value
-        const T &operator*() { return data.get()->item; }
+        const T &operator*() { return data->item; }
 
         // next iterator
         ConstIterator &operator++() {
             if (++pos == n)pos = 0;
-            data = move(data->next);
+            data = data->next;
             return *this;
         }
 
@@ -123,17 +128,17 @@ class Bag {
      * @return an iterator that iterates over the items in the bag in arbitrary order
      */
 
-    Iterator begin() { return {first.get(), 0, n + 1}; }
+    Iterator begin() { return {first, 0, n + 1}; }
 
     Iterator end() { return {nullptr, n, n + 1}; }
 
-    ConstIterator begin() const { return {first.get(), 0, n + 1}; }
+    ConstIterator begin() const { return {first, 0, n + 1}; }
 
     ConstIterator end() const { return {nullptr, n, n + 1}; }
 
 private:
     int n;     // number of elements in bag
-    unique_ptr<Node> first;    // beginning of bag
+    Node *first;    // beginning of bag
 
 };