lab2 update

Author: ms-anastasiia

CMakeLists.txt

@@ -15,4 +15,4 @@ add_subdirectory(LibraryCPP)
 #add_subdirectory(LibraryCPPClass)
 #add_subdirectory(LibraryCPPTemplate)
 
-add_subdirectory(Lab1CPP)
+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}/inputt.txt)

Lab2CPP/input3.txt

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

Lab2CPP/inputt.txt

@@ -0,0 +1,111 @@
+#include <iostream>
+#include <fstream>
+#include <stdexcept>
+#include "stack.h"  
+#include "vector.h" 
+#include <string>
+
+int precedence(char op) {
+    if (op == '+' || op == '-') return 1; 
+    if (op == '*' || op == '/') return 2; 
+    return 0;
+}
+
+int apply_operator(int a, int b, char op) {
+    switch (op) {
+    case '+': return a + b;
+    case '-': return a - b;
+    case '*': return a * b;
+    case '/':
+        if (b == 0) throw std::runtime_error("Division by zero");
+        return a / b;
+    }
+
+}
+
+int evaluate_example(const std::string& example) { 
+    Stack* values = stack_create();
+    Stack* operators = stack_create();
+
+    for (size_t i = 0; i < example.length(); i++) {
+
+        if (example[i] == ' ') continue;
+
+        if (isdigit(example[i])) {
+            int value = 0;
+            while (i < example.length() && isdigit(example[i])) {
+                value = value * 10 + (example[i] - '0');
+                i++;
+            }
+            i--;
+            stack_push(values, value);
+        }
+
+        else if (example[i] == '(') {
+            stack_push(operators, example[i]);
+        }
+       
+        else if (example[i] == ')') {
+            while (!stack_empty(operators) && stack_get(operators) != '(') {
+                int val2 = stack_get(values);
+                stack_pop(values);
+                int val1 = stack_get(values);
+                stack_pop(values);
+                char op = stack_get(operators);
+                stack_pop(operators);
+                stack_push(values, apply_operator(val1, val2, op));
+            }
+           
+            if (!stack_empty(operators)) {
+                stack_pop(operators);
+            }
+        }
+        
+        else if (example[i] == '+' || example[i] == '-' || example[i] == '*' || example[i] == '/') {
+            while (!stack_empty(operators) && precedence(stack_get(operators)) >= precedence(example[i])) {
+                int val2 = stack_get(values);
+                stack_pop(values);
+                int val1 = stack_get(values);
+                stack_pop(values);
+                char op = stack_get(operators);
+                stack_pop(operators);
+                stack_push(values, apply_operator(val1, val2, op));
+            }
+            stack_push(operators, example[i]);
+        }
+    }
+
+    
+    while (!stack_empty(operators)) {
+        int val2 = stack_get(values);
+        stack_pop(values);
+        int val1 = stack_get(values);
+        stack_pop(values);
+        char op = stack_get(operators);
+        stack_pop(operators);
+        stack_push(values, apply_operator(val1, val2, op));
+    }
+
+    int result = stack_get(values);
+
+    
+    stack_delete(values);
+    stack_delete(operators);
+
+    return result; 
+}
+
+int main() {
+    std::ifstream inputFile("inputt.txt");
+    std::string example;
+
+    if (inputFile.is_open()) {
+        std::getline(inputFile, example);
+        inputFile.close();
+    }
+    int result = evaluate_example(example);
+    std::cout << "result: " << result << std::endl;
+
+
+    return 0;
+}