diff --git a/feladat2/UnitTest1/UnitTest1.cpp b/feladat2/UnitTest1/UnitTest1.cpp index cccf769..6730c24 100644 --- a/feladat2/UnitTest1/UnitTest1.cpp +++ b/feladat2/UnitTest1/UnitTest1.cpp @@ -1,4 +1,4 @@ -//Tóth Dániel Mátyás | IFPQYY | v2 +//Tóth Dániel Mátyás | IFPQYY | v3 #include "pch.h" #include "CppUnitTest.h" #include "feladat2.h" @@ -151,6 +151,50 @@ namespace UnitTest1 Assert::AreEqual(4, capacity()); } + TEST_METHOD(RegularOperationTest) { + destroyfifo(); + createfifo(6); + push('a'); + push('b'); + push('c'); + push('d'); + push('e'); + push('f'); + + Assert::AreEqual(6, capacity()); + Assert::AreEqual(0, freespace()); + + Assert::AreEqual('a', (char)pop()); + Assert::AreEqual('b', (char)pop()); + Assert::AreEqual('c', (char)pop()); + + Assert::AreEqual(6, capacity()); + Assert::AreEqual(3, freespace()); + + destroyfifo(); + + } + + TEST_METHOD(SpecialCase1) {//stolen straight from the email + destroyfifo(); + createfifo(3); + + push(0); + push(1); + push(2); + + Assert::AreEqual(3, capacity()); + Assert::AreEqual(0, freespace()); + + Assert::AreEqual(0, pop()); + + Assert::AreEqual(OK, push((char)255)); + + Assert::AreEqual(3, capacity()); + Assert::AreEqual(0, freespace()); + + Assert::AreEqual(1, pop()); + } }; } diff --git a/feladat2/UnitTest1/UnitTest1.vcxproj b/feladat2/UnitTest1/UnitTest1.vcxproj index 9b9e950..c91c930 100644 --- a/feladat2/UnitTest1/UnitTest1.vcxproj +++ b/feladat2/UnitTest1/UnitTest1.vcxproj @@ -77,7 +77,8 @@ true - C:\Users\danit\Desktop\cpp\feladat2\feladat2\feladat2;C:\Users\danit\Desktop\cpp\feladat2\feladat2;$(IncludePath) + C:\Users\danit\Desktop\2026-27-cpp-homework\feladat2\feladat2;$(ReferencePath) + C:\Users\danit\Desktop\2026-27-cpp-homework\feladat2\feladat2;$(IncludePath) true @@ -143,7 +144,7 @@ Windows - C:\Users\danit\Desktop\cpp\feladat2\feladat2\feladat2\x64\Debug;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) + C:\Users\danit\Desktop\2026-27-cpp-homework\feladat2\feladat2\x64\Debug;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) feladat2;%(AdditionalDependencies) @@ -182,8 +183,8 @@ - - {c0af2585-3697-4ad9-bd3a-67823343a675} + + {6c528726-81ac-44ca-9c09-f9fde7941386} diff --git a/feladat2/feladat2.slnx b/feladat2/feladat2.slnx index 9b2afb6..4b1fa87 100644 --- a/feladat2/feladat2.slnx +++ b/feladat2/feladat2.slnx @@ -3,6 +3,6 @@ - + diff --git a/feladat2/feladat2/IFPQYY_feladat2v3.zip b/feladat2/feladat2/IFPQYY_feladat2v3.zip new file mode 100644 index 0000000..2bd2034 Binary files /dev/null and b/feladat2/feladat2/IFPQYY_feladat2v3.zip differ diff --git a/feladat2/feladat2/UnitTest1.cpp b/feladat2/feladat2/UnitTest1.cpp new file mode 100644 index 0000000..6730c24 --- /dev/null +++ b/feladat2/feladat2/UnitTest1.cpp @@ -0,0 +1,200 @@ +//Tóth Dániel Mátyás | IFPQYY | v3 +#include "pch.h" +#include "CppUnitTest.h" +#include "feladat2.h" + +using namespace Microsoft::VisualStudio::CppUnitTestFramework; + +namespace UnitTest1 +{ + TEST_CLASS(UnitTest1) + { + public: + + //Works weirdly, seems like the test methods are not isolated in themselves in this instance, will need to create and destroy in every + //seperate test to guarantee they will work as intended. If only these were in classes instead of being global..... + + TEST_METHOD(CreateTest1) + { + destroyfifo(); + Assert::AreEqual(OK, createfifo(10)); + destroyfifo(); + } + TEST_METHOD(CreateTest2) + { + createfifo(10); + Assert::AreEqual(NOK, createfifo(10)); + destroyfifo(); + } + TEST_METHOD(DestroyTest1) + { + createfifo(10); + Assert::AreEqual(OK, destroyfifo()); + } + TEST_METHOD(DestroyTest2) + { + destroyfifo(); + Assert::AreEqual(NOK, destroyfifo()); + } + + TEST_METHOD(PushTest1) + { + destroyfifo(); + createfifo(10); + Assert::AreEqual(OK, push('c')); + destroyfifo(); + } + TEST_METHOD(PopTest1) + { + destroyfifo(); + createfifo(10); + push('c'); + Assert::AreEqual('c', (char)pop()); + destroyfifo(); + } + TEST_METHOD(PopTest2) + { + destroyfifo(); + createfifo(10); + Assert::AreEqual(NOK, pop()); + destroyfifo(); + } + TEST_METHOD(PopTest3) + { + destroyfifo(); + createfifo(10); + push('c'); + Assert::AreEqual('c', (char)pop()); + Assert::AreEqual(NOK, pop()); + destroyfifo(); + } + TEST_METHOD(PeekTest1) + { + destroyfifo(); + createfifo(10); + push('c'); + Assert::AreEqual('c', (char)peek()); + Assert::AreEqual('c', (char)peek()); + destroyfifo(); + } + TEST_METHOD(PeekTest2) + { + destroyfifo(); + createfifo(10); + Assert::AreEqual(NOK, pop()); + destroyfifo(); + } + TEST_METHOD(FreespaceTest1) + { + destroyfifo(); + int s = 5; + createfifo(s); + for (int i = 0; i < s; i++) + { + push('t'); + } + Assert::AreEqual(0, freespace()); + destroyfifo(); + } + TEST_METHOD(FreespaceTest2) + { + destroyfifo(); + int s = 5; + createfifo(s); + for (int i = 0; i < s-1; i++) + { + push('t'); + } + Assert::AreEqual(1, freespace()); + destroyfifo(); + } + TEST_METHOD(CapacityTest1) + { + destroyfifo(); + int s = 5; + createfifo(s); + Assert::AreEqual(s, capacity()); + destroyfifo(); + } + TEST_METHOD(CapacityTest2) + { + destroyfifo(); + int s = 5; + createfifo(s); + push('c'); + Assert::AreEqual(s, capacity()); + destroyfifo(); + } + + TEST_METHOD(ClearTest1) + { + destroyfifo(); + createfifo(10); + push('c'); + Assert::AreEqual(OK, clearfifo()); + Assert::AreEqual(NOK, pop()); + Assert::AreEqual(NOK, peek()); + destroyfifo(); + } + TEST_METHOD(ClearTest2) + { + destroyfifo(); + Assert::AreEqual(NOK, clearfifo()); + } + TEST_METHOD(EnlargeTest) + { + destroyfifo(); + createfifo(2); //2 + push('c'); //1 + push('a'); //0 + push('d'); //doubles + Assert::AreEqual(4, capacity()); + + } + TEST_METHOD(RegularOperationTest) { + destroyfifo(); + createfifo(6); + + push('a'); + push('b'); + push('c'); + push('d'); + push('e'); + push('f'); + + Assert::AreEqual(6, capacity()); + Assert::AreEqual(0, freespace()); + + Assert::AreEqual('a', (char)pop()); + Assert::AreEqual('b', (char)pop()); + Assert::AreEqual('c', (char)pop()); + + Assert::AreEqual(6, capacity()); + Assert::AreEqual(3, freespace()); + + destroyfifo(); + + } + + TEST_METHOD(SpecialCase1) {//stolen straight from the email + destroyfifo(); + createfifo(3); + + push(0); + push(1); + push(2); + + Assert::AreEqual(3, capacity()); + Assert::AreEqual(0, freespace()); + + Assert::AreEqual(0, pop()); + + Assert::AreEqual(OK, push((char)255)); + + Assert::AreEqual(3, capacity()); + Assert::AreEqual(0, freespace()); + + Assert::AreEqual(1, pop()); + } + }; +} diff --git a/feladat2/feladat2/feladat2.cpp b/feladat2/feladat2/feladat2.cpp index 25b8523..44f4904 100644 --- a/feladat2/feladat2/feladat2.cpp +++ b/feladat2/feladat2/feladat2.cpp @@ -1,4 +1,4 @@ -//Tóth Dániel Mátyás | IFPQYY | v2 +//Tóth Dániel Mátyás | IFPQYY | v3 #include #include #include "feladat2.h" @@ -85,6 +85,7 @@ int pop(void) { } int ret = fifo[tail]; tail = (tail + 1) % lngt; + full = false; return ret; } @@ -105,7 +106,7 @@ int freespace(void) { if (full) { return 0; } - return lngt - ((head - tail + lngt) % lngt); + return (tail - head + lngt) % lngt; } int capacity(void) { diff --git a/feladat2/feladat2/feladat2.h b/feladat2/feladat2/feladat2.h index 85dcb1f..2c63097 100644 --- a/feladat2/feladat2/feladat2.h +++ b/feladat2/feladat2/feladat2.h @@ -1,4 +1,4 @@ -//Tóth Dániel Mátyás | IFPQYY | v2 +//Tóth Dániel Mátyás | IFPQYY | v3 #pragma once #define OK 0 #define NOK -1 diff --git a/feladat2/feladat2/feladat2.vcxproj b/feladat2/feladat2/feladat2.vcxproj index 3511a80..c3159f7 100644 --- a/feladat2/feladat2/feladat2.vcxproj +++ b/feladat2/feladat2/feladat2.vcxproj @@ -18,17 +18,10 @@ x64 - - - - - - - 18.0 Win32Proj - {a2f27c2b-a860-44db-b1ea-4fa4467bd633} + {6c528726-81ac-44ca-9c09-f9fde7941386} feladat2 10.0 @@ -145,6 +138,13 @@ true + + + + + + + diff --git a/feladat2/feladat2/feladat2.vcxproj.filters b/feladat2/feladat2/feladat2.vcxproj.filters index 1a781cd..3751f0c 100644 --- a/feladat2/feladat2/feladat2.vcxproj.filters +++ b/feladat2/feladat2/feladat2.vcxproj.filters @@ -15,16 +15,16 @@ - - Source Files - - - Source Files - - - - + Header Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/feladat2/feladat2/main.cpp b/feladat2/feladat2/main.cpp index 90f9f5f..c4aa98c 100644 --- a/feladat2/feladat2/main.cpp +++ b/feladat2/feladat2/main.cpp @@ -1,4 +1,4 @@ -//Tóth Dániel Mátyás | IFPQYY | v2 +//Tóth Dániel Mátyás | IFPQYY | v3 #include #include "feladat2.h" diff --git a/feladat7/feladat7.slnx b/feladat7/feladat7.slnx new file mode 100644 index 0000000..8218d4f --- /dev/null +++ b/feladat7/feladat7.slnx @@ -0,0 +1,7 @@ + + + + + + + diff --git a/feladat7/feladat7/cphoneiterfiltered.cpp b/feladat7/feladat7/cphoneiterfiltered.cpp new file mode 100644 index 0000000..57b0a58 --- /dev/null +++ b/feladat7/feladat7/cphoneiterfiltered.cpp @@ -0,0 +1,26 @@ +// Tóth Dániel Mátyás | IFPQYY | v1 +#include "cphoneiterfiltered.h" + + +CPhoneIterFiltered::CPhoneIterFiltered(const CPhoneList& m, const char* group, unsigned flag) { + m_cpList = m; + m_iCurrIndex = 0; + m_iCount = 0; + //m_piNameIndex = +} +CPhoneIterFiltered::~CPhoneIterFiltered() { +} +const Record* CPhoneIterFiltered::begin() { +} +const Record* CPhoneIterFiltered::prev() { +} +const Record* CPhoneIterFiltered::next() { +} +const Record* CPhoneIterFiltered::end() { +} +int CPhoneIterFiltered::size() const { +} +const Record* CPhoneIterFiltered::search(const char* key) { +} +const Record* CPhoneIterFiltered::operator++() { +} \ No newline at end of file diff --git a/feladat7/feladat7/cphoneiterfiltered.h b/feladat7/feladat7/cphoneiterfiltered.h new file mode 100644 index 0000000..e362a37 --- /dev/null +++ b/feladat7/feladat7/cphoneiterfiltered.h @@ -0,0 +1,23 @@ +// Tóth Dániel Mátyás | IFPQYY | v1 +#pragma once +#include "cphonelist.h" +class CPhoneIterFiltered +{ +public: + CPhoneIterFiltered(const CPhoneList& m, const char* group, unsigned flag = 1); + ~CPhoneIterFiltered(); + const Record* begin(); + const Record* prev(); + const Record* next(); + const Record* end(); + int size() const; + const Record* search(const char* key); + const Record * operator++(); + CPhoneIterFiltered(const CPhoneIterFiltered&) = delete; + CPhoneIterFiltered& operator=(const CPhoneIterFiltered&) = delete; +private: + const CPhoneList* const m_cpList; + int m_iCurrIndex; + int m_iCount; + int* m_piNameIndex; +}; \ No newline at end of file diff --git a/feladat7/feladat7/cphonelist.cpp b/feladat7/feladat7/cphonelist.cpp new file mode 100644 index 0000000..09c7004 --- /dev/null +++ b/feladat7/feladat7/cphonelist.cpp @@ -0,0 +1,30 @@ +// Tóth Dániel Mátyás | IFPQYY | v1 +#include "cphonelist.h" + +CPhoneList::CPhoneList() { + m_iFirstEmpty = 0; +} +int CPhoneList::append(const Record& newrec) { + if (m_iFirstEmpty >= MAXLENGTH) + { + return -1; + } + m_rArray[m_iFirstEmpty] = (Record&&)newrec; + m_iFirstEmpty++; + return 0; +} +void CPhoneList::displayname(unsigned flag = 0, const char* group = nullptr) { +} +int CPhoneList::GetFirstEmpty() { + return m_iFirstEmpty; +} +bool CPhoneList::saveToFile(const char* filename) { +} +bool CPhoneList::loadFromFile(const char* filename) { +} +Record& CPhoneList::operator[](size_t nIndex) { + return m_rArray[nIndex]; +} +std::ostream& operator << (std::ostream& os, Record& r) { + os << std::endl << r.name << ';' << r.number << ";" << r.group; +} \ No newline at end of file diff --git a/feladat7/feladat7/cphonelist.h b/feladat7/feladat7/cphonelist.h new file mode 100644 index 0000000..bda07e7 --- /dev/null +++ b/feladat7/feladat7/cphonelist.h @@ -0,0 +1,29 @@ +// Tóth Dániel Mátyás | IFPQYY | v1 +#pragma once +#include +#define MAXLENGTH 10 +#define MAXNAME 32 +#define MAXNUMBER 16 +#define MAXGROUP 12 +struct Record +{ + char name[MAXNAME + 1]; + char number[MAXNUMBER + 1]; + char group[MAXGROUP + 1]; +}; +class CPhoneList +{ + friend class CPhoneIterFiltered; +public: + CPhoneList(); + int append(const Record& newrec); + void displayname(unsigned flag = 0, const char* group = nullptr); + int GetFirstEmpty(); + bool saveToFile(const char* filename); + bool loadFromFile(const char* filename); + Record& operator[](size_t nIndex); +private: + Record m_rArray[MAXLENGTH]; + int m_iFirstEmpty; +}; +std::ostream& operator << (std::ostream& os, Record& r); \ No newline at end of file diff --git a/feladat2/feladat2/feladat2/feladat2.vcxproj b/feladat7/feladat7/feladat7.vcxproj similarity index 95% rename from feladat2/feladat2/feladat2/feladat2.vcxproj rename to feladat7/feladat7/feladat7.vcxproj index 5353666..c99542e 100644 --- a/feladat2/feladat2/feladat2/feladat2.vcxproj +++ b/feladat7/feladat7/feladat7.vcxproj @@ -21,8 +21,8 @@ 18.0 Win32Proj - {c0af2585-3697-4ad9-bd3a-67823343a675} - feladat2 + {162a458c-6f90-431f-8425-2fc866a1673c} + feladat7 10.0 @@ -139,11 +139,13 @@ - - + + + - + + diff --git a/feladat2/feladat2/feladat2/feladat2.vcxproj.filters b/feladat7/feladat7/feladat7.vcxproj.filters similarity index 76% rename from feladat2/feladat2/feladat2/feladat2.vcxproj.filters rename to feladat7/feladat7/feladat7.vcxproj.filters index b9045ce..20641ba 100644 --- a/feladat2/feladat2/feladat2/feladat2.vcxproj.filters +++ b/feladat7/feladat7/feladat7.vcxproj.filters @@ -15,15 +15,21 @@ - + Source Files - + + Source Files + + Source Files - + + Header Files + + Header Files diff --git a/feladat7/feladat7/main.cpp b/feladat7/feladat7/main.cpp new file mode 100644 index 0000000..793fe7b --- /dev/null +++ b/feladat7/feladat7/main.cpp @@ -0,0 +1,3 @@ +// Tóth Dániel Mátyás | IFPQYY | v1 + +#include "cphoneiterfiltered.h" \ No newline at end of file