Aliases added, to make code more clean

Author: gitmajo

Database.cpp

@@ -4,9 +4,13 @@
 #include <fstream>
 #include <algorithm>
 
+using studentPtr = std::shared_ptr<Student>;
+using employeePtr = std::shared_ptr<Employee>;
+using std::dynamic_pointer_cast;
+
 personIter Database::searchByLastName(const std::string& lastName)
 {
-    auto it = std::find_if(begin(data), end(data), [lastName] (std::shared_ptr<Person> person) 
+    auto it = std::find_if(begin(data), end(data), [lastName] (personPtr person)
             {
             return person -> getLastName() == lastName;
             });
@@ -20,7 +24,7 @@ personIter Database::searchByLastName(const std::string& lastName)
 
 personIter Database::searchByPersonalID(const unsigned long long& personalID)
 {
-    auto it = std::find_if(begin(data), end(data), [personalID] (std::shared_ptr<Person> person) 
+    auto it = std::find_if(begin(data), end(data), [personalID] (personPtr person)
             {
             return person -> getPersonalID() == personalID;
             });
@@ -34,9 +38,9 @@ personIter Database::searchByPersonalID(const unsigned long long& personalID)
 
 personIter Database::searchByStudentID(const unsigned long& studentID)
 {
-    auto it = std::find_if(begin(data), end(data), [studentID] (std::shared_ptr<Person> person) 
+    auto it = std::find_if(begin(data), end(data), [studentID] (personPtr person)
             {
-            std::shared_ptr<Student> student = std::dynamic_pointer_cast<Student>(person);
+            studentPtr student = dynamic_pointer_cast<Student>(person);
             return student -> getStudentIndex() == studentID;
             });
 
@@ -59,19 +63,19 @@ void Database::printDatabase() const
 
 void Database::sortBySalary()
 {
-    std::sort(begin(data), end(data), [](std::shared_ptr<Person> left, std::shared_ptr<Person> right)
+    std::sort(begin(data), end(data), [](personPtr left, personPtr right)
             {
             //input: 10.1 NaN 2.5  NaN 3.6
             //output: 2.5 3.6 10.1 Nan Nan
 
             //NaN 2.5 --- if student on the left: bad!
-            if(std::dynamic_pointer_cast<Student>(left)) return false;
+            if(dynamic_pointer_cast<Student>(left)) return false;
 
             //2.5 NaN -- if student on the right: good! move all to the right
-            if(std::dynamic_pointer_cast<Student>(right)) return true;
+            if(dynamic_pointer_cast<Student>(right)) return true;
 
-            std::shared_ptr<Employee> e_left = std::dynamic_pointer_cast<Employee>(left);
-            std::shared_ptr<Employee> e_right = std::dynamic_pointer_cast<Employee>(right);
+            employeePtr e_left = dynamic_pointer_cast<Employee>(left);
+            employeePtr e_right = dynamic_pointer_cast<Employee>(right);
             //if employee, compare it usually
             return e_left->getSalary() < e_right->getSalary();
             });
@@ -80,34 +84,34 @@ void Database::sortBySalary()
 
 void Database::sortByLastName()
 {
-    std::sort(begin(data), end(data), [](std::shared_ptr<Person> left, std::shared_ptr<Person> right)
+    std::sort(begin(data), end(data), [](personPtr left, personPtr right)
             {
             return left->getLastName() < right->getLastName();
             });
 }
 
 void Database::sortByPersonalID()
 {
-    std::sort(begin(data), end(data), [](std::shared_ptr<Person> left, std::shared_ptr<Person> right)
-    {
-        return left->getPersonalID() < right->getPersonalID();
-    });
+    std::sort(begin(data), end(data), [](personPtr left, personPtr right)
+            {
+            return left->getPersonalID() < right->getPersonalID();
+            });
 }
 
 void Database::sortByStudentID()
 {
-    std::sort(begin(data), end(data), [](std::shared_ptr<Person> left, std::shared_ptr<Person> right)
+    std::sort(begin(data), end(data), [](personPtr left, personPtr right)
             {
-            if(std::dynamic_pointer_cast<Employee>(left)) return false;
-            if(std::dynamic_pointer_cast<Employee>(right)) return true;
+            if(dynamic_pointer_cast<Employee>(left)) return false;
+            if(dynamic_pointer_cast<Employee>(right)) return true;
 
-            std::shared_ptr<Student> student1 = std::dynamic_pointer_cast<Student>(left);
-            std::shared_ptr<Student> student2 = std::dynamic_pointer_cast<Student>(right);
+            studentPtr student1 = dynamic_pointer_cast<Student>(left);
+            studentPtr student2 = dynamic_pointer_cast<Student>(right);
             return student1->getStudentIndex() < student2->getStudentIndex();
             });
 }
 
-void Database::addPerson(std::shared_ptr<Person> person)
+void Database::addPerson(personPtr person)
 {
     data.push_back(person);
 }
@@ -119,7 +123,7 @@ bool Database::addStudent(const std::string& firstName,
         const std::string& address,
         const unsigned long& studentIndex)
 {
-    std::shared_ptr<Person> student = std::make_shared<Student>(firstName, 
+    personPtr student = std::make_shared<Student>(firstName,
             lastName, personalID, gender, address, studentIndex);
     addPerson(student);
     return true;
@@ -132,7 +136,7 @@ bool Database::addEmployee(const std::string& firstName,
         const std::string& address,
         const double& salary)
 {
-    std::shared_ptr<Person> employee = std::make_shared<Employee>(firstName, 
+    personPtr employee = std::make_shared<Employee>(firstName,
             lastName, personalID, gender, address, salary);
     addPerson(employee);
     return true;
@@ -201,12 +205,12 @@ bool Database::removeByStudentID(const unsigned long& studentID)
     auto iter = searchByStudentID(studentID);
 
     if (iter != end(data))
-     {
-         data.erase(iter);
-         return true;
-     }
-     else
-         return false;
+    {
+        data.erase(iter);
+        return true;
+    }
+    else
+        return false;
 }
 
 bool Database::modifySalary(const unsigned long long& personalID, const double& newSalary)
@@ -215,7 +219,7 @@ bool Database::modifySalary(const unsigned long long& personalID, const double&
 
     if (personIter != data.end())
     {
-        if(std::shared_ptr<Employee> isEmployee = std::dynamic_pointer_cast<Employee>(*personIter))
+        if(employeePtr isEmployee = dynamic_pointer_cast<Employee>(*personIter))
         {
             isEmployee->setSalary(newSalary);
             return true;

Database.hpp

@@ -5,11 +5,12 @@
 #include "Person.hpp"
 
 using personIter = std::vector<std::shared_ptr<Person>>::iterator;
+using personPtr = std::shared_ptr<Person>;
 
 class Database
 {
     private:
-        std::vector<std::shared_ptr<Person>> data {};
+        std::vector<personPtr> data {};
     public:
         personIter searchByLastName(const std::string& lastName);
         personIter searchByPersonalID(const unsigned long long& personalID);
@@ -19,7 +20,7 @@ class Database
         void sortByLastName();
         void sortByPersonalID();
         void sortByStudentID();
-        void addPerson(std::shared_ptr<Person> person);
+        void addPerson(personPtr person);
 
         bool addStudent(const std::string& firstName,
                 const std::string& lastName,

Person.hpp

@@ -22,7 +22,7 @@ class Person
         std::string getLastName() const;
         unsigned long long getPersonalID() const;
         void setAddress(const std::string& newAddress);
-        
+
         friend std::ostream& operator<<(std::ostream& os, const Person* person);
         virtual std::string getInfo() const;
         virtual ~Person() {};