Added expected results in main tests and removed dimitriev tests

1 files changed, 13 insertions, 33 deletions

diff --git a/Year 1/Object-oriented Programming/Solutions Sem. 08/ex3/source.cpp b/Year 1/Object-oriented Programming/Solutions Sem. 08/ex3/source.cpp
index f3c4419..265f926 100644
--- a/Year 1/Object-oriented Programming/Solutions Sem. 08/ex3/source.cpp
+++ b/Year 1/Object-oriented Programming/Solutions Sem. 08/ex3/source.cpp
@@ -1,28 +1,6 @@
 #include "WordCollection.h"
 #include <iostream>
 
-void dimitrievTests() {
-	WordCollection dict;
-	((dict *= "Ivan") *= "Petur") *= "Alex";
-	std::cout << dict << std::endl; // {Alex, Ivan, Petur}
-	std::cout << dict["Alex"] << " " << dict["abc"] << std::endl; // 1 0
-
-	WordCollection dict2;
-	((dict2 *= "Zebra") *= "Alex");
-
-	WordCollection result = dict + dict2;
-        std::cout << result << std::endl; // {Alex, Ivan, Petur, Zebra}
-
-	WordCollection result2 = dict - dict2;
-        std::cout << result2 << std::endl; // {Ivan, Petur}
-
-	result2 *= "NewWOrd";
-	result2 /= "NonExistingWord";
-	std::cout << result2 << std::endl;  //{Ivan, NewWOrd, Petur}
-	std::cin >> result2; //въвеждаме "Job"
-	std::cout << result2 << std::endl;  //{Ivan, Job, NewWOrd, Petur}
-}
-
 int main() {
 	WordCollection dict1, dict2, dict3, dict4;
 	((dict1 *= "Apple") *= "Banana") *= "Cucumber";
@@ -37,28 +15,30 @@ int main() {
 	sum1 += dict2 + dict4 + dict1;
 	sum1 += sum1;
 	sum1 += sum1 + sum1 + sum1 + sum1;
-	std::cout << sum1 << std::endl << std::endl;
+	std::cout << sum1 << std::endl << std::endl; // {A big Kiwi, Apple, Banana, Cucumber, Orange, Pineapple}
 
 	WordCollection sub1;
 	sub1 = sum1;
 	sub1 -= dict2 - dict4 - dict1;
-	std::cout << sub1 << std::endl;
+	std::cout << sub1 << std::endl; // {Apple, Banana, Cucumber}
 	WordCollection sub2(sub1);
 	sub1 -= sub1;
-	std::cout << sub1 << std::endl;
+	std::cout << sub1 << std::endl; // {}
 	sub1 = sub2;
-	std::cout << sub1 << std::endl;
+	std::cout << sub1 << std::endl; // {Apple, Banana, Cucumber}
 	sub1 -= sub1 - sub1;
-	std::cout << sub1 << std::endl;
+	std::cout << sub1 << std::endl; // {Apple, Banana, Cucumber}
 	(((((sub1 *= "Not a Pineapple") *= "Apple") *= "Dragon fruit") /= "Apple") /= "Banana") *= "Lettuce";
-	std::cout << sub1 << std::endl << std::endl;
+	std::cout << sub1 << std::endl << std::endl; // {Cucumber, Dragon fruit, Lettuce, Not a Pineapple}
+
+
 
-	std::cout << dict1["Apple"] << dict2["Apple"] << dict3["Apple"] << sub1["Apple"] << std::endl;
-	std::cout << dict1[""] << dict2[""] << dict4[""] << sub1[""] << std::endl << std::endl;
+	std::cout << dict1["Apple"] << dict2["Apple"] << dict3["Apple"] << sub1["Apple"] << std::endl; // 1100
+	std::cout << dict1[""] << dict2[""] << dict4[""] << sub1[""] << std::endl << std::endl; // 0000
 
 	((dict1 /= "Apple") /= "Cucumber") /= "Orange";
-	std::cout << dict1 << std::endl << std::endl;
+	std::cout << dict1 << std::endl << std::endl; // {Banana}
 
-	std::cin >> dict1;
-	std::cout << dict1 << std::endl;
+	std::cin >> dict1; // "A test"
+	std::cout << dict1 << std::endl; // {A test, Banana}
 }