diff --git a/1Y-2H/dsa/lab2/.o/main.o b/1Y-2H/dsa/lab2/.o/main.o
index 003cdce..15c99d0 100644
Binary files a/1Y-2H/dsa/lab2/.o/main.o and b/1Y-2H/dsa/lab2/.o/main.o differ
diff --git a/1Y-2H/dsa/lab2/code/main.c b/1Y-2H/dsa/lab2/code/main.c
index dbf41da..38b9289 100644
--- a/1Y-2H/dsa/lab2/code/main.c
+++ b/1Y-2H/dsa/lab2/code/main.c
@@ -15,12 +15,19 @@ int main(int argc,char **argv) {
         case '2': // Test Sorts
             {
             int n;
-            if(!(argv[1][1]>='a'&&argv[1][1]<='z')) return 0;
+            if(!(argv[1][1]>='a'&&argv[1][1]<='z')){ 
+                printf("\nPrint 2(r/h/b/m) to sort or 3 to see var");
+                printf("\n2r - radix\n2h - heap\n2b - bubble\n2m - merge\n");
+                return 0;}
             printf("Write n:");
             scanf("%d",&n);
             while(getchar()>'\n');
             uint32_t *arr = (uint32_t*)malloc(sizeof(uint32_t) * n);
-            fill_rand(arr, n);
+            printf("Write n nums:");
+            for (int i = 0;i<n;i++){
+                scanf("%d",&arr[i]);
+            }
+            
             for(int i = 0; i<n;i++)printf("%d ",arr[i]);
             putchar('\n');
 
@@ -42,17 +49,24 @@ int main(int argc,char **argv) {
                 for(int i = 0; i<n;i++)printf("%d ",arr[i]);
                     break;
                 default:
-                    break;
+                printf("\nPrint 2(r/h/b/m) to sort or 3 to see var");
+                printf("\n2r - radix\n2h - heap\n2b - bubble\n2m - merge\n");
+                return 0;
             }
+            free(arr);
             break;
-        default:
-            return 0;
             }
         case '3':
             {
             printf("\n N - %d",(18-1)%24+1);
             break;
             }
+        default:
+            {
+            printf("\nPrint 2(r/h/b/m) to sort or 3 to see var");
+            printf("\n2r - radix\n2h - heap\n2b - bubble\n2m - merge\n");
+            return 0;
+            }
         }
     }
     else{
@@ -71,37 +85,38 @@ void run_exp(void) {
     int n = MILLION,end=MILLION,step = 50000;
     for (;n<=end;n+=step){
 
-        uint32_t *arr = (uint32_t*)malloc(sizeof(uint32_t) * n);
-    
-        double tRadTotal = 0;
-        for (int i = 0; i < AVG_TIME_LOOPS; i++) {
-            fill_rand(arr, n);
-            double t = get_time();
-            sort_radix(arr,n);
-            tRadTotal += (get_time() - t);
-        }
-        double tRadRes = tRadTotal / AVG_TIME_LOOPS;
-    
-        double tHeapTotal = 0;
-        for (int i = 0; i < AVG_TIME_LOOPS; i++) {
-            fill_rand(arr, n);
-            double t = get_time();
-            sort_heap(arr, n);            
-            tHeapTotal += (get_time() - t);
-        }
-        double tHeapRes = tHeapTotal / AVG_TIME_LOOPS;
+        uint32_t *arrA = (uint32_t*)malloc(sizeof(uint32_t) * n);
+        uint32_t *arrB = (uint32_t*)malloc(sizeof(uint32_t) * n);
+        uint32_t *arrC = (uint32_t*)malloc(sizeof(uint32_t) * n);
 
+        double tRadTotal = 0;
+        double tHeapTotal = 0;
         double tBubblTotal = 0;
         for (int i = 0; i < AVG_TIME_LOOPS; i++) {
-            fill_rand(arr, n);
-            double t = get_time();
-            sort_bubble(arr,n);
-            tBubblTotal += (get_time() - t);
+            fill_rand(arrA, n);
+            arrC = arrB = arrA;
+
+            double ta = get_time();
+            sort_radix(arrA,n);
+            tRadTotal += (get_time() - ta);
+    
+            double tb = get_time();
+            sort_heap(arrB, n);            
+            tHeapTotal += (get_time() - tb);
+
+            double tc = get_time();
+            sort_bubble(arrC,n);
+            tBubblTotal += (get_time() - tc);
         }
+        double tRadRes = tRadTotal / AVG_TIME_LOOPS;
+        double tHeapRes = tHeapTotal / AVG_TIME_LOOPS;
         double tBubblRes = tBubblTotal / AVG_TIME_LOOPS;
 
+        free(arrA);
+        free(arrB);
+        free(arrC);
+
         fprintf(f, "%d %f %f %f\n", n, tRadRes, tHeapRes, tBubblRes);
-        free(arr);
         printf("Sort: %d/%d  \r", n, end);
         fflush(stdout);
     }
diff --git a/1Y-2H/dsa/lab2/data/makefile b/1Y-2H/dsa/lab2/data/makefile
index e6d42bb..9138774 100644
--- a/1Y-2H/dsa/lab2/data/makefile
+++ b/1Y-2H/dsa/lab2/data/makefile
@@ -20,9 +20,5 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@mkdir -p $(OBJ_DIR)
 	$(CC) $(CFLAGS) -c $< -o $@
 
-run: $(TARGET)
-	./$(TARGET) < input > output
-	@cat output
-
 clean:
 	rm -rf $(OBJ_DIR) $(TARGET) output
diff --git a/1Y-2H/dsa/lab2/data/sort b/1Y-2H/dsa/lab2/data/sort
index fbbcd33..fde6408 100755
Binary files a/1Y-2H/dsa/lab2/data/sort and b/1Y-2H/dsa/lab2/data/sort differ
diff --git a/1Y-2H/gameoflife b/1Y-2H/gameoflife
deleted file mode 160000
index feb40df..0000000
--- a/1Y-2H/gameoflife
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit feb40df734fc63b76ab7843e0a87417243f43cee
diff --git a/1Y-2H/prog/.cache/clangd/index/FILE.h.846F156B181C5A07.idx b/1Y-2H/prog/.cache/clangd/index/FILE.h.846F156B181C5A07.idx
new file mode 100644
index 0000000..8c9d886
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/FILE.h.846F156B181C5A07.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/__FILE.h.BEEE5A6696CD3CC3.idx b/1Y-2H/prog/.cache/clangd/index/__FILE.h.BEEE5A6696CD3CC3.idx
new file mode 100644
index 0000000..a01ae0a
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/__FILE.h.BEEE5A6696CD3CC3.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/__fpos64_t.h.2EADFCA8D822C455.idx b/1Y-2H/prog/.cache/clangd/index/__fpos64_t.h.2EADFCA8D822C455.idx
new file mode 100644
index 0000000..d239f49
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/__fpos64_t.h.2EADFCA8D822C455.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/__fpos_t.h.53A3712523DD5217.idx b/1Y-2H/prog/.cache/clangd/index/__fpos_t.h.53A3712523DD5217.idx
new file mode 100644
index 0000000..3956935
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/__fpos_t.h.53A3712523DD5217.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/__mbstate_t.h.7482AF58BE8A6D98.idx b/1Y-2H/prog/.cache/clangd/index/__mbstate_t.h.7482AF58BE8A6D98.idx
new file mode 100644
index 0000000..4a4ad1d
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/__mbstate_t.h.7482AF58BE8A6D98.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/__sigset_t.h.660A044352C66985.idx b/1Y-2H/prog/.cache/clangd/index/__sigset_t.h.660A044352C66985.idx
new file mode 100644
index 0000000..5c0a8d2
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/__sigset_t.h.660A044352C66985.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/__stdarg___gnuc_va_list.h.7217896C9E30D544.idx b/1Y-2H/prog/.cache/clangd/index/__stdarg___gnuc_va_list.h.7217896C9E30D544.idx
new file mode 100644
index 0000000..77478da
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/__stdarg___gnuc_va_list.h.7217896C9E30D544.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/__stddef_null.h.A6C2510F9DEDD93F.idx b/1Y-2H/prog/.cache/clangd/index/__stddef_null.h.A6C2510F9DEDD93F.idx
new file mode 100644
index 0000000..70ecee7
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/__stddef_null.h.A6C2510F9DEDD93F.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/__stddef_size_t.h.F1D94434A92155DB.idx b/1Y-2H/prog/.cache/clangd/index/__stddef_size_t.h.F1D94434A92155DB.idx
new file mode 100644
index 0000000..504428a
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/__stddef_size_t.h.F1D94434A92155DB.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/__stddef_wchar_t.h.32383FC23AD34D3D.idx b/1Y-2H/prog/.cache/clangd/index/__stddef_wchar_t.h.32383FC23AD34D3D.idx
new file mode 100644
index 0000000..1a359aa
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/__stddef_wchar_t.h.32383FC23AD34D3D.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/alloca.h.793370BF9878CFB6.idx b/1Y-2H/prog/.cache/clangd/index/alloca.h.793370BF9878CFB6.idx
new file mode 100644
index 0000000..6e5e6cc
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/alloca.h.793370BF9878CFB6.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/atomic_wide_counter.h.807A3792D29058FD.idx b/1Y-2H/prog/.cache/clangd/index/atomic_wide_counter.h.807A3792D29058FD.idx
new file mode 100644
index 0000000..e3635dc
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/atomic_wide_counter.h.807A3792D29058FD.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/byteswap.h.5CF682CD30C8245A.idx b/1Y-2H/prog/.cache/clangd/index/byteswap.h.5CF682CD30C8245A.idx
new file mode 100644
index 0000000..d47b829
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/byteswap.h.5CF682CD30C8245A.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/cdefs.h.020FDF15FD4FDEBD.idx b/1Y-2H/prog/.cache/clangd/index/cdefs.h.020FDF15FD4FDEBD.idx
new file mode 100644
index 0000000..5365e54
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/cdefs.h.020FDF15FD4FDEBD.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/clock_t.h.D43CAB77D0D0D2BD.idx b/1Y-2H/prog/.cache/clangd/index/clock_t.h.D43CAB77D0D0D2BD.idx
new file mode 100644
index 0000000..5003397
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/clock_t.h.D43CAB77D0D0D2BD.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/clockid_t.h.4E370254AE2D9FBB.idx b/1Y-2H/prog/.cache/clangd/index/clockid_t.h.4E370254AE2D9FBB.idx
new file mode 100644
index 0000000..cd724c4
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/clockid_t.h.4E370254AE2D9FBB.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/cookie_io_functions_t.h.E3E6C5414DB00C0C.idx b/1Y-2H/prog/.cache/clangd/index/cookie_io_functions_t.h.E3E6C5414DB00C0C.idx
new file mode 100644
index 0000000..f785d65
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/cookie_io_functions_t.h.E3E6C5414DB00C0C.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/endian.h.1FC6A4D6D2846204.idx b/1Y-2H/prog/.cache/clangd/index/endian.h.1FC6A4D6D2846204.idx
new file mode 100644
index 0000000..026be57
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/endian.h.1FC6A4D6D2846204.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/endian.h.34A83B053A733CA8.idx b/1Y-2H/prog/.cache/clangd/index/endian.h.34A83B053A733CA8.idx
new file mode 100644
index 0000000..396757e
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/endian.h.34A83B053A733CA8.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/endianness.h.BDC6F260DCC6E0EC.idx b/1Y-2H/prog/.cache/clangd/index/endianness.h.BDC6F260DCC6E0EC.idx
new file mode 100644
index 0000000..2b207bf
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/endianness.h.BDC6F260DCC6E0EC.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/features-time64.h.BFBA8D3CA0316037.idx b/1Y-2H/prog/.cache/clangd/index/features-time64.h.BFBA8D3CA0316037.idx
new file mode 100644
index 0000000..62b2cb9
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/features-time64.h.BFBA8D3CA0316037.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/features.h.5A4ED7C80201A723.idx b/1Y-2H/prog/.cache/clangd/index/features.h.5A4ED7C80201A723.idx
new file mode 100644
index 0000000..b159be6
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/features.h.5A4ED7C80201A723.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/floatn-common.h.975EC49F61A3C703.idx b/1Y-2H/prog/.cache/clangd/index/floatn-common.h.975EC49F61A3C703.idx
new file mode 100644
index 0000000..1a2cb33
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/floatn-common.h.975EC49F61A3C703.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/floatn.h.F3C6759637F0C3C2.idx b/1Y-2H/prog/.cache/clangd/index/floatn.h.F3C6759637F0C3C2.idx
new file mode 100644
index 0000000..6b26e60
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/floatn.h.F3C6759637F0C3C2.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/head.h.4FEEA9FF37D089D9.idx b/1Y-2H/prog/.cache/clangd/index/head.h.4FEEA9FF37D089D9.idx
new file mode 100644
index 0000000..6d563a0
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/head.h.4FEEA9FF37D089D9.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/io.c.273DFC38D4DC7C48.idx b/1Y-2H/prog/.cache/clangd/index/io.c.273DFC38D4DC7C48.idx
new file mode 100644
index 0000000..e2a165d
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/io.c.273DFC38D4DC7C48.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/libc-header-start.h.1C0FBEF85547B680.idx b/1Y-2H/prog/.cache/clangd/index/libc-header-start.h.1C0FBEF85547B680.idx
new file mode 100644
index 0000000..f627c9f
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/libc-header-start.h.1C0FBEF85547B680.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/limits.h.1DFE7D0FE6434B13.idx b/1Y-2H/prog/.cache/clangd/index/limits.h.1DFE7D0FE6434B13.idx
new file mode 100644
index 0000000..503d6e6
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/limits.h.1DFE7D0FE6434B13.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/limits.h.57BAFCB3AC3E49E9.idx b/1Y-2H/prog/.cache/clangd/index/limits.h.57BAFCB3AC3E49E9.idx
new file mode 100644
index 0000000..404666d
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/limits.h.57BAFCB3AC3E49E9.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/limits.h.C293B8934AC926BB.idx b/1Y-2H/prog/.cache/clangd/index/limits.h.C293B8934AC926BB.idx
new file mode 100644
index 0000000..0eae475
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/limits.h.C293B8934AC926BB.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/local_lim.h.A1F0B5161BD6CDAD.idx b/1Y-2H/prog/.cache/clangd/index/local_lim.h.A1F0B5161BD6CDAD.idx
new file mode 100644
index 0000000..ac9d872
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/local_lim.h.A1F0B5161BD6CDAD.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/long-double.h.D4BCC892B95DB530.idx b/1Y-2H/prog/.cache/clangd/index/long-double.h.D4BCC892B95DB530.idx
new file mode 100644
index 0000000..5e5cf38
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/long-double.h.D4BCC892B95DB530.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/main.c.2164EA87086CF11E.idx b/1Y-2H/prog/.cache/clangd/index/main.c.2164EA87086CF11E.idx
new file mode 100644
index 0000000..c8200dc
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/main.c.2164EA87086CF11E.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/matrix.c.2046B175A9A87ACE.idx b/1Y-2H/prog/.cache/clangd/index/matrix.c.2046B175A9A87ACE.idx
new file mode 100644
index 0000000..5b22f4a
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/matrix.c.2046B175A9A87ACE.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/posix1_lim.h.F32309C974B4FD51.idx b/1Y-2H/prog/.cache/clangd/index/posix1_lim.h.F32309C974B4FD51.idx
new file mode 100644
index 0000000..43de11e
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/posix1_lim.h.F32309C974B4FD51.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/posix2_lim.h.3A58038C48DCD449.idx b/1Y-2H/prog/.cache/clangd/index/posix2_lim.h.3A58038C48DCD449.idx
new file mode 100644
index 0000000..0fcad41
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/posix2_lim.h.3A58038C48DCD449.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/pthread_stack_min-dynamic.h.7B19ECE3A843B2BF.idx b/1Y-2H/prog/.cache/clangd/index/pthread_stack_min-dynamic.h.7B19ECE3A843B2BF.idx
new file mode 100644
index 0000000..9be69e6
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/pthread_stack_min-dynamic.h.7B19ECE3A843B2BF.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/pthread_stack_min.h.EC4E208637F979D1.idx b/1Y-2H/prog/.cache/clangd/index/pthread_stack_min.h.EC4E208637F979D1.idx
new file mode 100644
index 0000000..663a114
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/pthread_stack_min.h.EC4E208637F979D1.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/pthreadtypes-arch.h.026BFE264B629FFA.idx b/1Y-2H/prog/.cache/clangd/index/pthreadtypes-arch.h.026BFE264B629FFA.idx
new file mode 100644
index 0000000..6a6fe54
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/pthreadtypes-arch.h.026BFE264B629FFA.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/pthreadtypes.h.078F29FDF072791A.idx b/1Y-2H/prog/.cache/clangd/index/pthreadtypes.h.078F29FDF072791A.idx
new file mode 100644
index 0000000..a44d1c3
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/pthreadtypes.h.078F29FDF072791A.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/select.h.B782DFA7AF82626C.idx b/1Y-2H/prog/.cache/clangd/index/select.h.B782DFA7AF82626C.idx
new file mode 100644
index 0000000..2e08b16
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/select.h.B782DFA7AF82626C.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/select.h.E66249F12D3AF654.idx b/1Y-2H/prog/.cache/clangd/index/select.h.E66249F12D3AF654.idx
new file mode 100644
index 0000000..06e52c4
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/select.h.E66249F12D3AF654.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/sigset_t.h.90E8434286D517E1.idx b/1Y-2H/prog/.cache/clangd/index/sigset_t.h.90E8434286D517E1.idx
new file mode 100644
index 0000000..8c2abef
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/sigset_t.h.90E8434286D517E1.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/stdarg.h.438E4EAC47BF2772.idx b/1Y-2H/prog/.cache/clangd/index/stdarg.h.438E4EAC47BF2772.idx
new file mode 100644
index 0000000..1509308
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/stdarg.h.438E4EAC47BF2772.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/stdc-predef.h.9EA93D70716BF84B.idx b/1Y-2H/prog/.cache/clangd/index/stdc-predef.h.9EA93D70716BF84B.idx
new file mode 100644
index 0000000..997f10f
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/stdc-predef.h.9EA93D70716BF84B.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/stddef.h.D85191973F11BD22.idx b/1Y-2H/prog/.cache/clangd/index/stddef.h.D85191973F11BD22.idx
new file mode 100644
index 0000000..af759d8
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/stddef.h.D85191973F11BD22.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/stdint-intn.h.1B33604E07F2EC64.idx b/1Y-2H/prog/.cache/clangd/index/stdint-intn.h.1B33604E07F2EC64.idx
new file mode 100644
index 0000000..dc2c3e1
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/stdint-intn.h.1B33604E07F2EC64.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/stdio.h.6919C07CB89D47AD.idx b/1Y-2H/prog/.cache/clangd/index/stdio.h.6919C07CB89D47AD.idx
new file mode 100644
index 0000000..8fc102a
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/stdio.h.6919C07CB89D47AD.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/stdio_lim.h.E27D5CAD1DA797FA.idx b/1Y-2H/prog/.cache/clangd/index/stdio_lim.h.E27D5CAD1DA797FA.idx
new file mode 100644
index 0000000..f2d8361
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/stdio_lim.h.E27D5CAD1DA797FA.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/stdlib-float.h.2403F3F56D6FE40D.idx b/1Y-2H/prog/.cache/clangd/index/stdlib-float.h.2403F3F56D6FE40D.idx
new file mode 100644
index 0000000..feb78c0
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/stdlib-float.h.2403F3F56D6FE40D.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/stdlib.h.61AA7B9EED10C430.idx b/1Y-2H/prog/.cache/clangd/index/stdlib.h.61AA7B9EED10C430.idx
new file mode 100644
index 0000000..4b61c1b
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/stdlib.h.61AA7B9EED10C430.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/struct_FILE.h.BD746D724FA26A14.idx b/1Y-2H/prog/.cache/clangd/index/struct_FILE.h.BD746D724FA26A14.idx
new file mode 100644
index 0000000..65c6ead
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/struct_FILE.h.BD746D724FA26A14.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/struct_mutex.h.4C3362835A033C07.idx b/1Y-2H/prog/.cache/clangd/index/struct_mutex.h.4C3362835A033C07.idx
new file mode 100644
index 0000000..93cd5de
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/struct_mutex.h.4C3362835A033C07.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/struct_rwlock.h.015225931B7E9A45.idx b/1Y-2H/prog/.cache/clangd/index/struct_rwlock.h.015225931B7E9A45.idx
new file mode 100644
index 0000000..f65df81
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/struct_rwlock.h.015225931B7E9A45.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/struct_timespec.h.84E4D8A674C22D31.idx b/1Y-2H/prog/.cache/clangd/index/struct_timespec.h.84E4D8A674C22D31.idx
new file mode 100644
index 0000000..4a3eb90
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/struct_timespec.h.84E4D8A674C22D31.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/struct_timeval.h.E5EFAE6351E57E37.idx b/1Y-2H/prog/.cache/clangd/index/struct_timeval.h.E5EFAE6351E57E37.idx
new file mode 100644
index 0000000..6224b51
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/struct_timeval.h.E5EFAE6351E57E37.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/stubs-64.h.C9B9EF9F85A49B89.idx b/1Y-2H/prog/.cache/clangd/index/stubs-64.h.C9B9EF9F85A49B89.idx
new file mode 100644
index 0000000..1c5d56d
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/stubs-64.h.C9B9EF9F85A49B89.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/stubs.h.082359ACEA197EE8.idx b/1Y-2H/prog/.cache/clangd/index/stubs.h.082359ACEA197EE8.idx
new file mode 100644
index 0000000..d587633
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/stubs.h.082359ACEA197EE8.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/thread-shared-types.h.3BF83EAF2453B9EE.idx b/1Y-2H/prog/.cache/clangd/index/thread-shared-types.h.3BF83EAF2453B9EE.idx
new file mode 100644
index 0000000..9a7f513
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/thread-shared-types.h.3BF83EAF2453B9EE.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/time64.h.CB321F1760C06220.idx b/1Y-2H/prog/.cache/clangd/index/time64.h.CB321F1760C06220.idx
new file mode 100644
index 0000000..d0a909a
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/time64.h.CB321F1760C06220.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/time_t.h.BAF6123CBDB646D6.idx b/1Y-2H/prog/.cache/clangd/index/time_t.h.BAF6123CBDB646D6.idx
new file mode 100644
index 0000000..39bdbed
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/time_t.h.BAF6123CBDB646D6.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/timer_t.h.DE52AF3543DCC14B.idx b/1Y-2H/prog/.cache/clangd/index/timer_t.h.DE52AF3543DCC14B.idx
new file mode 100644
index 0000000..05c9153
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/timer_t.h.DE52AF3543DCC14B.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/timesize.h.B987EAFC7C6E7540.idx b/1Y-2H/prog/.cache/clangd/index/timesize.h.B987EAFC7C6E7540.idx
new file mode 100644
index 0000000..a13f1e5
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/timesize.h.B987EAFC7C6E7540.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/types.h.03E112F1187911D8.idx b/1Y-2H/prog/.cache/clangd/index/types.h.03E112F1187911D8.idx
new file mode 100644
index 0000000..b24c7ca
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/types.h.03E112F1187911D8.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/types.h.A9C854B704566561.idx b/1Y-2H/prog/.cache/clangd/index/types.h.A9C854B704566561.idx
new file mode 100644
index 0000000..de8b000
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/types.h.A9C854B704566561.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/typesizes.h.458576AD7CBC208B.idx b/1Y-2H/prog/.cache/clangd/index/typesizes.h.458576AD7CBC208B.idx
new file mode 100644
index 0000000..9eb1238
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/typesizes.h.458576AD7CBC208B.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/uintn-identity.h.1CA9207577CEA5E1.idx b/1Y-2H/prog/.cache/clangd/index/uintn-identity.h.1CA9207577CEA5E1.idx
new file mode 100644
index 0000000..879629c
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/uintn-identity.h.1CA9207577CEA5E1.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/waitflags.h.1480026F0BFFE024.idx b/1Y-2H/prog/.cache/clangd/index/waitflags.h.1480026F0BFFE024.idx
new file mode 100644
index 0000000..495ed34
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/waitflags.h.1480026F0BFFE024.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/waitstatus.h.C8A83CD20FAF0338.idx b/1Y-2H/prog/.cache/clangd/index/waitstatus.h.C8A83CD20FAF0338.idx
new file mode 100644
index 0000000..c692844
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/waitstatus.h.C8A83CD20FAF0338.idx differ
diff --git a/1Y-2H/prog/.cache/clangd/index/wordsize.h.B3DEF3D506FCA17B.idx b/1Y-2H/prog/.cache/clangd/index/wordsize.h.B3DEF3D506FCA17B.idx
new file mode 100644
index 0000000..cbd71b7
Binary files /dev/null and b/1Y-2H/prog/.cache/clangd/index/wordsize.h.B3DEF3D506FCA17B.idx differ
diff --git a/1Y-2H/prog/.obj/io.o b/1Y-2H/prog/.obj/io.o
new file mode 100644
index 0000000..0f09441
Binary files /dev/null and b/1Y-2H/prog/.obj/io.o differ
diff --git a/1Y-2H/prog/.obj/main.o b/1Y-2H/prog/.obj/main.o
new file mode 100644
index 0000000..60ae059
Binary files /dev/null and b/1Y-2H/prog/.obj/main.o differ
diff --git a/1Y-2H/prog/.obj/matrix.o b/1Y-2H/prog/.obj/matrix.o
new file mode 100644
index 0000000..63fd6e2
Binary files /dev/null and b/1Y-2H/prog/.obj/matrix.o differ
diff --git a/1Y-2H/prog/1Practice/run/makefile b/1Y-2H/prog/1Practice/run/makefile
deleted file mode 100644
index c8d07fe..0000000
--- a/1Y-2H/prog/1Practice/run/makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-CC = gcc
-
-CFLAGS = -Wall -Wextra -I../ -g 
-TARGET = matrix
-
-SRC_DIR = ../code
-OBJ_DIR = ../.o
-
-SRCS = $(wildcard $(SRC_DIR)/*.c)
-OBJS = $(patsubst $(SRC_DIR)/%.c, $(OBJ_DIR)/%.o, $(SRCS))
-
-.PHONY: all clean run
-
-all: $(TARGET)
-
-$(TARGET): $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) -o $(TARGET)
-
-$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
-	@mkdir -p $(OBJ_DIR)
-	$(CC) $(CFLAGS) -c $< -o $@
-
-run: $(TARGET)
-	./$(TARGET) < input > output
-	@cat output
-
-clean:
-	rm -rf $(OBJ_DIR) $(TARGET) output
diff --git a/1Y-2H/prog/compile_commands.json b/1Y-2H/prog/compile_commands.json
new file mode 100644
index 0000000..037f944
--- /dev/null
+++ b/1Y-2H/prog/compile_commands.json
@@ -0,0 +1,44 @@
+[
+  {
+    "file": "src/io.c",
+    "arguments": [
+      "gcc",
+      "-I./include",
+      "-g",
+      "-c",
+      "src/io.c",
+      "-o",
+      ".obj/io.o"
+    ],
+    "directory": "/home/oniic/Documents/sibsutisiv522s18/1Y-2H/prog",
+    "output": ".obj/io.o"
+  },
+  {
+    "file": "src/main.c",
+    "arguments": [
+      "gcc",
+      "-I./include",
+      "-g",
+      "-c",
+      "src/main.c",
+      "-o",
+      ".obj/main.o"
+    ],
+    "directory": "/home/oniic/Documents/sibsutisiv522s18/1Y-2H/prog",
+    "output": ".obj/main.o"
+  },
+  {
+    "file": "src/matrix.c",
+    "arguments": [
+      "gcc",
+      "-I./include",
+      "-g",
+      "-c",
+      "src/matrix.c",
+      "-o",
+      ".obj/matrix.o"
+    ],
+    "directory": "/home/oniic/Documents/sibsutisiv522s18/1Y-2H/prog",
+    "output": ".obj/matrix.o"
+  }
+]
\ No newline at end of file
diff --git a/1Y-2H/prog/Lectures/Лекция 14.pdf b/1Y-2H/prog/docs/Lectures/Лекция 14.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 14.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 14.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 15.pdf b/1Y-2H/prog/docs/Lectures/Лекция 15.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 15.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 15.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 16.pdf b/1Y-2H/prog/docs/Lectures/Лекция 16.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 16.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 16.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 17.pdf b/1Y-2H/prog/docs/Lectures/Лекция 17.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 17.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 17.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 18.pdf b/1Y-2H/prog/docs/Lectures/Лекция 18.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 18.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 18.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 19.pdf b/1Y-2H/prog/docs/Lectures/Лекция 19.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 19.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 19.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 20.pdf b/1Y-2H/prog/docs/Lectures/Лекция 20.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 20.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 20.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 21.pdf b/1Y-2H/prog/docs/Lectures/Лекция 21.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 21.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 21.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 22.pdf b/1Y-2H/prog/docs/Lectures/Лекция 22.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 22.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 22.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 23.pdf b/1Y-2H/prog/docs/Lectures/Лекция 23.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 23.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 23.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 24.pdf b/1Y-2H/prog/docs/Lectures/Лекция 24.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 24.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 24.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 25.pdf b/1Y-2H/prog/docs/Lectures/Лекция 25.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 25.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 25.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 26.pdf b/1Y-2H/prog/docs/Lectures/Лекция 26.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 26.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 26.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 27.pdf b/1Y-2H/prog/docs/Lectures/Лекция 27.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 27.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 27.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 28.pdf b/1Y-2H/prog/docs/Lectures/Лекция 28.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 28.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 28.pdf
diff --git a/1Y-2H/prog/Lectures/Лекция 29.pdf b/1Y-2H/prog/docs/Lectures/Лекция 29.pdf
similarity index 100%
rename from 1Y-2H/prog/Lectures/Лекция 29.pdf
rename to 1Y-2H/prog/docs/Lectures/Лекция 29.pdf
diff --git a/1Y-2H/prog/1Practice/docs.md b/1Y-2H/prog/docs/docs.md
similarity index 100%
rename from 1Y-2H/prog/1Practice/docs.md
rename to 1Y-2H/prog/docs/docs.md
diff --git a/1Y-2H/prog/1Practice/nPractic1.pdf b/1Y-2H/prog/docs/nPractic1.pdf
similarity index 100%
rename from 1Y-2H/prog/1Practice/nPractic1.pdf
rename to 1Y-2H/prog/docs/nPractic1.pdf
diff --git a/1Y-2H/prog/docs/nPractic2.pdf b/1Y-2H/prog/docs/nPractic2.pdf
new file mode 100644
index 0000000..78406ea
Binary files /dev/null and b/1Y-2H/prog/docs/nPractic2.pdf differ
diff --git a/1Y-2H/prog/1Practice/Практическая работа 1.pdf b/1Y-2H/prog/docs/Практическая работа 1.pdf
similarity index 100%
rename from 1Y-2H/prog/1Practice/Практическая работа 1.pdf
rename to 1Y-2H/prog/docs/Практическая работа 1.pdf
diff --git a/1Y-2H/prog/include/bitstruct.h b/1Y-2H/prog/include/bitstruct.h
new file mode 100644
index 0000000..e69de29
diff --git a/1Y-2H/prog/include/head.h b/1Y-2H/prog/include/head.h
new file mode 100644
index 0000000..d0583b5
--- /dev/null
+++ b/1Y-2H/prog/include/head.h
@@ -0,0 +1,23 @@
+#ifndef Head
+#define Head
+
+// INCLUDE 
+    #include <stdio.h>
+    #include <stdlib.h>
+    #include <limits.h>
+
+// DEFINE
+    #define BUFF_MAX 10 //(char) <= 254
+    #define IN_BUFF_CHARS 10 //(char) <= 254
+    
+//TypeDef
+
+// FUNC
+    // === io.c ===
+    MATRIX2D* create_matrix2d(int rows, int cols);
+    char buff_input(char *inbuff, char *_buff);
+    char cmd_buff(char* _buff,char** _charCommands,char NUM_OF_CHAR_COMMANDS);
+    char get_matrix_num(void);
+    int get_num(void);
+
+#endif
diff --git a/1Y-2H/prog/1Practice/code/head.h b/1Y-2H/prog/include/matrixstruct.h
similarity index 63%
rename from 1Y-2H/prog/1Practice/code/head.h
rename to 1Y-2H/prog/include/matrixstruct.h
index b7e9731..0703c1d 100644
--- a/1Y-2H/prog/1Practice/code/head.h
+++ b/1Y-2H/prog/include/matrixstruct.h
@@ -1,35 +1,14 @@
 #ifndef Head
 #define Head
 
-// INCLUDE 
-    #include <stdio.h>
-    #include <stdlib.h>
-    #include <limits.h>
-
-// DEFINE
-    #define LLI long long int
     #define MAX_MATRIX_ALIVE 21
-    #define BUFF_MAX 10 //(char) <= 254
-    #define IN_BUFF_CHARS 10 //(char) <= 254
     
-//TypeDef
-    // matrix.c
     typedef struct {
         int rows;
         int cols;
         int** data;
     } MATRIX2D;
 
-
-// FUNC
-    // === io.c ===
-    MATRIX2D* create_matrix2d(int rows, int cols);
-    char buff_input(char *inbuff, char *_buff);
-    char cmd_buff(char* _buff,char** _charCommands,char NUM_OF_CHAR_COMMANDS);
-    char get_matrix_num(void);
-    int get_num(void);
-
-    // === matrix.c ===
     void create_matrix(MATRIX2D** addr, unsigned char n, int rows, int cols);
     void input_matrix(MATRIX2D** addr, unsigned char n);
     void get_matrix(MATRIX2D** addr, unsigned char n);
@@ -41,8 +20,9 @@
     void get_matrix_col(MATRIX2D** addr, unsigned char n, int c);
     void get_matrix_row(MATRIX2D** addr, unsigned char n, int r);
     void transp_matrix(MATRIX2D** addr, unsigned char n);
-    LLI determ_matrix(MATRIX2D** addr, unsigned char n);
+    long long int determ_matrix(MATRIX2D** addr, unsigned char n);
     void obr_matrix(MATRIX2D** addr, unsigned char n);
     void is_Matrix_Exist(MATRIX2D** addr, unsigned char n);
 
+
 #endif
diff --git a/1Y-2H/prog/1Practice/run/input b/1Y-2H/prog/input
similarity index 100%
rename from 1Y-2H/prog/1Practice/run/input
rename to 1Y-2H/prog/input
diff --git a/1Y-2H/prog/makefile b/1Y-2H/prog/makefile
new file mode 100644
index 0000000..b909d80
--- /dev/null
+++ b/1Y-2H/prog/makefile
@@ -0,0 +1,40 @@
+CC = gcc
+
+CFLAGS = -I./include -g
+LDFLAGS = -lncursesw -lpanel -lmenu
+
+TARGET = matrix
+
+SRC_DIR = src
+OBJ_DIR = .obj
+
+SRC = $(wildcard $(SRC_DIR)/*.c)
+OBJ = $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRC))
+
+all: $(TARGET)
+
+$(TARGET): $(OBJ)
+	$(CC) $(OBJ) -o $(TARGET) $(LDFLAGS)
+
+# Компиляция .c -> .o в .obj/
+$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c | $(OBJ_DIR)
+	$(CC) $(CFLAGS) -c $< -o $@
+
+# Создание папки для объектов
+$(OBJ_DIR):
+	mkdir -p $(OBJ_DIR)
+
+run:
+	./matrix < input > output
+
+clean:
+	rm -rf $(OBJ_DIR) $(TARGET) output
+
+.cc: $(OBJ)
+	mkdir -p $(OBJ_DIR)
+	@for src in $(SRC); do \
+		obj=$(OBJ_DIR)/$$(basename $$src .c).o; \
+		bear -- $(CC) $(CFLAGS) -c $$src -o $$obj; \
+	done	
+	mv ./compile_commands.json .build/ || true
+                                                     
diff --git a/1Y-2H/prog/1Practice/run/matrix b/1Y-2H/prog/matrix
similarity index 60%
rename from 1Y-2H/prog/1Practice/run/matrix
rename to 1Y-2H/prog/matrix
index 8e4f8ea..196524e 100755
Binary files a/1Y-2H/prog/1Practice/run/matrix and b/1Y-2H/prog/matrix differ
diff --git a/1Y-2H/prog/src/bitstruct.c b/1Y-2H/prog/src/bitstruct.c
new file mode 100644
index 0000000..e69de29
diff --git a/1Y-2H/prog/1Practice/code/io.c b/1Y-2H/prog/src/io.c
similarity index 100%
rename from 1Y-2H/prog/1Practice/code/io.c
rename to 1Y-2H/prog/src/io.c
diff --git a/1Y-2H/prog/1Practice/code/main.c b/1Y-2H/prog/src/main.c
similarity index 99%
rename from 1Y-2H/prog/1Practice/code/main.c
rename to 1Y-2H/prog/src/main.c
index 7e10e1d..9538c0b 100644
--- a/1Y-2H/prog/1Practice/code/main.c
+++ b/1Y-2H/prog/src/main.c
@@ -1,3 +1,4 @@
+#include "matrixstruct.h"
 #include "head.h"
 
 int main(void){
diff --git a/1Y-2H/prog/1Practice/code/matrix.c b/1Y-2H/prog/src/matrix.c
similarity index 95%
rename from 1Y-2H/prog/1Practice/code/matrix.c
rename to 1Y-2H/prog/src/matrix.c
index f065ddd..3addade 100644
--- a/1Y-2H/prog/1Practice/code/matrix.c
+++ b/1Y-2H/prog/src/matrix.c
@@ -1,3 +1,4 @@
+#include "matrixstruct.h"
 #include "head.h"
 
 MATRIX2D* create_matrix2d(int rows,int cols) {
@@ -70,13 +71,13 @@ void logic_matrix(MATRIX2D** __addr,unsigned char n1,unsigned char n2){
         cmd = cmd_buff(_buff,_charCommands,NUM_OF_CHAR_COMMANDS);
     }
 
-    LLI cost1 = 0;
+    long long int cost1 = 0;
     {
         for(int r = 0;r<__addr[n1]->rows;r++)
             for(int c = 0;c<__addr[n1]->cols;c++)
                 cost1 += data1[r][c];
     }
-    LLI cost2 = 0;
+    long long int cost2 = 0;
     {
         for(int r = 0;r<__addr[n2]->rows;r++)
             for(int c = 0;c<__addr[n2]->cols;c++)
@@ -250,12 +251,12 @@ void transp_matrix(MATRIX2D** __addr,unsigned char n){
     __addr[n] = tr;
 }
 
-LLI determ_matrix(MATRIX2D** __addr, unsigned char n) {
+long long int determ_matrix(MATRIX2D** __addr, unsigned char n) {
     int size = __addr[n]->rows;
     int** data = __addr[n]->data;
 
     if (size == 1) return data[0][0];
-    if (size == 2) return (LLI)data[0][0] * data[1][1] - (LLI)data[0][1] * data[1][0];
+    if (size == 2) return (long long int)data[0][0] * data[1][1] - (long long int)data[0][1] * data[1][0];
 
     double det = 1.0;
     double** temp = (double**)malloc(size * sizeof(double*));
@@ -296,9 +297,9 @@ LLI determ_matrix(MATRIX2D** __addr, unsigned char n) {
         }
     }
 
-    LLI final_det;
-    if (det >= 0) final_det = (LLI)(det + 0.5);
-    else final_det = (LLI)(det - 0.5);
+    long long int final_det;
+    if (det >= 0) final_det = (long long int)(det + 0.5);
+    else final_det = (long long int)(det - 0.5);
 
     for (int i = 0; i < size; i++) free(temp[i]);
     free(temp);
@@ -310,7 +311,7 @@ void obr_matrix(MATRIX2D** __addr, unsigned char n) {
     int size = __addr[n]->rows;
     if (size != __addr[n]->cols) return; 
 
-    LLI d = determ_matrix(__addr, n);
+    long long int d = determ_matrix(__addr, n);
     if (d == 0) return; 
 
     double** temp = (double**)malloc(size * sizeof(double*));
diff --git a/1Y-2H/trpo/lab-rodionov-iv522s18 b/1Y-2H/trpo/lab-rodionov-iv522s18
index 35320e1..ff0e5e4 160000
--- a/1Y-2H/trpo/lab-rodionov-iv522s18
+++ b/1Y-2H/trpo/lab-rodionov-iv522s18
@@ -1 +1 @@
-Subproject commit 35320e1cfbb6861721b75c1659d04e047b8497b3
+Subproject commit ff0e5e45aa8363816ab78d6931369467ec67d7fe
diff --git a/1Y-2H/trpo/merge/3-merge-dirty b/1Y-2H/trpo/merge/3-merge-dirty
index 9dd1208..18f86e4 160000
--- a/1Y-2H/trpo/merge/3-merge-dirty
+++ b/1Y-2H/trpo/merge/3-merge-dirty
@@ -1 +1 @@
-Subproject commit 9dd1208713873ba056c7d9967a390c7938e2becf
+Subproject commit 18f86e4aa27556e6240f1a22d4698b27a89e8382
diff --git a/1Y-2H/trpo/merge/4-rebase-no-conflict b/1Y-2H/trpo/merge/4-rebase-no-conflict
index 0458f65..cbf57a9 160000
--- a/1Y-2H/trpo/merge/4-rebase-no-conflict
+++ b/1Y-2H/trpo/merge/4-rebase-no-conflict
@@ -1 +1 @@
-Subproject commit 0458f65e61693a9f3da9570d8d478654ebc843c1
+Subproject commit cbf57a9a065d2ec96ed51e87fec4353697dd6b5b
diff --git a/1Y-2H/trpo/merge/6-rebase-conflict-easy b/1Y-2H/trpo/merge/6-rebase-conflict-easy
index c0d1d48..8befc09 160000
--- a/1Y-2H/trpo/merge/6-rebase-conflict-easy
+++ b/1Y-2H/trpo/merge/6-rebase-conflict-easy
@@ -1 +1 @@
-Subproject commit c0d1d48901af3565c5190f1648ff0df8d78879a5
+Subproject commit 8befc09275d4bb3a54c4223a11fb52bcfc1955ac
diff --git a/1Y-2H/trpo/merge/8-rebase-conflict-hard b/1Y-2H/trpo/merge/8-rebase-conflict-hard
index f20cd7c..42d7cad 160000
--- a/1Y-2H/trpo/merge/8-rebase-conflict-hard
+++ b/1Y-2H/trpo/merge/8-rebase-conflict-hard
@@ -1 +1 @@
-Subproject commit f20cd7c28ecfe626e82dca5eebc2e104d09bd772
+Subproject commit 42d7cad46d2d6b5dbac50060b31e692c0ac961b0