From 2991731d92469b21918cd6005cdcce619053c735 Mon Sep 17 00:00:00 2001 From: xInnovate Date: Thu, 2 Feb 2017 14:31:28 -0400 Subject: [PATCH 01/10] Added header file again --- Average.h | 41 +++++++++++++++++++++++++++++++++++++++++ Source.cpp | 20 ++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 Average.h create mode 100644 Source.cpp diff --git a/Average.h b/Average.h new file mode 100644 index 0000000..307377f --- /dev/null +++ b/Average.h @@ -0,0 +1,41 @@ +#include +using namespace std; + +class Grades { + +public: + Grades(double classGrade, int numStudents) { + setNum(numStudents); + setGrade(classGrade); + setAverage(); +} + + void setNum(int numStudents) { + num = numStudents; + } + + int getNum() const { + return num; + } + + void setGrade(double classGrade) { + sumGrade = classGrade; + } + + double getGrade() const { + return gradeSum; + } + + void setAverage() { + average = classGrade / numStudents; + } + + double getAverage() const { + return average; + } + +private: + int num; + double sumGrade; + double average; +}; diff --git a/Source.cpp b/Source.cpp new file mode 100644 index 0000000..89d07be --- /dev/null +++ b/Source.cpp @@ -0,0 +1,20 @@ +#include +#include "Average.h" +#include +#include +using namespace std; + +int main() { + + Grades grade1 { 350 , 10 }; + Grades grade2 { 450 , 20 }; + Grades grade3 { 275 , 15 }; + Grades grade4 { 600 , 25 }; + vector v = { grade1, grade2, grade3, grade4 } + for (int x = 0; x < v.size(); x++) { + cout << "Grade: " << v[x].getGrade() << ", No. of students: " << v[x].getNum() << ", Class average: " << v[x].getAverage(); + cout << endl; + } + system("Pause"); + return 0; +} From 86d358fa4e08212e89a844b1d1abea4dba223104 Mon Sep 17 00:00:00 2001 From: xInnovate Date: Thu, 2 Feb 2017 14:33:06 -0400 Subject: [PATCH 02/10] Added header file again --- Source.cpp | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 Source.cpp diff --git a/Source.cpp b/Source.cpp deleted file mode 100644 index 89d07be..0000000 --- a/Source.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include "Average.h" -#include -#include -using namespace std; - -int main() { - - Grades grade1 { 350 , 10 }; - Grades grade2 { 450 , 20 }; - Grades grade3 { 275 , 15 }; - Grades grade4 { 600 , 25 }; - vector v = { grade1, grade2, grade3, grade4 } - for (int x = 0; x < v.size(); x++) { - cout << "Grade: " << v[x].getGrade() << ", No. of students: " << v[x].getNum() << ", Class average: " << v[x].getAverage(); - cout << endl; - } - system("Pause"); - return 0; -} From 46edc62cdd5dcc3e8615c8c287394aa7057c27d5 Mon Sep 17 00:00:00 2001 From: xInnovate Date: Thu, 2 Feb 2017 14:34:03 -0400 Subject: [PATCH 03/10] Added implementation file --- Source.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Source.cpp diff --git a/Source.cpp b/Source.cpp new file mode 100644 index 0000000..89d07be --- /dev/null +++ b/Source.cpp @@ -0,0 +1,20 @@ +#include +#include "Average.h" +#include +#include +using namespace std; + +int main() { + + Grades grade1 { 350 , 10 }; + Grades grade2 { 450 , 20 }; + Grades grade3 { 275 , 15 }; + Grades grade4 { 600 , 25 }; + vector v = { grade1, grade2, grade3, grade4 } + for (int x = 0; x < v.size(); x++) { + cout << "Grade: " << v[x].getGrade() << ", No. of students: " << v[x].getNum() << ", Class average: " << v[x].getAverage(); + cout << endl; + } + system("Pause"); + return 0; +} From 1e19357bb783faee9760dbae5f53cdc06ec8f859 Mon Sep 17 00:00:00 2001 From: xInnovate Date: Sun, 5 Feb 2017 13:19:08 -0400 Subject: [PATCH 04/10] Edited client file --- Average.cpp | 31 ++++++++++++++++++++++++++++ Average.h | 58 ++++++++++++++++++----------------------------------- Driver.cpp | 36 +++++++++++++++++++++++++++++++++ Source.cpp | 20 ------------------ 4 files changed, 87 insertions(+), 58 deletions(-) create mode 100644 Average.cpp create mode 100644 Driver.cpp delete mode 100644 Source.cpp diff --git a/Average.cpp b/Average.cpp new file mode 100644 index 0000000..4d2c3df --- /dev/null +++ b/Average.cpp @@ -0,0 +1,31 @@ +#include "Average.h" + +Average::Average() { + num = 0; + grade = 0.0; + average = 0.0; +} + +void Average::setGrade(double classGrade) { + grade = classGrade; +} + +double Average::getGrade() { + return grade; +} + +void Average::setNum(int numStudents) { + num = numStudents; +} + +int Average::getNum() { + return num; +} + +void Average::setAverage(int num, double grade) { + average = grade / num; +} + +double Average::getAverage() { + return average; +} diff --git a/Average.h b/Average.h index 307377f..d6e9875 100644 --- a/Average.h +++ b/Average.h @@ -1,41 +1,23 @@ -#include -using namespace std; - -class Grades { - +#ifndef AVERAGE_H +#define AVERAGE_H + +class Average { + public: - Grades(double classGrade, int numStudents) { - setNum(numStudents); - setGrade(classGrade); - setAverage(); -} - - void setNum(int numStudents) { - num = numStudents; - } - - int getNum() const { - return num; - } - - void setGrade(double classGrade) { - sumGrade = classGrade; - } - - double getGrade() const { - return gradeSum; - } - - void setAverage() { - average = classGrade / numStudents; - } - - double getAverage() const { - return average; - } - + Average(); + + void setGrade(double); + double getGrade(); + + void setNum(int); + int getNum(); + + void setAverage(int, double); + double getAverage(); + private: - int num; - double sumGrade; - double average; + int num; + double grade; + double average; }; +#endif diff --git a/Driver.cpp b/Driver.cpp new file mode 100644 index 0000000..69d3dcc --- /dev/null +++ b/Driver.cpp @@ -0,0 +1,36 @@ +#include +#include "Average.h" +#include +#include +using namespace std; + +int main() { + + Average object; + vector v; + + object.setGrade(350); + object.setNum(10); + object.setAverage(10, 350); + v.push_back(object); + object.setGrade(450); + object.setNum(20); + object.setAverage(20, 450); + v.push_back(object); + object.setGrade(275); + object.setNum(15); + object.setAverage(15, 275); + v.push_back(object); + object.setGrade(600); + object.setNum(25); + object.setAverage(25, 600); + v.push_back(object); + + cout << " Class Grade " << " Number of Students " << " Average " << endl; + for (int x = 0; x < v.size(); x++) { + cout << " " << v[x].getGrade() << " " << v[x].getNum() << " " << v[x].getAverage(); + cout << endl; + } + //system("Pause"); + return 0; +} diff --git a/Source.cpp b/Source.cpp deleted file mode 100644 index 89d07be..0000000 --- a/Source.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include "Average.h" -#include -#include -using namespace std; - -int main() { - - Grades grade1 { 350 , 10 }; - Grades grade2 { 450 , 20 }; - Grades grade3 { 275 , 15 }; - Grades grade4 { 600 , 25 }; - vector v = { grade1, grade2, grade3, grade4 } - for (int x = 0; x < v.size(); x++) { - cout << "Grade: " << v[x].getGrade() << ", No. of students: " << v[x].getNum() << ", Class average: " << v[x].getAverage(); - cout << endl; - } - system("Pause"); - return 0; -} From 6203a4a481909958a03760cfc12143ed9906bbcc Mon Sep 17 00:00:00 2001 From: xInnovate Date: Sun, 5 Feb 2017 13:23:07 -0400 Subject: [PATCH 05/10] Added header file --- Average.cpp | 31 ------------------------------- Driver.cpp | 36 ------------------------------------ 2 files changed, 67 deletions(-) delete mode 100644 Average.cpp delete mode 100644 Driver.cpp diff --git a/Average.cpp b/Average.cpp deleted file mode 100644 index 4d2c3df..0000000 --- a/Average.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "Average.h" - -Average::Average() { - num = 0; - grade = 0.0; - average = 0.0; -} - -void Average::setGrade(double classGrade) { - grade = classGrade; -} - -double Average::getGrade() { - return grade; -} - -void Average::setNum(int numStudents) { - num = numStudents; -} - -int Average::getNum() { - return num; -} - -void Average::setAverage(int num, double grade) { - average = grade / num; -} - -double Average::getAverage() { - return average; -} diff --git a/Driver.cpp b/Driver.cpp deleted file mode 100644 index 69d3dcc..0000000 --- a/Driver.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include -#include "Average.h" -#include -#include -using namespace std; - -int main() { - - Average object; - vector v; - - object.setGrade(350); - object.setNum(10); - object.setAverage(10, 350); - v.push_back(object); - object.setGrade(450); - object.setNum(20); - object.setAverage(20, 450); - v.push_back(object); - object.setGrade(275); - object.setNum(15); - object.setAverage(15, 275); - v.push_back(object); - object.setGrade(600); - object.setNum(25); - object.setAverage(25, 600); - v.push_back(object); - - cout << " Class Grade " << " Number of Students " << " Average " << endl; - for (int x = 0; x < v.size(); x++) { - cout << " " << v[x].getGrade() << " " << v[x].getNum() << " " << v[x].getAverage(); - cout << endl; - } - //system("Pause"); - return 0; -} From 7240e8e65695994661035fc0911529449925ffc6 Mon Sep 17 00:00:00 2001 From: xInnovate Date: Sun, 5 Feb 2017 13:24:08 -0400 Subject: [PATCH 06/10] Deleted all files --- Average.h | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 Average.h diff --git a/Average.h b/Average.h deleted file mode 100644 index d6e9875..0000000 --- a/Average.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef AVERAGE_H -#define AVERAGE_H - -class Average { - -public: - Average(); - - void setGrade(double); - double getGrade(); - - void setNum(int); - int getNum(); - - void setAverage(int, double); - double getAverage(); - -private: - int num; - double grade; - double average; -}; -#endif From d5c85213ed64203ba647585b0d797ab77204f53b Mon Sep 17 00:00:00 2001 From: xInnovate Date: Sun, 5 Feb 2017 13:24:46 -0400 Subject: [PATCH 07/10] Added header file --- Average.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Average.h diff --git a/Average.h b/Average.h new file mode 100644 index 0000000..d6e9875 --- /dev/null +++ b/Average.h @@ -0,0 +1,23 @@ +#ifndef AVERAGE_H +#define AVERAGE_H + +class Average { + +public: + Average(); + + void setGrade(double); + double getGrade(); + + void setNum(int); + int getNum(); + + void setAverage(int, double); + double getAverage(); + +private: + int num; + double grade; + double average; +}; +#endif From d714e7092b650c67eaff8bbf934abbc9b58b43c1 Mon Sep 17 00:00:00 2001 From: xInnovate Date: Sun, 5 Feb 2017 13:25:21 -0400 Subject: [PATCH 08/10] Added implementation file --- Average.cpp | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Average.cpp diff --git a/Average.cpp b/Average.cpp new file mode 100644 index 0000000..4d2c3df --- /dev/null +++ b/Average.cpp @@ -0,0 +1,31 @@ +#include "Average.h" + +Average::Average() { + num = 0; + grade = 0.0; + average = 0.0; +} + +void Average::setGrade(double classGrade) { + grade = classGrade; +} + +double Average::getGrade() { + return grade; +} + +void Average::setNum(int numStudents) { + num = numStudents; +} + +int Average::getNum() { + return num; +} + +void Average::setAverage(int num, double grade) { + average = grade / num; +} + +double Average::getAverage() { + return average; +} From 20ec924cadfe2dc0722cd8bed081f62adb2b6861 Mon Sep 17 00:00:00 2001 From: xInnovate Date: Sun, 5 Feb 2017 13:25:53 -0400 Subject: [PATCH 09/10] Added client file --- Driver.cpp | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Driver.cpp diff --git a/Driver.cpp b/Driver.cpp new file mode 100644 index 0000000..69d3dcc --- /dev/null +++ b/Driver.cpp @@ -0,0 +1,36 @@ +#include +#include "Average.h" +#include +#include +using namespace std; + +int main() { + + Average object; + vector v; + + object.setGrade(350); + object.setNum(10); + object.setAverage(10, 350); + v.push_back(object); + object.setGrade(450); + object.setNum(20); + object.setAverage(20, 450); + v.push_back(object); + object.setGrade(275); + object.setNum(15); + object.setAverage(15, 275); + v.push_back(object); + object.setGrade(600); + object.setNum(25); + object.setAverage(25, 600); + v.push_back(object); + + cout << " Class Grade " << " Number of Students " << " Average " << endl; + for (int x = 0; x < v.size(); x++) { + cout << " " << v[x].getGrade() << " " << v[x].getNum() << " " << v[x].getAverage(); + cout << endl; + } + //system("Pause"); + return 0; +} From 736f88a43271c0952942f5c5fa86891ff6b78f99 Mon Sep 17 00:00:00 2001 From: xInnovate Date: Fri, 10 Feb 2017 13:01:55 -0400 Subject: [PATCH 10/10] Added linearSearch function --- Driver.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Driver.cpp b/Driver.cpp index 69d3dcc..4e149ee 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -4,6 +4,8 @@ #include using namespace std; +int linearSearch(auto data, auto key); + int main() { Average object; @@ -34,3 +36,12 @@ int main() { //system("Pause"); return 0; } + +int linearSearch (auto data, auto grade) { + for (int i = 0; i < data.size(); i++) { + if (data[i].getGrade() == grade) { + return i; + } + } + return -1; +}