Lab2

CMakeLists.txt

@@ -10,9 +10,5 @@ else()
     add_compile_options(-Wall -Wextra -Wpedantic -Wno-gnu-empty-struct -Wno-unused-parameter)
 endif()
 
-add_subdirectory(LibraryC)
 add_subdirectory(LibraryCPP)
-add_subdirectory(LibraryCPPClass)
-add_subdirectory(LibraryCPPTemplate)
-
-add_subdirectory(Lab1C)
+add_subdirectory(Lab2CPP)

Lab2CPP/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_executable(Lab2CPP lab2.cpp)
+target_include_directories(Lab2CPP PUBLIC ../LibraryCPP)
+target_link_libraries(Lab2CPP LibraryCPP)
+
+add_test(NAME TestLab2CPP COMMAND Lab2CPP ${CMAKE_CURRENT_SOURCE_DIR}/input.txt)

Lab2CPP/input.txt

@@ -0,0 +1,2 @@
+(1+2)*3
+1+2*3

Lab2CPP/lab2.cpp

@@ -0,0 +1,125 @@
+#include <iostream>
+#include <string>
+#include <fstream>
+#include "stack.h"
+
+unsigned int priority(const char symbol)
+{
+	if (symbol == '*' || symbol == '/')
+		return 3;
+    if (symbol == '+' || symbol == '-')
+		return 2;
+    if (symbol == '(') 
+		return 1;
+
+	return 0;
+}
+
+std::string RPN(std::string data)
+{
+	Stack* stack = stack_create();
+	std::string res = "";
+	for (size_t i = 0; i < data.size(); i++)
+	{
+		if (isdigit(data[i]))
+		{
+			res += data[i];
+		}
+		else
+		{
+			if (data[i] == '(')
+			{
+				stack_push(stack, data[i]);
+			}
+			else if (data[i] == ')')
+			{
+				while (!stack_empty(stack) && stack_get(stack) != '(')
+				{
+					res += stack_get(stack);
+					stack_pop(stack);
+				}
+				if (!stack_empty(stack) && stack_get(stack) == '(')
+				{
+					stack_pop(stack);
+				}
+			}
+			else
+			{
+				while (!stack_empty(stack) && priority(stack_get(stack)) >= priority(data[i]))
+				{
+					res += stack_get(stack);
+					stack_pop(stack);
+				}
+				stack_push(stack, data[i]);
+			}
+		}
+	}
+
+	while (!stack_empty(stack))
+	{
+		res += stack_get(stack);
+		stack_pop(stack);
+	}
+
+	stack_delete(stack);
+	return res;
+}
+
+Data solve(std::string data)
+{
+	Stack* stack = stack_create();
+	for (size_t i = 0; i < data.size(); i++)
+	{
+		if (isdigit(data[i]))
+			stack_push(stack, data[i] - '0');
+		else
+		{
+			Data val1 = stack_get(stack);
+			stack_pop(stack);
+			Data val2 = stack_get(stack);
+			stack_pop(stack);
+			Data res = 0;
+
+			switch (data[i])
+			{
+			case '+': res = val1 + val2;
+				break;
+			case '-': res = val1 - val2;
+				break;
+			case '*': res = val1 * val2;
+				break;
+			case '/': res = val1 / val2;
+				break;
+			}
+
+			stack_push(stack, res);
+		}
+	}
+
+	Data res =  stack_get(stack);
+	stack_delete(stack);
+	return res;
+}
+
+std::string calculate(std::string expr)
+{
+	expr = RPN(expr);
+	expr = std::to_string(solve(expr));
+
+	return expr;
+}
+
+int main()
+{
+	std::ifstream in("input.txt");
+
+	std::string temp = "";
+	in >> temp;
+	std::cout << temp << " = " << calculate(temp);
+
+	in >> temp;
+	std::cout << temp << " = " << calculate(temp);
+
+	in.close();
+    return 0;
+}

LibraryCPP/CMakeLists.txt

@@ -1,3 +1,3 @@
-add_library(LibraryCPP STATIC array.cpp list.cpp queue.cpp stack.cpp vector.cpp)
+add_library(LibraryCPP STATIC list.cpp stack.cpp)
 
 add_subdirectory(Tests)

LibraryCPP/Tests/CMakeLists.txt

@@ -1,23 +1,23 @@
-# add_executable(TestArrayCPP array.cpp)
-# target_include_directories(TestArrayCPP PUBLIC ..)
-# target_link_libraries(TestArrayCPP LibraryCPP)
-# add_test(TestArrayCPP TestArrayCPP)
+#add_executable(TestArrayCPP array.cpp)
+#target_include_directories(TestArrayCPP PUBLIC ..)
+#target_link_libraries(TestArrayCPP LibraryCPP)
+#add_test(TestArrayCPP TestArrayCPP)
 
-# add_executable(TestListCPP list.cpp)
-# target_include_directories(TestListCPP PUBLIC ..)
-# target_link_libraries(TestListCPP LibraryCPP)
-# add_test(TestListCPP TestListCPP)
+add_executable(TestListCPP list.cpp)
+target_include_directories(TestListCPP PUBLIC ..)
+target_link_libraries(TestListCPP LibraryCPP)
+add_test(TestListCPP TestListCPP)
 
 # add_executable(TestQueueCPP queue.cpp)
 # target_include_directories(TestQueueCPP PUBLIC ..)
 # target_link_libraries(TestQueueCPP LibraryCPP)
 # add_test(TestQueueCPP TestQueueCPP)
 # set_tests_properties(TestQueueCPP PROPERTIES TIMEOUT 10)
 
-# add_executable(TestStackCPP stack.cpp)
-# target_include_directories(TestStackCPP PUBLIC ..)
-# target_link_libraries(TestStackCPP LibraryCPP)
-# add_test(TestStackCPP TestStackCPP)
+add_executable(TestStackCPP stack.cpp)
+target_include_directories(TestStackCPP PUBLIC ..)
+target_link_libraries(TestStackCPP LibraryCPP)
+add_test(TestStackCPP TestStackCPP)
 
 # add_executable(TestVectorCPP vector.cpp)
 # target_include_directories(TestVectorCPP PUBLIC ..)

LibraryCPP/array.cpp

@@ -1,34 +1,73 @@
 #include "array.h"
 
 struct Array
 {
+	Data* array;
+	size_t size;
 };
 
 // create array
-Array *array_create(size_t size)
+Array* array_create(size_t size)
 {
-    return new Array;
+	if (size != 0)
+	{
+		Array* array = new Array;
+		array->size = size;
+		array->array = new Data[size];
+		return array;
+	}
+	else
+		return nullptr;
 }
 
 // delete array, free memory
-void array_delete(Array *arr)
+void array_delete(Array* arr)
 {
-    delete arr;
+	if (arr->array != nullptr)
+	{
+		delete[] arr->array;
+		delete arr;
+	}
 }
 
 // returns specified array element
-Data array_get(const Array *arr, size_t index)
+Data array_get(const Array* arr, size_t index)
 {
-    return (Data)0;
+	if (index < arr->size)
+		return arr->array[index];
+	else
+		return 0;
 }
 
 // sets the specified array element to the value
-void array_set(Array *arr, size_t index, Data value)
+void array_set(Array* arr, size_t index, Data value)
 {
+	if (index < arr->size)
+	{
+		arr->array[index] = value;
+	}
 }
 
 // returns array size
-size_t array_size(const Array *arr)
+size_t array_size(const Array* arr)
 {
-    return 0;
+	if (arr->array != nullptr)
+		return arr->size;
+	return 0;
+}
+
+// fill array from file
+Array* fill_array(std::ifstream &in)
+{
+	size_t size;
+	Data value;
+	in >> size;
+	Array* array = array_create(size);
+	for (size_t i = 0; i < size; i++)
+	{
+		in >> value; 
+		array_set(array, i, value);
+	}
+
+	return array;
 }

LibraryCPP/array.h

@@ -1,7 +1,9 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
 #include <cstddef>
+#include <cstdlib>
+#include <fstream>
 
 // Non-resizeable array
 // Stores integer values inside
@@ -10,18 +12,21 @@
 struct Array;
 
 // create array
-Array *array_create(size_t size);
+Array* array_create(size_t size);
 
 // delete array, free memory
-void array_delete(Array *arr);
+void array_delete(Array* arr);
 
 // returns specified array element
-Data array_get(const Array *arr, size_t index);
+Data array_get(const Array* arr, size_t index);
 
 // sets the specified array element to the value
-void array_set(Array *arr, size_t index, Data value);
+void array_set(Array* arr, size_t index, Data value);
 
 // returns array size
-size_t array_size(const Array *arr);
+size_t array_size(const Array* arr);
+
+// fill array from file
+Array* fill_array(std::ifstream &in);
 
 #endif