Format

lab3/User.cc

@@ -1,6 +1,5 @@
 #include "User.h"
 
-std::ostream& operator<<(std::ostream& os, const User& u)
+std::ostream &operator<<(std::ostream &os, const User &u) {
-{
+    return os << "(" << u.getCardNbr() << ") " << u.getName();
-    return os  << "(" << u.getCardNbr() << ") "<< u.getName();
 }

lab3/User.h

@@ -8,20 +8,26 @@ using std::cout;
 using std::endl;
 
 class User {
-public:
+  public:
-    User() :cardNbr{0},name{"default"}{}
+    User() : cardNbr{0}, name{"default"} {}
-    User(int c, std::string n) :cardNbr{c},name{n} {}
+    User(int c, std::string n) : cardNbr{c}, name{n} {}
-    ~User() {cardNbr=-2; name="--------------------";} // overwrite values for security reasons
+    ~User() {
-    User(const User& u) =default;
+        cardNbr = -2;
-    User& operator=(const User&) =default;
+        name = "--------------------";
-    int getCardNbr() const {return cardNbr;}
+    } // overwrite values for security reasons
-    std::string getName() const {return name;}
+    User(const User &u) = default;
-    bool operator==(const User& u) const {return cardNbr == u.cardNbr && name == u.name;}
+    User &operator=(const User &) = default;
-    bool operator!=(const User& u) const {return ! (u == *this);}
+    int getCardNbr() const { return cardNbr; }
-private:
+    std::string getName() const { return name; }
+    bool operator==(const User &u) const {
+        return cardNbr == u.cardNbr && name == u.name;
+    }
+    bool operator!=(const User &u) const { return !(u == *this); }
+
+  private:
     int cardNbr;
     std::string name;
 };
 
-std::ostream& operator<<(std::ostream& os, const User& u);
+std::ostream &operator<<(std::ostream &os, const User &u);
 #endif

lab3/UserTable.cc

@@ -1,24 +1,22 @@
 #include "UserTable.h"
-#include <fstream>
 #include <algorithm>
+#include <fstream>
 
-const User UserTable::user_not_found = User{-1,"Not Found"};
+const User UserTable::user_not_found = User{-1, "Not Found"};
 
-UserTable::UserTable() :users{new User[capacity]} { }
+UserTable::UserTable() : users{new User[capacity]} {}
 
-UserTable::UserTable(const std::string& fname) :UserTable{}
+UserTable::UserTable(const std::string &fname) : UserTable{} {
-{
     std::ifstream ufile(fname);
 
-    if(ufile.is_open()) {
+    if (ufile.is_open()) {
-        while(ufile) {
+        while (ufile) {
             int cn;
-            if(ufile >> cn ) {
+            if (ufile >> cn) {
                 ufile.ignore(); // skip space
                 char n[80];
-                ufile.getline(n,80);
+                ufile.getline(n, 80);
-                addUser(User(cn,n));
+                addUser(User(cn, n));
-
             }
         }
     } else {
@@ -26,34 +24,32 @@ UserTable::UserTable(const std::string& fname) :UserTable{}
     }
 }
 
-void UserTable::addUser(const User& u)
+void UserTable::addUser(const User &u) {
-{
     // gör tabellen större vid behov
-    ensureCapacity(n+1);
+    ensureCapacity(n + 1);
     // 1. Hitta rätt plats
     int pos{0};
-    while ( (pos < n) && (users[pos].getCardNbr() < u.getCardNbr())){
+    while ((pos < n) && (users[pos].getCardNbr() < u.getCardNbr())) {
         ++pos;
     }
 
-    //2. skapa lucka i vektorn
+    // 2. skapa lucka i vektorn
-    for(int i=n; i > pos; --i){
+    for (int i = n; i > pos; --i) {
-        users[i] = users[i-1];
+        users[i] = users[i - 1];
     }
 
-    //3. stoppa in den nya användaren i luckan
+    // 3. stoppa in den nya användaren i luckan
     users[pos] = u;
 }
 
-User UserTable::find(int c) const
+User UserTable::find(int c) const {
-{
     // binärsökning (baserad på Holm, 2007)
 
     int low = 0;
     int high = n - 1;
     int mid = -1;
     bool found = false;
-    while (low < high && ! found) {
+    while (low < high && !found) {
         mid = (low + high) / 2;
         //
         const int midnbr = users[mid].getCardNbr();
@@ -68,8 +64,7 @@ User UserTable::find(int c) const
 
     return found ? users[mid] : user_not_found;
 }
-User UserTable::find(std::string name) const
+User UserTable::find(std::string name) const {
-{
     for (int i = 0; i != n; ++i) {
         if (users[i].getName() == name) {
             return users[i];
@@ -80,25 +75,22 @@ User UserTable::find(std::string name) const
     return user_not_found;
 }
 
-void UserTable::ensureCapacity(int s)
+void UserTable::ensureCapacity(int s) {
-{
+    if (s > capacity) {
-    if(s>capacity) {
+        while (s > capacity) {
-        while(s > capacity) {
+            capacity *= 4;
-            capacity*=4;
         }
         auto tmp = new User[capacity];
-        std::copy(users, users+n, tmp);
+        std::copy(users, users + n, tmp);
         delete[] users;
-        users=tmp;
+        users = tmp;
     }
-
 }
-void UserTable::print(std::ostream& os) const
+void UserTable::print(std::ostream &os) const {
-{
     os << "-------------" << std::endl;
-    for(int i = 0; i != getNbrUsers(); ++i) {
+    for (int i = 0; i != getNbrUsers(); ++i) {
-        const auto& u = users[i];
+        const auto &u = users[i];
-        os << "(" <<u.getCardNbr() << ") " << u.getName() << std::endl;
+        os << "(" << u.getCardNbr() << ") " << u.getName() << std::endl;
     }
     os << "=============" << std::endl;
 }
@@ -108,8 +100,7 @@ void UserTable::print(std::ostream& os) const
  * Om något kortnummer inte kunde sökas upp returneras detta. Annars, om
  * alla sökningar lyckades, returneras 0.
  */
-int testFindNbr(const UserTable ut)
+int testFindNbr(const UserTable ut) {
-{
     for (int i = 0; i < ut.n; i++) {
         int nbr = ut.users[i].getCardNbr();
         User found = ut.find(nbr);
@@ -119,4 +110,3 @@ int testFindNbr(const UserTable ut)
     }
     return 0;
 }
-

lab3/UserTable.h

@@ -5,28 +5,27 @@
 
 #include "User.h"
 
-class UserTable{
+class UserTable {
-public:
+  public:
     UserTable();
-    UserTable(const std::string&);
+    UserTable(const std::string &);
-    ~UserTable() {delete[] users;}
+    ~UserTable() { delete[] users; }
 
-    void addUser(const User&);
+    void addUser(const User &);
     User find(int) const;
     User find(std::string) const;
 
-    int getNbrUsers() const {
+    int getNbrUsers() const { return n; }
-        return n;
-    }
 
-    void print(std::ostream&) const;
+    void print(std::ostream &) const;
 
     static const User user_not_found;
-private:
+
+  private:
     int capacity{1000};
     void ensureCapacity(int);
     int n{0};
-    User* users;
+    User *users;
 
     friend int testFindNbr(const UserTable ut);
 };

lab3/UserTableTest.cc

@@ -19,4 +19,3 @@ int main() {
 
     UserTable ut1 = UserTable("users.txt");
 }
-