From 07706ac28cdf97e6a7952472fb9cf5c48eefde43 Mon Sep 17 00:00:00 2001
From: Yalda Jafari <yaldajafari383@gmail.com>
Date: Sat, 6 Apr 2024 06:49:33 -0700
Subject: [PATCH 1/4] first commit

---
 1/1.cpp | 91 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 77 insertions(+), 14 deletions(-)

diff --git a/1/1.cpp b/1/1.cpp
index b83dbef..408c7ee 100644
--- a/1/1.cpp
+++ b/1/1.cpp
@@ -3,7 +3,7 @@
 #include <vector>
 #include <algorithm>
 using namespace std;
-
+class Group;
 class Person {
 public:
 	
@@ -11,12 +11,29 @@ class Person {
 		this->name = name;
 
 	}
+	Person(const string& name , int const _age) {
+		this->name = name;
+		this->age = _age;
+
+	}
+	Person() : name(" ") , age(0) {}
+
 	string& getName()  { return name; }
 
+	const string& getName() const { return name; }
+
+	void operator = (Person const p) {
+		this->name = p.name;
+		this->age = p.age;
+
+	}
+
 private:
 	string name;
 	int age;
 
+	friend Group;
+	
 };
 
 ostream& operator<<(ostream& out, const Person& p) {
@@ -34,6 +51,11 @@ class Group {
 		this->members = new Person[max_lenght];
 		this->size = 0;
 	}
+	Group() {
+		this->size = 0;
+		this->cap = 0;
+		this->members = NULL;
+	}
 	void add(Person p) {
 		if (this->size == this->cap) {
 			return;
@@ -54,6 +76,34 @@ class Group {
 		size--;
 	}
 
+	Group operator + (Group const p) {
+		Group tmp;
+
+		tmp.cap = this->cap + p.cap;
+		tmp.size = this->size + p.size;
+		tmp.members = new Person[tmp.cap];
+
+		for (int i = 0; i < this->size; i++) {
+			tmp.members[i] = this->members[i];
+		}
+
+		for (int i = this->size; i < p.size; i++) {
+			tmp.members[i] = p.members[i];
+		}
+
+	}
+
+	void operator = (Group const g) {
+		this->size = g.size;
+		this->cap = g.cap;
+		this->members = new Person[cap];
+
+		for (int i = 0; i < this->size; i++) {
+			this->members[i] = g.members[i];
+		}
+
+	}
+
 	~Group() {
 		delete[] members;
 	}
@@ -63,41 +113,54 @@ class Group {
 	int cap;
 	Person* members;
 
+	friend bool isGroupFull(Group g);
+	friend ostream& operator<<(ostream& out, Group& p);
+
 };
 
+ostream& operator<<(ostream& out, Group& p) {
+	Person* ptmp = p.members;
+
+	for (int i = 0; i < p.size ; i++) {
+		cout << p.members[i] << endl;
+	}
+
+
+	return out;
+}
+
 bool isGroupFull(Group g) {
 	return (g.size == g.cap);
 }
 
 int main()
 {
-	/*
 	Person p1("somename");
-	Person p1("somename2");
+	Person p2("somename2");
 	cout << p1<<p2;
-	*/
-	/*
+	
+	
 	Group g1(5);
 	g1.add({ "Erfan",20 });
 	g1.add({ "Saba",20 });
 	g1.add({ "Mahrokh",20 });
 	g1.add({ "Yasin",21 });
 	cout<<isGroupFull(g1)<<endl;
-	*/
-	/*
+	
+	
 	Group g2(g1);
 	Group g3(10);
 	g2.deletePerson("Erfan");
 	cout << g1<<endl;//should cout every person in it with a \t as the separator
 	cout << g2 << endl;
-	*/
-	/*
+	
+	
 	g3 = g1;
 	cout << g3;
 	g3 =  g2 + g3;//adds members of g2 and g3 to each other
 	g3 += g3 += g3 += g3;
-	*/
-	/*
+	
+	
 	Person persons[10];
 	Person Erfan("Erfan",20);
 	persons[1]=Erfan;
@@ -108,10 +171,10 @@ int main()
 
 	for(int i=0;i<10;i++){
 		cout<<persons[i].getName()<<' ';
-	}*/
-	/*
+	}
+	
 	cout<<*find(persons,persons+10,Erfan);
-	*/
+	
 	
 
 

From db9a3fd0a4777d44d12344e2fe2539f1bb00fb4e Mon Sep 17 00:00:00 2001
From: Yalda Jafari <yaldajafari383@gmail.com>
Date: Mon, 8 Apr 2024 21:51:24 -0700
Subject: [PATCH 2/4] second commit

---
 1/1.cpp | 117 +++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 82 insertions(+), 35 deletions(-)

diff --git a/1/1.cpp b/1/1.cpp
index 408c7ee..3f00abb 100644
--- a/1/1.cpp
+++ b/1/1.cpp
@@ -2,23 +2,24 @@
 #include <iostream>
 #include <vector>
 #include <algorithm>
+#include <string>
 using namespace std;
 class Group;
 class Person {
 public:
-	
+
 	Person(const string& name) {
 		this->name = name;
 
 	}
-	Person(const string& name , int const _age) {
+	Person(const string& name, int const _age) {
 		this->name = name;
 		this->age = _age;
 
 	}
-	Person() : name(" ") , age(0) {}
+	Person() : name(" "), age(0) {}
 
-	string& getName()  { return name; }
+	string& getName() { return name; }
 
 	const string& getName() const { return name; }
 
@@ -28,12 +29,20 @@ class Person {
 
 	}
 
+	bool operator < (Person const p) {
+		return ((this->name < p.name) ? true : false);
+	}
+
+	bool operator == (Person const p) {
+		return ((this->age == p.age && this->name == p.name) ? true : false);
+	}
+
 private:
 	string name;
 	int age;
 
 	friend Group;
-	
+
 };
 
 ostream& operator<<(ostream& out, const Person& p) {
@@ -46,7 +55,7 @@ ostream& operator<<(ostream& out, const Person& p) {
 class Group {
 public:
 
-	Group(int max_lenght)  {
+	Group(int max_lenght) {
 		this->cap = max_lenght;
 		this->members = new Person[max_lenght];
 		this->size = 0;
@@ -56,6 +65,15 @@ class Group {
 		this->cap = 0;
 		this->members = NULL;
 	}
+	Group(const Group& g) {
+		this->size = g.size;
+		this->cap = g.cap;
+		this->members = new Person[this->cap];
+
+		for (int i = 0; i < this->size; i++) {
+			this->members[i] = g.members[i];
+		}
+	}
 	void add(Person p) {
 		if (this->size == this->cap) {
 			return;
@@ -66,9 +84,9 @@ class Group {
 	void deletePerson(string name) {
 		int i;
 		for (i = 0; i < size; i++) {
-			if(members[i].name == name)
+			if (members[i].name == name)
 				break;
-			
+
 		}
 		for (int index = i; index < size - 1; index++) {
 			members[index] = members[index + 1];
@@ -76,7 +94,7 @@ class Group {
 		size--;
 	}
 
-	Group operator + (Group const p) {
+	Group& operator += (Group const p) {
 		Group tmp;
 
 		tmp.cap = this->cap + p.cap;
@@ -87,10 +105,35 @@ class Group {
 			tmp.members[i] = this->members[i];
 		}
 
-		for (int i = this->size; i < p.size; i++) {
-			tmp.members[i] = p.members[i];
+		int i = this->size;
+		for (int j = 0; j < p.size; j++) {
+			tmp.members[i] = p.members[j];
+			i++;
 		}
 
+
+		*this = tmp;
+		return *this;
+	}
+
+	Group operator + (Group const p) {
+		Group tmp;
+
+		tmp.cap = this->cap + p.cap;
+		tmp.size = this->size + p.size;
+		tmp.members = new Person[tmp.cap];
+
+		for (int i = 0; i < this->size; i++) {
+			tmp.members[i] = this->members[i];
+		}
+		int i = this->size;
+		for (int j = 0; j < p.size; j++) {
+			tmp.members[i] = p.members[j];
+			i++;
+		}
+
+		return tmp;
+
 	}
 
 	void operator = (Group const g) {
@@ -121,7 +164,7 @@ class Group {
 ostream& operator<<(ostream& out, Group& p) {
 	Person* ptmp = p.members;
 
-	for (int i = 0; i < p.size ; i++) {
+	for (int i = 0; i < p.size; i++) {
 		cout << p.members[i] << endl;
 	}
 
@@ -137,45 +180,49 @@ int main()
 {
 	Person p1("somename");
 	Person p2("somename2");
-	cout << p1<<p2;
-	
-	
+	cout << p1 << p2;
+
+
 	Group g1(5);
 	g1.add({ "Erfan",20 });
 	g1.add({ "Saba",20 });
 	g1.add({ "Mahrokh",20 });
 	g1.add({ "Yasin",21 });
-	cout<<isGroupFull(g1)<<endl;
-	
-	
+	cout << isGroupFull(g1) << endl;
+
+
 	Group g2(g1);
 	Group g3(10);
 	g2.deletePerson("Erfan");
-	cout << g1<<endl;//should cout every person in it with a \t as the separator
+	cout << g1 << endl;//should cout every person in it with a \t as the separator
 	cout << g2 << endl;
-	
-	
+
+
 	g3 = g1;
 	cout << g3;
-	g3 =  g2 + g3;//adds members of g2 and g3 to each other
+	g3 = g2 + g3;//adds members of g2 and g3 to each other
 	g3 += g3 += g3 += g3;
-	
-	
+
+
 	Person persons[10];
-	Person Erfan("Erfan",20);
-	persons[1]=Erfan;
-	for(int i=0;i<10;i++){
-		persons[i].getName()=to_string(rand()%100);
+	Person Erfan("Erfan", 20);
+	persons[1] = Erfan;
+	for (int i = 0; i < 10; i++) {
+		persons[i].getName() = to_string(rand() % 100);
 	}
-	sort(persons,persons+10);//what operator should be overloaded for sort? :)
+	sort(persons, persons + 10);//what operator should be overloaded for sort? :)
 
-	for(int i=0;i<10;i++){
-		cout<<persons[i].getName()<<' ';
+	for (int i = 0; i < 10; i++) {
+		cout << persons[i].getName() << ' ';
 	}
-	
-	cout<<*find(persons,persons+10,Erfan);
-	
-	
+
+	if ((find(persons, persons + 10, Erfan)) >= persons + 10)
+		cout << "There is no person with this name.";
+	else
+		cout << (*find(persons, persons + 10, Erfan)).getName();
+
+
+
 
 
 

From e79868ccb633e91f50471338c606f0faa060ad89 Mon Sep 17 00:00:00 2001
From: Yalda Jafari <yaldajafari383@gmail.com>
Date: Tue, 9 Apr 2024 08:06:14 -0700
Subject: [PATCH 3/4] first commit

---
 2/Score.cpp | 16 +++++++++++++++-
 2/Score.h   |  4 ++++
 2/main.cpp  | 18 +++++++++++++++++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/2/Score.cpp b/2/Score.cpp
index c107032..ce0ed23 100644
--- a/2/Score.cpp
+++ b/2/Score.cpp
@@ -1,6 +1,8 @@
 #include "Score.h"
 
-Score::Score(int score,char* detail, Label label) :ID(Score::ID_generator) {
+int Score :: ID_generator;
+
+Score::Score(int score, const char* detail, Label label) :ID(Score::ID_generator) {
 	this->score = score;
 	this->label = label;
 	this->detail = detail;
@@ -9,4 +11,16 @@ Score::Score(int score,char* detail, Label label) :ID(Score::ID_generator) {
 
 }
 
+Score :: Score() : ID(ID_generator) , score(0) , label(GREAT) , detail("") {
+	ID_generator++;
+}
+
+void Score :: setID_generator(int _ID_generator) {
+	ID_generator = _ID_generator;
+}
 
+void :: Score :: operator = (const Score& _score){
+	this->score = _score.score;
+	this->label = _score.label;
+	this->detail = _score.detail;
+}
\ No newline at end of file
diff --git a/2/Score.h b/2/Score.h
index 0dd79cb..ea7449e 100644
--- a/2/Score.h
+++ b/2/Score.h
@@ -1,9 +1,11 @@
 #include <iostream>
 #include <string>
 using namespace std;
+#pragma once
 class Score {
 public:
 	friend void print(const Score& score);
+	friend int main();
 	
 	typedef enum {
 		GREAT,
@@ -13,6 +15,8 @@ class Score {
 	}Label;
 
 	Score(int score,  char* detail, Label label);
+	Score();
+	static void setID_generator(int _ID_generator);
 private:
 	int score;
 	Label label;
diff --git a/2/main.cpp b/2/main.cpp
index 64d213e..41eb180 100644
--- a/2/main.cpp
+++ b/2/main.cpp
@@ -3,12 +3,28 @@
 #include <vector>
 #include <string>
 #include <algorithm>
+#include <time.h>
 #include "Score.h"
 #include "SomeRandomDotHFile.h"
 using namespace std;
 #define FOR(n) for(int i=0;i<n;i++)
 #define SETSCORE(i) int score=rand()%20+1;/*no 0s*/\
-scores[i] = Score( score,("some string " + to_string(i)).c_str(),Score::Label(3-score/5)) ;
+scores[i] = Score( score,("some string " + to_string(i)).c_str(),Score::Label(3-score/5));
+
+void print(const Score& score){
+	cout << "score : " << score.score << endl;
+	cout << "score label : ";
+	if(score.label==0)
+	cout << "GREAT" << endl;
+	else if(score.label==1)
+	cout << "GOOD" << endl;
+	else if(score.label==2)
+	cout << "NOTBAD" << endl;
+	else if(score.label==3)
+	cout << "BAD" << endl;
+	cout << "score detail : " << score.detail << endl;
+	cout << "score ID : " << score.ID << endl<<endl;
+}
 
 
 int main()

From a629132adfb648b0d30f092ff351710bbd372071 Mon Sep 17 00:00:00 2001
From: Yalda Jafari <yaldajafari383@gmail.com>
Date: Thu, 11 Apr 2024 04:29:17 -0700
Subject: [PATCH 4/4] third commit

---
 1/1.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/1/1.cpp b/1/1.cpp
index 3f00abb..de5c357 100644
--- a/1/1.cpp
+++ b/1/1.cpp
@@ -1,4 +1,3 @@
-
 #include <iostream>
 #include <vector>
 #include <algorithm>
@@ -165,7 +164,7 @@ ostream& operator<<(ostream& out, Group& p) {
 	Person* ptmp = p.members;
 
 	for (int i = 0; i < p.size; i++) {
-		cout << p.members[i] << endl;
+		cout << p.members[i] << '\t';
 	}
 
 
@@ -231,5 +230,4 @@ int main()
 
 
 
-}
-
+}
\ No newline at end of file