From b0c4675345aee08fc6cf99a43c29e5d270ebfa15 Mon Sep 17 00:00:00 2001
From: Makarov Denis <ddmakarov@edu.hse.ru>
Date: Thu, 11 Apr 2024 00:51:39 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B2=D1=81?=
 =?UTF-8?q?=D0=B5=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B5=D0=B5.=20=D0=9F=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D0=B8=D0=B9=20=D0=BA=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=BC=D0=B8=D1=82=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=20=D1=81?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BC=20:)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                                     | Bin 10244 -> 10244 bytes
 .../CMakeFiles/viktor.dir/source/main.cpp.o   | Bin 722136 -> 722136 bytes
 .../Testing/Temporary/LastTest.log            |   4 +-
 cmake-build-debug/viktor                      | Bin 284147 -> 284147 bytes
 source/laba3.hpp                              |  10 ++--
 source/main.cpp                               |  48 +-----------------
 source/matrix_ex.txt                          |   4 +-
 7 files changed, 12 insertions(+), 54 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 7befc8353f3ccaff41147958709118c865259d4c..5b0e88d4a5fa75607a2785972f718cf006bd4320 100644
GIT binary patch
delta 59
ycmZn(XbIRLD?WLzU@4n{j)JMN!DInZ>B+%DDw}VJ>vL>oQxIpzB02enxGn$<SrEzq

delta 79
zcmZn(XbIRLE6%um@;<>rF7fJWT?-urQ)7e40;1B4os)G$<r%v+UlBLr*vzgV#*SCn
I<SXL(0I7=>l>h($

diff --git a/cmake-build-debug/CMakeFiles/viktor.dir/source/main.cpp.o b/cmake-build-debug/CMakeFiles/viktor.dir/source/main.cpp.o
index 589e69f709ee64dc584fd4f8da2a1e2bc093e889..96ef8d102b132be77d91ad466d4319a267b7f744 100644
GIT binary patch
delta 2105
zcmY*aX>3$g6n^)ep39w~)0Nf^h1voZP*M;|pwN`9g!l$j;D-rNhOLyagCHQ%fm;?K
zno?r&!jga(K?5N`jDxQ~j3NONh@dfm1`XOD2H7$!!5=1m=anV=cyrJB?peP3-DR$B
zA8>X1fQ_5gSMJ5u>e!NDuCvB%TX4NQImy_r&B|$Z+vZ()$8nOmGS^J4JJpIASxz#q
z@qOids**WrwbMPXQpF$FD`yS0J!n2G)5U+bgzn$XCqno3Zj_?7<IRD%rMriP$uI4w
zRL=a-jw5rAH+(B|<q|p{kYM*Vd?#4No-xWfq^R|ho9y%7N6I-2`<(j&=GKB0y!0Ep
z+>=@H!63hOs0+G-W5Yq$ZCi6+3JmeP`EGrD__OKZFHG0?D}1-CYrRZoHz2;=-{ZS=
zYJB>d?^dbQq|KrWwLVrS8<mrs6beJFAG*~N{N{Q{0c9?!F!$~4zX|u&3u>&)P8KDa
zvsyR0dc62asTJzzi92f?M4mrLg(=6?Ai<{o+kxeOFsoQpaGZ1g*4=Kcnw>tq+wEya
zMnh@ARD^DN>MdV{%%*6lv)fv}L%h7{&|v-n)IOx#wpmTte(6DXsETcye9*;5__FXZ
zK8>$Sdh$UtctR>$aemYs<DLmF(dH;Ex0L5`o^IE)EZ`{Rd)z$`GXj&ASxp5VJDQf7
zquh%M0$OT$oM2-@GnWdiKoN}W&{D}O$gt9zx#SM3tsHSj=ONo71vP5R!ZF}%O@$sS
zbX{y#Q8y1{nl&x=%Ws+ssjt_W4owR)9MMrKaR({w(SkrzJY>>jIhW#=Fh(dIpcfT;
zFc+FyEntnNQq*e~*7H1$Q4dS=p1}_Uo-1%qOLL#X#SaCZBXF55ra4b=O^v1l)u=I`
zQh(Dwrhh7#;S#E_lnkgM;6e-HEs)RD(#!zay*!!;&3cDS8=zSw^$vKH<vNdR18T5b
zNWHC$G3qTkQMRe&8d{9yH9`q62iDE)rv%IZMCa#Nq2K?ODM&R~bf5+_l_B6VO?^B~
zGXf~n2fOKUQ2;hN0pX^DPGv}ET1cld;IWp+cswegX+o#c${3@{kWK`2Vzfp?2aHUb
zhBhcrsM|STqq3gh2e(XKYL;MB1>#dI=TMcUDFMF*K>W&1pQ=1A^DrTXBNO%Egym7s
z1BP`5;7|n27V9^wHBEM_6%Dk^+8v!QEl}avuV@q<7;ZXN*OZ=m+vKYyd)MLsN6l*P
zn&2ETjUpiMXrkpJs+RV!N~zjDL9kGzCvuS)!I2gSmB4n=P>D-ej?+*pBakpI!G&fd
zs}?Rgl{Fh7=lsie%=hYo|H)lbF=jlD0gaSYSY<TQ$_OM(eTz%XFtnJ69%H2kj)Ftj
zgE-Y$8G-nZ?wZP+_7pDU8OKt4Dxfp|tM^RL>L3My&pJra^i4{F&musq7_6|tB#xOH
z=8YP8xV^|+f6sKUPNxE#q4SbTX~d6$Z9_}YC#$OITvaTc)gNJ}{qy(C-qh#o!9MB^
zD8vS5I9Io5I)P#l`qA-VS@eK~c(Kc2+h=H4mWm`~k=qB`Bq4n@T|#^`!JN=^3?yUp
z69Bv>$55BWfo1t+O+Pzc3Syz<5yTbIFDQNlL3yw|SY{P?z~oZgyL`N0cqBHlqFfJD
zS<^b)na@xvqUj2va&(5i>~ya>xFTPqaA2;9br@(jO}{z-4#7t5b#z$m={ljP>34}b
zDDi)wP#LZ`zn)>-k`XAI!3);HJzBUsc6Gn(+YJ!ikA1u0AIO-har?uqxPeTix5)Fb
zud~Nrg5cTPhtLl61N>yfzrc$~I{&_DcI$$brh|t>&3jyjL*37#RT;|0wm{<ymxsnH
zI>B)*5AeG<A)0b<W>$tv%JnZkH1UdM862E^K_Ki>EGc|^nNOv+Wc5Yb&23#C8GMm+
Kmq*ddIsXG~DgRyo

delta 2105
zcmY*aX>3$g6n^)ep39wqDIL1d7AS2~3uqw)3boLbt%mr9B?J<G2n-l#Sq%^n5b3}z
zix^EQF?lH_grb5A7(|kRhr}Qffq;P+1%rf${4mOvVF~^)@jI_9;m4bM&Uer9-R~}Q
zd0W-xZB-jKsl)F1wwmrsYh7ox+rHpxF*(WZJ2ok&#ciK=={3hm#$>LA+P16ZGqapz
z_WZY%)2Wg@(rUYVMy2vTXjIN>YQNvIPp0#(w}$RtEnkQ3tqzo;_Jb{fxJ4bcVRHU^
zmC9)v>o_v^X#ICGS0bTJfCRg{{)AxtcaBreUPWye++_KG?<;2??9=WKm|Fu@@Y1jD
za1Uh_RfGJR5iaOf$6f|qw|(_JDKON}^WDaxkx!>bJ~v(KFZbP&?&D>;$1KE;_jmek
zgPM^3&3A{WRAQ6pLT!)Kq4~;5CPHDT?OnG<f+wwm6j0`Z3UjAyyCU4%&Z+S-J5`iu
z$!go+>Q}^{CAC5wJ#lAGfXGeNDoi=3ss)?&?+q;fojC=fg5#X_w{*DmDw#gn;r275
z<Ds-*Dnd6u@s=${W^+8$*=;L*PrTl*LxZN>sJ&OY?Q@!Q{XTo#5h`!%v^_39!k2}Q
z@o9YB($n^sVG~nP#qp^5iu)zFP@Da<!cw-!Ir^BU<pD>jr^m&Cm=Tz?+-l14*wM7i
z?B{aI322$+34)Ca&7PEF1&Ux~hn7iRPKK4<#D%w6ZQ+PJHV4@jDX39j5{?1)&=mJr
zq3fGwCH3+^rbW{Vzw~c&E_HaVxuI!Eh9f#k1#Y#{9xVzq^$wXVwA_<=Tf!Kj-T``1
zfd_Musn-J5X)5wK@0hS|l8ItVO;6$b0?!w?kEQuf;9d^|o+of$TR`(3<C>by4OFA%
zfQtN$|Cm9kxfw2`{+8wj)IZ={3*xPi&(zbLfMZnZ(Hv-27BWpjvq~xpc#P!+kLv?U
zTF#|1D`SkxL?`ND>bZ`VV0q0@0?dKsxdWAe8Gz{g49oQg-88*YNsA7YL{k|8F40u(
zX__5CnR4u=$N2%+=mdnD1v(WWotYt>ih##k9_R6xfMyDv3M*rbDndFD(23D%5gjlx
zX(rmBK(0Q<agEA)q95EeIjJ`Uqbd-eVL6+sEX@e`B>>`AcKKB0afycsF&vp_3@0p)
zc@|LH6@Wt#Fk7tOtkN{ytx+`CGHZ8iTw0*Q(_hgjIyl^PtZrd?`YjVzOFP!!07uO#
z?w;UmFpVN0@MwzVd>SV0VfCS5_A!EmDm{tw%_xqvLa52uP8u$8lPwp~a4RE_FfPHl
zW;Cl-&Oeeh7a?c;i?_}9>a73a9aA=LB8~yoNh+)os<Scz2~($Xp{YfSN$AliJ?bT}
zQF_!{8G-l@@0iN$<0)Lola8h1sen%UFWxo%YQ9ZD;8PA#G#yJx@F@g{6@wKvn9MO#
z$Gkx!54RVY>+YK3nxm-zXXr;srK5-+1KWm{ppREo*R`rxI%^QZPWfl<nvYT+uLJw2
zTa}9q&TvoNs_7dPi_m$;gJsbJ7UIP&g>9drVOh$Tki~8Vwn;(;X!;59(FAis(?O7o
z(FFj#0yx-nabQ{Quj!)Wr63ks9za|^{fy!V5R?PUgJo8N2TbmRdl$zGhDTx}D?C=9
z%9_^V&U}he5lz1!DqCmh%P#j<2Up~a6b{TKu|5Zyr|Gf-;4|3By@C#_Jl!A^HT^D8
zpGf>w6e__L=b;&{%<w3b&EN%V<-V<4j9u-NeY*yto!GZ){_cz!GNCivifhPJdb2za
zySjS(AqbwmT?oC7et;j3_!oE{NyqP*7PsNV3Uh;pN6lN@fI~gdqoo<j#kN4>43~z+
z3p&9?S{~pfI3b$yab^~WODgcsKQKjQ3o<x3g@QoXW-O^#STG++Z_XNkv_H3YduZ@Q
L(%l|LFJ}J_FO~l?

diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log
index 7289a33..8806e66 100644
--- a/cmake-build-debug/Testing/Temporary/LastTest.log
+++ b/cmake-build-debug/Testing/Temporary/LastTest.log
@@ -1,3 +1,3 @@
-Start testing: Apr 10 22:34 MSK
+Start testing: Apr 11 00:33 MSK
 ----------------------------------------------------------
-End testing: Apr 10 22:34 MSK
+End testing: Apr 11 00:33 MSK
diff --git a/cmake-build-debug/viktor b/cmake-build-debug/viktor
index 3a087cbc6db67bce286c43c1e98de8b5cd3e906b..b8623671abe8d8497260044b7fb93d2b773316f3 100755
GIT binary patch
delta 68
zcmeyoTJZB~!G<l29#fecS;gDEr!oRD({}Hv%o@8DOn(<nDe(DR5?sFc-^%cJ1}j2Y
Y;+zDGQybX1VqbZu)oq^~z>>fU0NOqqvj6}9

delta 68
zcmV-K0K5P5s}b|75rDJ-NR<O>u@;9*l>vuKl>)a*l>;cdAXIMScw^V|k@{=~lh{ty
a<wqpq^9r!d?!~<F2*d#GBe#=K1YiYB86edF

diff --git a/source/laba3.hpp b/source/laba3.hpp
index 5319439..3691a84 100644
--- a/source/laba3.hpp
+++ b/source/laba3.hpp
@@ -1,3 +1,5 @@
+
+
 #pragma once
 
 #include "laba3.h"
@@ -23,9 +25,9 @@ std::tuple<const char*, node_name_t, node_name_t> parse_args(int arg_count, char
         throw std::runtime_error("Invalid number of arguments!");
 
     std::unordered_map<std::string, const char*> args = {
-        {"--file", nullptr},
-        {"--from", nullptr},
-        {"--to", nullptr}
+            {"--file", nullptr},
+            {"--from", nullptr},
+            {"--to", nullptr}
     };
     for (char** t = arg_vars + 1; t < arg_vars + arg_count; t += 2) {
         auto it = args.find(*t);
@@ -97,3 +99,5 @@ matrix_t load_matrix(const char* filename) {
     return matr;
 }
 
+
+
diff --git a/source/main.cpp b/source/main.cpp
index 1787fed..fa87c0b 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -2,15 +2,8 @@
 #include "laba3.h"
 
 #include <iostream>
-#include <string>
+
 #include <vector>
-#include <sstream>
-/*
-int main(int arg_count, char* arg_values[]) {
-    for (size_t i = 0; i < arg_count; ++i)
-        std::cout << i << ": " << arg_values[i] << '\n';
-}
-*/
 
 
 
@@ -26,42 +19,3 @@ int main(int arg_count, char* arg_values[]){
     return 0;
 }
 
-
-/*
-int main() {
-    std::string input;
-    std::vector<std::string> args;
-
-    std::cout << "Enter the arguments for the program, press Enter to finish:\n";
-
-    std::getline(std::cin, input);
-    std::istringstream iss(input);
-    std::string arg;
-
-    // Запрашиваем аргументы до тех пор, пока есть что читать в строке.
-    while (iss >> arg) {
-        args.push_back(arg);
-    }
-
-    // Преобразуем введенные аргументы в формат, совместимый с argv.
-    std::vector<char*> argv;
-    for (auto& a : args) {
-        argv.push_back(a.data());
-    }
-
-    // Добавляем фиктивное название программы в начало argv, так как это ожидается функцией parse_args.
-    argv.insert(argv.begin(), const_cast<char*>("my_program"));
-
-    try {
-        auto [file, from, to] = parse_args(static_cast<int>(argv.size()), argv.data());
-        std::cout << "File: " << file << ", from: " << from << ", to: " << to << std::endl;
-        //std::ifstream file = open_file("your_file.txt");
-    } catch (const std::exception& e) {
-        std::cerr << "Error: " << e.what() << '\n';
-        return 1;
-    }
-
-    return 0;
-
-}
-*/
diff --git a/source/matrix_ex.txt b/source/matrix_ex.txt
index c8ae9db..0ff75e8 100644
--- a/source/matrix_ex.txt
+++ b/source/matrix_ex.txt
@@ -1,2 +1,2 @@
-|2 2|
-|1 1.1|
\ No newline at end of file
+|1 2|
+|3 4|
\ No newline at end of file
-- 
GitLab