From fea1fa9e0aba9f570bff265f9626c44f1963978c Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sun, 19 May 2024 12:52:51 +0200 Subject: [PATCH] More colors --- a.out | Bin 42069 -> 42298 bytes pretty_printing.cmi | Bin 1944 -> 1944 bytes pretty_printing.cmo | Bin 9572 -> 10130 bytes pretty_printing.ml | 14 +++++++++----- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/a.out b/a.out index 5b20e334331d86693ac31019aa198215a682bae5..9e1ca7db9a8fe97324df6d3fa887edb5cdd4b414 100755 GIT binary patch delta 643 zcmX|-PiWI{6vy+j)FsTh#X6=0jLIsOflIgk5s}fWZnA3KoJ;E(=9JM!YgeS{22v2c z=)pd86|4vw-U^c+0~N#_MR)Mx!P^F&L=VNwCWH8rRDbaKe&74?eLr6E^&|i86Tf;O zBN=-*ZieHy4m7eVJCph8gIN~5-VPwJ(2X$x7O|3zN#hhr5rA@`7dP{we2+TkbP&!1 zU1;R|)tuypWC(Vebn_6Ks?2UrOL`5+m@(1O}LIt%kRrkC*YRVi{GsiI(!nka5Zmv9|_vGH(#f(0a4fCcm`cCF8ES_vo!ZGfhnS8LSnlXB^ZM8gO%;wnY z>2iV~XBRUtF!2C&&f{QUEZNLDD~8!nfk9O|+Sni$L>hugBQR+UCQZPkDVQ_^ljf7p z&)v-!ySaOw9V37A1&2u*!6hm2sTG+e3^AK;%-_l)@LR+4;#Z^V-&X~2y7)`7&YwJY UNizRjNN1GD21;l$GC(+;ll9mF vL@qGOeqogT0hDlHWPosfO`gPNBoJ{X_w=MWc0XUuV4l%9QS<-gD{Myq9Ze#| delta 103 zcmbQiKZAcmGONf$Mo|t%QJw>=j2w&%5RTB~a@NHnOBlt=7{#lA5}J$*5YCLrdTaqA uXBcIf8D-gl5)Oy@O$I?X}nI?WhdGHW@Is7OHH3q(q|x30orQ446_`8NE3Bnro>$Ote$tM=vl93*nK5jf9 zjl{+`OX#t7d*@DA!4#`lgB1uG)-|;((97QV<7JJH_gg7N%PD0t4_aY;;cd`67&WrS zACST2PI>Be#{g3JzN}=1YMk_X`Cd)6ZlLtR1wDnUe#N ze+z{P>}?)v^lSZLYH}xgldS8eVcjs}7;l*q_e@h33W8^!AUrUGDZeWdgj%7Yr8}L; zY)@|L?%0^=*x25JNOa`f#4-=!);E*ltoKw_v3?r$Pf_1Ry+!>e)c;sHDQowid?>Oq z7L9H=o|l>+?1AK&nyc7|0L@jLkAO4RGYHV?#YG5G zKydZ4u=5Bmra(&&TtyH>u#F;KLXheqK8@f2xgrP-5=hXhX|h$(`Y5zIhhv=M zG`0YZ*TC7fjbroU6^%FEevk7XT4Kr{8 zZ`t}nal^Hb$lC-h&p`SN+66Mqgm#I*fOd=EZD_o>vUnKTkh6tT5TX@}A0Xu9{ScuZ z5=}>Fh+r5Ye$HeugAh+4i?b1O0LfAPaeF*dP>=P7r zvcHdTE0?f;DdE+0{=@-KItJz;(7MmUHVc$A)$m*z$cu(7QE+>1^h}2nq)vszh`lGF*8!qMs7yfhe akmu0u1JesuO-;;~wR2L)mc?@k{`?P=WtN@* delta 1687 zcmYL|e@I(b6vy8;zE|y%yd>{OqRy&YoJ~8miP5UmqD8T;$dXaVDidPVXsz*Q(`_9s znY4v6`bX+3w2ZmWLqkI(7!C?T;gwE75Dsh;gg*9bH{$k^8;y@849xD@mJ8(0 zhH@h!x{WD&-Ng%ehUTa+IvsOH3IQXEGJG~W;;eIE!MIlNuIJeL#)izYyvhdHxM@@t zmN@tQx3MwA{vBnb*_bM9f@pkKcy8wlw*(=lMi92!1tD)CPY?pap6FyEl{y(4pBx%Z z4UG;)QFwlKgK)e79p1P|fnC)x`S@AXf3c(3U-czCnJ@bKOL4G+(F6P^sMPrX49*n|@W%sBsMHu=k z*_BWp(W*O8))=EI|P*<;ZIO$$F?X`s%tw8b)8oI1}#9rUC`(oknj*1 z&(jO-0=afWyF{)vXmh5SW;KSP-6dZb+A={A^u{ge^wuru^bQK}LGNTB4nyzR6iXl9 z5=(!N;&ws*z=}H!otJNc{yBNtpj)>jE!i5OTjj-L(0TO;bS69Nz6|;!3O)ec(p<7t z!YdM7hgTz*g|~=cFT8xK-@?ml&BJ?%TutyU5_}KuJ%SJ6r4qJuJA6FRkMNa|&w#Ij z;0^dX2=2qzO>h;yeg@fxJ~Nb;CsT1yXo~OCQihY$QL$6$-l~c{N)cOvKJwr zNszr&e&jDv>J0L&)`FB}U@~$1Xl!gOHq?)TQseD%e-oZ{!PdjRixSp3o@#DJL4Z<) z!&RZ0P;Eo?-r8_&eM4PCxF(E(defYqmU0vno;4QA&!~Y+@LAxsU;eHB{ppv{?X8gl V>0{&Y&X8PTPK%l;*(RH<&;J^IArt@r diff --git a/pretty_printing.ml b/pretty_printing.ml index 0175bd1..f2edd79 100644 --- a/pretty_printing.ml +++ b/pretty_printing.ml @@ -130,15 +130,19 @@ let draw_line_bresenham mat cls origin x1 y1 x2 y2 cutoff = done;; let display mat cls = - let colors = [|"\027[30m"; "\027[31m"; "\027[32m"; "\027[33m"; "\027[34m"; "\027[35m"; "\027[36m"; "\027[37m"|] in + let colors = [|"\027[40m"; "\027[41m"; "\027[42m"; "\027[43m"; "\027[44m"; "\027[45m"; "\027[46m"; "\027[47m"; "\027[100m"; "\027[101m"; "\027[102m"; "\027[103m"; "\027[104m"; "\027[105m"; "\027[106m"; "\027[107m"|] in for i = 0 to (Array.length mat -1) do for j = 0 to (Array.length mat.(i) -1) do - print_string colors.(cls.(i).(j) mod (Array.length colors)); + if cls.(i).(j) = 0 then + print_string colors.(0) + else + print_string colors.(max 1 (cls.(i).(j) mod (Array.length colors))); if mat.(i).(j) = '&' then print_char ' ' else print_char mat.(i).(j) done; + print_string "\027[0m"; print_char '\n' done;; @@ -186,14 +190,14 @@ let extremely_fancy_graph_printing g size = if !i >= size then i := size-1 else (); if !j >= size then j := size-1 else (); px.(!i).(3* !j) <- Char.chr (k + 48); - extend px cls !i (3* !j) 3; + extend px cls !i (3* !j) 2; coords.(k) <- (!i, 3* !j); done; (* draw the connections *) for i = 0 to Array.length g -1 do for j = 0 to Array.length g.(i) -1 do - draw_line_bresenham px cls i (fst coords.(i)) (snd coords.(i)) (fst coords.(g.(i).(j))) (snd coords.(g.(i).(j))) 7 + draw_line_bresenham px cls i (fst coords.(i)) (snd coords.(i)) (fst coords.(g.(i).(j))) (snd coords.(g.(i).(j))) 4 done done; @@ -201,7 +205,7 @@ let extremely_fancy_graph_printing g size = display px cls ;; -let gr = [|[|1; 2|]; [|2; 3|]; [|0; 1; 3|]; [|0; 1|]|] ;; +let gr = [|[|1; 2|]; [|2; 3|]; [|0; 1; 3|]; [|0; 1; 4|]; [|2; 3|]; [||]; [||]|] ;; (*print_mat gr ;;*)