From bfde515da56b7ff3d517c773483be75146cc4ccd Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Tue, 24 Jan 2017 10:42:05 -0400 Subject: [PATCH 01/17] Added header file --- Racer.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 Racer.h diff --git a/Racer.h b/Racer.h new file mode 100644 index 0000000..cd53f06 --- /dev/null +++ b/Racer.h @@ -0,0 +1,41 @@ +//Racer Class +#include +#include +#include +#include +using namespace std; + +//Racer class definition + +class Racer +{ +public: + //constructor initializing Racer's names and Racer's Category + Racer(const string & name, const string & category) + :racerName(name), racerCategory(category){ + } + + //function to set the Racer name + void setRacerName(const string & name){ + racerName = name; //Stores the Racer's full name + } + + //function to set the Racer's Category + void setRacerCategory(const string & category){ + racerCategory = category; + } + + //function to retrieve the Patient name + const string & getRacerName() const { + return racerName; + } + + //function to retrieve the Patient's Id + const string & getracerCategory() const { + return racerCategory; + } + +private: + string racerName; + string racerCategory; +}; From 7efd8c0c955f060bd63e2dc7455206523f393df3 Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Tue, 24 Jan 2017 12:02:12 -0400 Subject: [PATCH 02/17] Almost done --- Racer.h | 21 ++++++--------------- Racer_Driver.cpp | 29 +++++++++++++++++++++++++++++ Racer_Imp.cpp | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 15 deletions(-) create mode 100644 Racer_Driver.cpp create mode 100644 Racer_Imp.cpp diff --git a/Racer.h b/Racer.h index cd53f06..fa446e4 100644 --- a/Racer.h +++ b/Racer.h @@ -11,31 +11,22 @@ class Racer { public: //constructor initializing Racer's names and Racer's Category - Racer(const string & name, const string & category) - :racerName(name), racerCategory(category){ - } + Racer(const string & name, const int & category); //function to set the Racer name - void setRacerName(const string & name){ - racerName = name; //Stores the Racer's full name - } + void setRacerName(const string & name); //function to set the Racer's Category - void setRacerCategory(const string & category){ - racerCategory = category; - } + void setRacerCategory(const int & category); //function to retrieve the Patient name - const string & getRacerName() const { - return racerName; + const string & getRacerName() const ; } //function to retrieve the Patient's Id - const string & getracerCategory() const { - return racerCategory; - } + const int & getracerCategory() const ; private: string racerName; - string racerCategory; + int racerCategory; }; diff --git a/Racer_Driver.cpp b/Racer_Driver.cpp new file mode 100644 index 0000000..255d487 --- /dev/null +++ b/Racer_Driver.cpp @@ -0,0 +1,29 @@ +//Racer Driver file +#include +#include +#include +#include +using namespace std; + +#include "Racer.h" + +int main() +{ + string name; + int category; + Racer bikeRacer; + + cout << "Enter the Bike racer's name?: "; + getline(cin, name); + cout << "\nEnter the Bike racer's Category"; + cin >> category; + + bikeRacer.setRacerName(name); + bikeRacer.setRacerCategory(category); + + bikeRacer.displayInfo(); + + return 0; +} + + diff --git a/Racer_Imp.cpp b/Racer_Imp.cpp new file mode 100644 index 0000000..f172e5c --- /dev/null +++ b/Racer_Imp.cpp @@ -0,0 +1,46 @@ +//Racer Class Implementation +#include +#include +#include +#include +using namespace std; + +#include "Racer.h" + +Racer::Racer(string name, int category) //constructor +{ + racerName = name; + racerCategory = category; +} + +//set the Racer name +void Racer::setRacerName(string name) +{ + racerName = name; +} + +//retrieve the Racer name +string Racer::getRacerName() +{ + return racerName; +} + +//set the Racer Category +void Racer::setRacerCategory(int category) +{ + racerCategory = category; +} + +//retrieve the Racer Category +int Racer::getracerCategory() +{ + return racerCategory; +} + +//displays all of the Racer object's data +void Racer::displayInfo() +{ + cout << "Name: " << racerName << endl; + cout << "Category: " << racerCategory << endl; +} + From 0af9b70148a7472fa4c860a74a2183d2d854afb1 Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Sat, 28 Jan 2017 03:01:55 -0400 Subject: [PATCH 03/17] Sorted the header&implementation files --- Racer.h | 18 ++++++++++-------- Racer_Imp.cpp | 8 +++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Racer.h b/Racer.h index fa446e4..49d8c05 100644 --- a/Racer.h +++ b/Racer.h @@ -11,20 +11,22 @@ class Racer { public: //constructor initializing Racer's names and Racer's Category - Racer(const string & name, const int & category); + Racer(const string name, const int category); //function to set the Racer name - void setRacerName(const string & name); + void setRacerName(const string name); //function to set the Racer's Category - void setRacerCategory(const int & category); + void setRacerCategory(const int category); - //function to retrieve the Patient name - const string & getRacerName() const ; - } + //function to display information + void displayInfo(); - //function to retrieve the Patient's Id - const int & getracerCategory() const ; + //function to retrieve the Racer's name + string getRacerName(); + + //function to retrieve the Racer's Category + int getracerCategory(); private: string racerName; diff --git a/Racer_Imp.cpp b/Racer_Imp.cpp index f172e5c..ca09fdf 100644 --- a/Racer_Imp.cpp +++ b/Racer_Imp.cpp @@ -7,11 +7,9 @@ using namespace std; #include "Racer.h" -Racer::Racer(string name, int category) //constructor -{ - racerName = name; - racerCategory = category; -} +//constructor +Racer::Racer(const string name, const int category):racerName(name),racerCategory(category) +{} //set the Racer name void Racer::setRacerName(string name) From 72f029e43d9d6dd2da7d290e346f57846e7f5020 Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Sat, 28 Jan 2017 03:13:55 -0400 Subject: [PATCH 04/17] Sorted the Driver file --- Racer_Driver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Racer_Driver.cpp b/Racer_Driver.cpp index 255d487..0b713cd 100644 --- a/Racer_Driver.cpp +++ b/Racer_Driver.cpp @@ -9,9 +9,9 @@ using namespace std; int main() { - string name; - int category; - Racer bikeRacer; + string name = ""; + int category = 0; + Racer bikeRacer(name, category); cout << "Enter the Bike racer's name?: "; getline(cin, name); From 8461cbf5906ea0e830a6955c2fc3b38e8c1bfc0b Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Sat, 28 Jan 2017 03:18:58 -0400 Subject: [PATCH 05/17] Modded the Driver file a bit, have to add the vector now --- Racer_Driver.cpp | 4 ++-- Racer_Imp.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Racer_Driver.cpp b/Racer_Driver.cpp index 0b713cd..541432b 100644 --- a/Racer_Driver.cpp +++ b/Racer_Driver.cpp @@ -13,9 +13,9 @@ int main() int category = 0; Racer bikeRacer(name, category); - cout << "Enter the Bike racer's name?: "; + cout << "Enter the Bike racer's name: "; getline(cin, name); - cout << "\nEnter the Bike racer's Category"; + cout << "\nEnter the Bike racer's Category Level:"; cin >> category; bikeRacer.setRacerName(name); diff --git a/Racer_Imp.cpp b/Racer_Imp.cpp index ca09fdf..15d3c8c 100644 --- a/Racer_Imp.cpp +++ b/Racer_Imp.cpp @@ -38,7 +38,9 @@ int Racer::getracerCategory() //displays all of the Racer object's data void Racer::displayInfo() { + cout << "**** Rider's Name and Category ****" cout << "Name: " << racerName << endl; cout << "Category: " << racerCategory << endl; + cout << " *******************" << endl; } From a72ab95d8875bd8dc069f50696b9fcca1fad163d Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Sat, 28 Jan 2017 03:20:57 -0400 Subject: [PATCH 06/17] Modded the Driver file a bit, have to add the vector now --- Racer_Imp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Racer_Imp.cpp b/Racer_Imp.cpp index 15d3c8c..bcc7212 100644 --- a/Racer_Imp.cpp +++ b/Racer_Imp.cpp @@ -38,7 +38,7 @@ int Racer::getracerCategory() //displays all of the Racer object's data void Racer::displayInfo() { - cout << "**** Rider's Name and Category ****" + cout << "**** Rider's Name and Category ****" << endl; cout << "Name: " << racerName << endl; cout << "Category: " << racerCategory << endl; cout << " *******************" << endl; From e7245f2f82f977a9b670e96f85f6af65216ddb48 Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Sun, 29 Jan 2017 11:12:45 -0400 Subject: [PATCH 07/17] Update Racer.h --- Racer.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Racer.h b/Racer.h index 49d8c05..affda54 100644 --- a/Racer.h +++ b/Racer.h @@ -5,14 +5,17 @@ #include using namespace std; -//Racer class definition +#ifndef RACER_H +#define RACER_H +//Racer class definition class Racer { + public: //constructor initializing Racer's names and Racer's Category - Racer(const string name, const int category); - + Racer(const string name, const int category); + //function to set the Racer name void setRacerName(const string name); @@ -24,11 +27,14 @@ class Racer //function to retrieve the Racer's name string getRacerName(); - + //function to retrieve the Racer's Category int getracerCategory(); - + private: string racerName; int racerCategory; + }; + +#endif From a76daaf795e267dd925d620816c97e3681953f02 Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Sun, 29 Jan 2017 11:13:20 -0400 Subject: [PATCH 08/17] Added #ifndef --- Racer.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Racer.h b/Racer.h index affda54..c91025d 100644 --- a/Racer.h +++ b/Racer.h @@ -11,7 +11,6 @@ using namespace std; //Racer class definition class Racer { - public: //constructor initializing Racer's names and Racer's Category Racer(const string name, const int category); From f246cd45a759e5872091359451fd9fdd91ada22e Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Sun, 29 Jan 2017 11:14:23 -0400 Subject: [PATCH 09/17] tidy up of the implementation file --- Racer_Imp.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Racer_Imp.cpp b/Racer_Imp.cpp index bcc7212..96214fe 100644 --- a/Racer_Imp.cpp +++ b/Racer_Imp.cpp @@ -1,15 +1,15 @@ //Racer Class Implementation -#include -#include -#include -#include -using namespace std; #include "Racer.h" +using namespace std; + //constructor -Racer::Racer(const string name, const int category):racerName(name),racerCategory(category) -{} +Racer::Racer(const string name, const int category) + { + racerName = name; + racerCategory = category; + } //set the Racer name void Racer::setRacerName(string name) @@ -17,7 +17,7 @@ void Racer::setRacerName(string name) racerName = name; } -//retrieve the Racer name +//retrieve the Racer name string Racer::getRacerName() { return racerName; @@ -43,4 +43,3 @@ void Racer::displayInfo() cout << "Category: " << racerCategory << endl; cout << " *******************" << endl; } - From 17886ac5c1879d78313163c7f4ebb028c5eb07ee Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Sun, 29 Jan 2017 11:16:16 -0400 Subject: [PATCH 10/17] Figured out how to used the class implementation structure --- Racer_Driver.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Racer_Driver.cpp b/Racer_Driver.cpp index 541432b..e7b4f19 100644 --- a/Racer_Driver.cpp +++ b/Racer_Driver.cpp @@ -3,6 +3,7 @@ #include #include #include + using namespace std; #include "Racer.h" @@ -11,19 +12,21 @@ int main() { string name = ""; int category = 0; - Racer bikeRacer(name, category); - + Racer bikeRacer(name, category); + cout << "Enter the Bike racer's name: "; getline(cin, name); + cout << "\nEnter the Bike racer's Category Level:"; cin >> category; bikeRacer.setRacerName(name); - bikeRacer.setRacerCategory(category); - + bikeRacer.setRacerCategory(category); + bikeRacer.displayInfo(); return 0; -} +} +// Figured out how to get this done on the windows side of things using Visual Studio From b1b64aa29a3b7730a13aa1e4dbcdd3e6de034e7a Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Sun, 29 Jan 2017 17:25:28 -0400 Subject: [PATCH 11/17] Revamped of the Driver file --- Racer_Driver.cpp | 70 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 14 deletions(-) diff --git a/Racer_Driver.cpp b/Racer_Driver.cpp index e7b4f19..f632050 100644 --- a/Racer_Driver.cpp +++ b/Racer_Driver.cpp @@ -1,32 +1,74 @@ //Racer Driver file #include -#include +#include #include #include +#include using namespace std; #include "Racer.h" -int main() -{ - string name = ""; - int category = 0; - Racer bikeRacer(name, category); +void fillVector(vector&); +void printVector(const vector&); +//void printVector2(const vector&); - cout << "Enter the Bike racer's name: "; - getline(cin, name); - cout << "\nEnter the Bike racer's Category Level:"; - cin >> category; +int main() +{ + vector racerArray; - bikeRacer.setRacerName(name); - bikeRacer.setRacerCategory(category); + fillVector(racerArray); - bikeRacer.displayInfo(); + printVector(racerArray); + + system("pause"); return 0; } -// Figured out how to get this done on the windows side of things using Visual Studio +void fillVector(vector& newRacerArray) +{ + for (int x = 0; x < 4; x++) + { + int category; + string name; + cout << "Enter the Bike racer's name: "; + getline(cin, name); + + cout << "\nEnter the Bike racer's Category Level:"; + cin >> category; + cin.ignore(); + + Racer newRacer(name, category); + newRacerArray.push_back(newRacer); + cout << endl; + } + cout << endl; +} + +void printVector(const vector& newprintRacer) +{ + unsigned int vectorSize = newprintRacer.size(); + + for (unsigned int i = 0; i < vectorSize; i++) + { + cout << "Rider's name: " << newprintRacer[i].getRacerName() << endl; + cout << "Rider's category: " << newprintRacer[i].getracerCategory() << endl; + cout << endl; + } + +} + +/*void printVector2(const vector& newprintRacer) +{ + unsigned int vectorSize = newprintRacer.size(); + + for (unsigned int i = 0; i < vectorSize; i++) + { + cout << newprintRacer[i].displayInfo() << endl; + } + +} +*/ From 191ece893551367628ceca3818f94f07357bbe82 Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Sun, 29 Jan 2017 17:26:06 -0400 Subject: [PATCH 12/17] Added the four vectors --- Racer_Driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Racer_Driver.cpp b/Racer_Driver.cpp index f632050..4f80b86 100644 --- a/Racer_Driver.cpp +++ b/Racer_Driver.cpp @@ -11,7 +11,7 @@ using namespace std; void fillVector(vector&); void printVector(const vector&); -//void printVector2(const vector&); +//void printVector2(const vector&); /Need help to understand this. int main() From 7845958d0126de6bab1eb5632845887df9db6038 Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Sun, 29 Jan 2017 17:26:50 -0400 Subject: [PATCH 13/17] correct placement of const --- Racer.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Racer.h b/Racer.h index c91025d..2c1fd80 100644 --- a/Racer.h +++ b/Racer.h @@ -11,24 +11,28 @@ using namespace std; //Racer class definition class Racer { + public: - //constructor initializing Racer's names and Racer's Category - Racer(const string name, const int category); + //default constructor initializing Racer's names and Racer's Category + Racer(); + + //Overload constructor + Racer(string name, int category); //function to set the Racer name - void setRacerName(const string name); + void setRacerName(string name); //function to set the Racer's Category - void setRacerCategory(const int category); + void setRacerCategory(int category); //function to display information - void displayInfo(); + void displayInfo() const; //function to retrieve the Racer's name - string getRacerName(); + string getRacerName() const; //function to retrieve the Racer's Category - int getracerCategory(); + int getracerCategory() const; private: string racerName; From 28575c2cf99c27d5f36a57066a111fc50aa88c5e Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Sun, 29 Jan 2017 17:32:32 -0400 Subject: [PATCH 14/17] revamped with correct const --- Racer_Imp.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Racer_Imp.cpp b/Racer_Imp.cpp index 96214fe..153b0dc 100644 --- a/Racer_Imp.cpp +++ b/Racer_Imp.cpp @@ -5,11 +5,18 @@ using namespace std; //constructor -Racer::Racer(const string name, const int category) +Racer::Racer() { - racerName = name; - racerCategory = category; - } + racerName = " "; + racerCategory = 0; +} + +//Overload Constructors +Racer::Racer(string name, int category) +{ + racerName = name; + racerCategory = category; +} //set the Racer name void Racer::setRacerName(string name) @@ -18,7 +25,7 @@ void Racer::setRacerName(string name) } //retrieve the Racer name -string Racer::getRacerName() +string Racer::getRacerName() const { return racerName; } @@ -30,13 +37,13 @@ void Racer::setRacerCategory(int category) } //retrieve the Racer Category -int Racer::getracerCategory() +int Racer::getracerCategory() const { return racerCategory; } //displays all of the Racer object's data -void Racer::displayInfo() +void Racer::displayInfo() const { cout << "**** Rider's Name and Category ****" << endl; cout << "Name: " << racerName << endl; From 1aace9290312e1fd55f0b59aafc8472dea734869 Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Tue, 31 Jan 2017 10:31:29 -0400 Subject: [PATCH 15/17] function is already cout --- Racer_Driver.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Racer_Driver.cpp b/Racer_Driver.cpp index 4f80b86..be16b9f 100644 --- a/Racer_Driver.cpp +++ b/Racer_Driver.cpp @@ -11,7 +11,7 @@ using namespace std; void fillVector(vector&); void printVector(const vector&); -//void printVector2(const vector&); /Need help to understand this. +void printVector2(const vector&); //Need help to understand this. int main() @@ -20,7 +20,7 @@ int main() fillVector(racerArray); - printVector(racerArray); + printVector2(racerArray); system("pause"); @@ -61,14 +61,14 @@ void printVector(const vector& newprintRacer) } -/*void printVector2(const vector& newprintRacer) +void printVector2(const vector& newprintRacer) { unsigned int vectorSize = newprintRacer.size(); for (unsigned int i = 0; i < vectorSize; i++) { - cout << newprintRacer[i].displayInfo() << endl; + newprintRacer[i].displayInfo(); } } -*/ + From 1891e5ec7faa10f54f20f913c69f710594034238 Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Tue, 7 Feb 2017 11:37:13 -0400 Subject: [PATCH 16/17] Lab3 linear function added --- Racer_Driver.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/Racer_Driver.cpp b/Racer_Driver.cpp index be16b9f..18916ab 100644 --- a/Racer_Driver.cpp +++ b/Racer_Driver.cpp @@ -1,9 +1,10 @@ //Racer Driver file -#include -#include -#include -#include +#include +#include +#include +#include #include +#include //for "exit()" on some systems using namespace std; @@ -12,15 +13,44 @@ using namespace std; void fillVector(vector&); void printVector(const vector&); void printVector2(const vector&); //Need help to understand this. +int linearSearch(vector& data, auto key);//function prototype for linear search. int main() { + string search_key, input; + int result; vector racerArray; fillVector(racerArray); + + + // Implemented the linear function search from the algos lab. + // Commit out from here to "printVector2" to gain back the orginal + //implementation of this program. + + cout<>search_key; + + + while(search_key != "#")//perform searches until sentinel entered + { + result = linearSearch(racerArray,search_key); + + cout<<" '"<>search_key; + } + + //printVector2(racerArray); system("pause"); @@ -72,3 +102,16 @@ void printVector2(const vector& newprintRacer) } +int linearSearch(vector& data, auto key) +{ + for (int i = 0; i < data.size(); i++) + { + if (data[i].getRacerName() == key) + { + return i; + } + } + return -1; + +} + From 57ffb4cecec3985d3240ba28de7ba00c4a7c4abe Mon Sep 17 00:00:00 2001 From: MasterT1 Date: Tue, 7 Feb 2017 11:38:30 -0400 Subject: [PATCH 17/17] Lab3 linear function added --- Racer_Driver.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Racer_Driver.cpp b/Racer_Driver.cpp index 18916ab..806dd70 100644 --- a/Racer_Driver.cpp +++ b/Racer_Driver.cpp @@ -26,9 +26,12 @@ int main() // Implemented the linear function search from the algos lab. - // Commit out from here to "printVector2" to gain back the orginal + // Comment out from here to "printVector2" to gain back the orginal //implementation of this program. + //Added a linear search algorithm; which searches the vector once filled for matching + //Racer's names, and returns the index of the name. + cout<>search_key;