Merge pull request #646 from ImSpaceLover/features/lab32

Лабораторная №32

Author: Pastor

students/23K0120/23K0120-p22/src/main/java/ru/mirea/practice/s23k0120/task1/Calculator.java

@@ -32,8 +32,6 @@ public Number compute() {
         Number result = new Number();
         Number b;
         Number a;
-
-
         ComputingElement popped = stack.pop();
         if (popped instanceof Operation) {
             b = compute();

students/23K0120/23K0120-p22/src/main/java/ru/mirea/practice/s23k0120/task1/CalculatorController.java

@@ -9,14 +9,15 @@
 
 public class CalculatorController {
     private final Calculator calculator;
+    private final List<ComputingElement> fakeStack;
     private int numbersCount;
     private int operationCount;
-    private final List<ComputingElement> fakeStack;
 
     public CalculatorController() {
         this.calculator = new Calculator();
         fakeStack = new LinkedList<>();
         numbersCount = 0;
+        operationCount = 0;
     }
 
     public void addNumber(double number) {
@@ -36,7 +37,16 @@ public void clear() {
     }
 
     public ComputingElement delete() {
-        return fakeStack.remove(fakeStack.size() - 1);
+        ComputingElement element = null;
+        if (!fakeStack.isEmpty()) {
+            element = fakeStack.remove(fakeStack.size() - 1);
+            if (element instanceof Number) {
+                numbersCount -= 1;
+            } else {
+                operationCount -= 1;
+            }
+        }
+        return element;
     }
 
     public double compute() {
@@ -45,7 +55,7 @@ public double compute() {
         final Number result = calculator.compute();
         fakeStack.addAll(calculator.getStack());
         calculator.clear();
-        numbersCount -= operationCount;
+        numbersCount -= operationCount + 1;
         operationCount = 0;
         return result.getValue();
     }

students/23K0120/23K0120-p22/src/main/java/ru/mirea/practice/s23k0120/task2/CalculatorFrame.java

@@ -103,9 +103,6 @@ private void performButtonAction(String actionName) {
                 if (!cachedNumber.isEmpty()) {
                     addCached();
                 }
-                if (controller.getStackSize() > 0) {
-                    controller.addNumber(controller.compute());
-                }
                 break;
             default:
                 cachedNumber = cachedNumber.concat(actionName);
@@ -121,7 +118,7 @@ private void addCached() {
             controller.addNumber(cachedNumberDouble);
             clearCache();
         } catch (NumberFormatException ignored) {
-            return;
+            System.out.println();
         }
     }
 

students/23K0120/23K0120-p27/pom.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>23K0120</artifactId>
+        <groupId>ru.mirea.practice</groupId>
+        <version>2024.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>23K0120-p27</artifactId>
+    <description>Hash Table</description>
+</project>

students/23K0120/23K0120-p27/src/main/java/ru/mirea/practice/s23k0120/Main.java

@@ -0,0 +1,12 @@
+package ru.mirea.practice.s23k0120;
+
+public final class Main {
+
+    private Main() {
+
+    }
+
+    public static void main(String[] args) {
+        System.out.println("Двадцать седьмая практическая работа!");
+    }
+}

students/23K0120/23K0120-p27/src/main/java/ru/mirea/practice/s23k0120/task1/Hashtab.java

@@ -0,0 +1,24 @@
+package ru.mirea.practice.s23k0120.task1;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+public class Hashtab<K, V> {
+    private final Map<K, V> hashtable;
+
+    public Hashtab() {
+        hashtable = new Hashtable<>();
+    }
+
+    public void add(K key, V value) {
+        hashtable.put(key, value);
+    }
+
+    public V lookup(K key) {
+        return hashtable.get(key);
+    }
+
+    public V delete(K key) {
+        return hashtable.remove(key);
+    }
+}

students/23K0120/23K0120-p27/src/main/java/ru/mirea/practice/s23k0120/task2and3/Main.java

@@ -0,0 +1,16 @@
+package ru.mirea.practice.s23k0120.task2and3;
+
+import ru.mirea.practice.s23k0120.task1.Hashtab;
+
+public abstract class Main {
+    public static void main(String[] args) {
+        Hashtab<String, Double> constants = new Hashtab<>();
+        constants.add("Pi", 3.1415926535897931);
+        constants.add("E", 2.718281828459045);
+        constants.add("Phi", 1.6180339887);
+        constants.add("Sqrt2", 1.41421356237);
+
+        System.out.println(constants.lookup("Pi"));
+        System.out.println(constants.delete("Sqrt2"));
+    }
+}

students/23K0120/23K0120-p28/pom.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>23K0120</artifactId>
+        <groupId>ru.mirea.practice</groupId>
+        <version>2024.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>23K0120-p28</artifactId>
+    <description>Hash Set</description>
+</project>

students/23K0120/23K0120-p28/src/main/java/ru/mirea/practice/s23k0120/Main.java

@@ -0,0 +1,12 @@
+package ru.mirea.practice.s23k0120;
+
+public final class Main {
+
+    private Main() {
+
+    }
+
+    public static void main(String[] args) {
+        System.out.println("Двадцать седьмая практическая работа!");
+    }
+}

students/23K0120/23K0120-p28/src/main/java/ru/mirea/practice/s23k0120/task1/Main.java

@@ -0,0 +1,18 @@
+package ru.mirea.practice.s23k0120.task1;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+public abstract class Main {
+    public static void main(String[] args) {
+        Map<Integer, Integer> hashmap = new HashMap<>();
+        hashmap.put(1, 2005);
+        hashmap.put(2, 2012);
+        hashmap.put(3, 2023);
+        hashmap.put(4, 2027);
+        Map<Integer, Integer> treemap = new TreeMap<>(hashmap);
+        System.out.println(hashmap);
+        System.out.println(treemap);
+    }
+}