small naming update

NF-coder · NF-coder · commit 49b96c8cc7a8 · 2025-03-31T23:58:03.000+03:00
diff --git a/kik/sem2/РТ_КиК_25.pdf b/kik/sem2/РТ_КиК_25.pdf
diff --git a/linal/sem2/KLK1/TM-2.1_full-1.pdf b/linal/sem2/KLK1/TM-2.1_full-1.pdf
diff --git a/linal/sem2/KLK1/клк1-сем2-линал_ликвидирован.pdf b/linal/sem2/KLK1/клк1-сем2-линал_ликвидирован.pdf
diff --git a/programming/sem2/lab5/src/commands/Add.java b/programming/sem2/lab5/src/commands/Add.java
@@ -6,7 +6,7 @@
 import exceptions.UnacceptableValue;
 import commands.utils.AddUtils;
 import objects.City;
-import core.Structure;
+import storage.Structure;
 
 public class Add extends BasicCommand{
     public Add(){
diff --git a/programming/sem2/lab5/src/commands/AverageOfMetersAboveSeaLevel.java b/programming/sem2/lab5/src/commands/AverageOfMetersAboveSeaLevel.java
@@ -1,6 +1,6 @@
 package commands;
 
-import core.Structure;
+import storage.Structure;
 
 import java.util.HashMap;
 
diff --git a/programming/sem2/lab5/src/commands/Clear.java b/programming/sem2/lab5/src/commands/Clear.java
@@ -1,6 +1,6 @@
 package commands;
 
-import core.Structure;
+import storage.Structure;
 
 import java.util.HashMap;
 
diff --git a/programming/sem2/lab5/src/commands/FilterStartsWithName.java b/programming/sem2/lab5/src/commands/FilterStartsWithName.java
@@ -1,6 +1,6 @@
 package commands;
 
-import core.Structure;
+import storage.Structure;
 import objects.City;
 
 import java.util.HashMap;
diff --git a/programming/sem2/lab5/src/commands/Info.java b/programming/sem2/lab5/src/commands/Info.java
@@ -1,6 +1,6 @@
 package commands;
 
-import core.Structure;
+import storage.Structure;
 
 import java.util.HashMap;
 
diff --git a/programming/sem2/lab5/src/commands/RemoveAllByStandardOfLiving.java b/programming/sem2/lab5/src/commands/RemoveAllByStandardOfLiving.java
@@ -1,6 +1,6 @@
 package commands;
 
-import core.Structure;
+import storage.Structure;
 
 import java.util.HashMap;
 
diff --git a/programming/sem2/lab5/src/commands/RemoveById.java b/programming/sem2/lab5/src/commands/RemoveById.java
@@ -1,7 +1,7 @@
 package commands;
 
 import objects.converters.Converters;
-import core.Structure;
+import storage.Structure;
 
 import java.util.HashMap;
 
diff --git a/programming/sem2/lab5/src/commands/RemoveFirst.java b/programming/sem2/lab5/src/commands/RemoveFirst.java
@@ -1,6 +1,6 @@
 package commands;
 
-import core.Structure;
+import storage.Structure;
 
 import java.util.HashMap;
 
diff --git a/programming/sem2/lab5/src/commands/Save.java b/programming/sem2/lab5/src/commands/Save.java
@@ -1,7 +1,6 @@
 package commands;
 
-import core.Structure;
-import objects.City;
+import storage.Structure;
 
 import java.util.HashMap;
 
diff --git a/programming/sem2/lab5/src/commands/Show.java b/programming/sem2/lab5/src/commands/Show.java
@@ -1,6 +1,6 @@
 package commands;
 
-import core.Structure;
+import storage.Structure;
 
 import java.util.HashMap;
 
diff --git a/programming/sem2/lab5/src/commands/Update.java b/programming/sem2/lab5/src/commands/Update.java
@@ -5,7 +5,7 @@
 import exceptions.ElementNotFound;
 import exceptions.UnacceptableValue;
 import objects.City;
-import core.Structure;
+import storage.Structure;
 
 import java.util.HashMap;
 
diff --git a/programming/sem2/lab5/src/storage/Struct.java b/programming/sem2/lab5/src/storage/Struct.java
@@ -0,0 +1,78 @@
+package storage;
+
+import exceptions.ElementNotFound;
+import objects.City;
+
+import java.util.ArrayDeque;
+
+public class Struct {
+    private ArrayDeque<City> mainCollection = new ArrayDeque<>();
+
+    public ArrayDeque<City> getAllEntities(){
+        return new ArrayDeque<>(this.mainCollection);
+    }
+
+    public void removeById(Long id){
+        ArrayDeque<City> newCollection = new ArrayDeque<>();
+        for (City elem: this.getAllEntities()){
+            if (!elem.getId().equals(id)){
+                newCollection.addLast(elem);
+            }
+        }
+        mainCollection = newCollection;
+    }
+
+    public void removeFirst(){
+        mainCollection.removeFirst();
+    }
+
+    public void clearCollection(){
+        this.mainCollection.clear();
+    }
+
+    public void removeAllByStandardOfLiving(String standardOfLiving) {
+        ArrayDeque<City> newCollection = new ArrayDeque<City>();
+        for (City elem : this.getAllEntities()) {
+            if (elem.getStandardOfLiving().equals(standardOfLiving)) {
+                newCollection.addLast(elem);
+            }
+        }
+        mainCollection = newCollection;
+    }
+
+    public float averageOfMetersAboveSeaLevel(){
+        float seaLevelSum = 0f;
+        for (City entity: this.getAllEntities()){
+            seaLevelSum = seaLevelSum + entity.getSeaLevel();
+        }
+        return seaLevelSum/(float) mainCollection.size();
+    }
+
+    public void updateEntityById(Long id, City newEntity) throws ElementNotFound {
+        boolean ELEMENT_UPDATED_FLAG = false;
+
+        ArrayDeque<City> newArray = new ArrayDeque<>();
+        for (City element: this.mainCollection){
+            if (element.getId().equals(id)){
+
+                newEntity.setCreationDate(
+                        element.getCreationDate()
+                );
+                newEntity.setId(id);
+                newArray.addLast(
+                        newEntity
+                );
+                ELEMENT_UPDATED_FLAG = true;
+            }
+            else{
+                newArray.addLast(element);
+            }
+        }
+
+        this.mainCollection = newArray;
+
+        if (!ELEMENT_UPDATED_FLAG){
+            throw new ElementNotFound("No such element in collection!");
+        }
+    }
+}
diff --git a/programming/sem2/lab5/src/storage/StructAccess.java b/programming/sem2/lab5/src/storage/StructAccess.java
@@ -0,0 +1,21 @@
+package storage;
+
+import storage.promise.Promise;
+
+import java.util.HashMap;
+
+public class StructAccess {
+    Struct struct;
+    StructQueue queue;
+
+    HashMap<>
+
+    public StructAccess(Struct struct, StructQueue queue){
+        this.struct = struct;
+        this.queue = queue;
+    }
+
+    public void runTask(){
+        Promise promise = queue.getOperation();
+    }
+}
diff --git a/programming/sem2/lab5/src/storage/StructDaemon.java b/programming/sem2/lab5/src/storage/StructDaemon.java
@@ -0,0 +1,17 @@
+package storage;
+
+class MyRunnable implements Runnable {
+    public void run() {
+        while (true){
+            System.out.println("test");
+        }
+    }
+}
+
+public class StructDaemon {
+    public static void main(String[] args) {
+        MyRunnable myRunnable = new MyRunnable();
+        Thread thread = new Thread(myRunnable); // Создаем новый поток
+        thread.start(); // Запускаем новый поток
+    }
+}
diff --git a/programming/sem2/lab5/src/storage/StructQueue.java b/programming/sem2/lab5/src/storage/StructQueue.java
@@ -0,0 +1,32 @@
+package storage;
+
+import storage.promise.Promise;
+import storage.promise.PromiseStatus;
+
+import java.util.ArrayDeque;
+import java.util.HashMap;
+
+public class StructQueue {
+    private final ArrayDeque<Promise> operations = new ArrayDeque<>();
+
+    public Promise call(String operation, HashMap<String,String> args){
+        Promise promise = new Promise(
+                operation,
+                PromiseStatus.CREATED,
+                args,
+                new HashMap<>()
+        );
+        this.operations.addLast(
+                promise
+        );
+        return promise;
+    }
+
+    public int getQueueSize(){
+        return operations.size();
+    }
+
+    public Promise getOperation(){
+        return this.operations.pollFirst();
+    }
+}
diff --git a/programming/sem2/lab5/src/storage/Structure.java b/programming/sem2/lab5/src/storage/Structure.java
@@ -1,4 +1,4 @@
-package core;
+package storage;
 
 import exceptions.ElementNotFound;
 import objects.City;
diff --git a/programming/sem2/lab5/src/storage/promise/Promise.java b/programming/sem2/lab5/src/storage/promise/Promise.java
@@ -0,0 +1,10 @@
+package storage.promise;
+
+import java.util.HashMap;
+
+public record Promise(
+        String opName,
+        Enum<PromiseStatus> status,
+        HashMap<String,String> args,
+        HashMap<String,String> result
+){}
diff --git a/programming/sem2/lab5/src/storage/promise/PromiseStatus.java b/programming/sem2/lab5/src/storage/promise/PromiseStatus.java
@@ -0,0 +1,7 @@
+package storage.promise;
+
+public enum PromiseStatus {
+    CREATED,
+    EXECUTING,
+    FINISHED
+}
