From 93542f2af1fbdf11fcdb75429826cc563f76c0fa Mon Sep 17 00:00:00 2001 From: Abigail Date: Tue, 2 Feb 2021 01:53:51 +0100 Subject: Switch from base-60 to base-91 --- challenge-004/abigail/c/ch-1.c | 81 ++++++++++++++++++++++------------ challenge-004/abigail/t/ctest.ini | 12 ----- challenge-004/abigail/t/input-1-2 | 0 challenge-004/abigail/t/output-1-2.exp | 1 - 4 files changed, 53 insertions(+), 41 deletions(-) delete mode 100644 challenge-004/abigail/t/input-1-2 delete mode 100644 challenge-004/abigail/t/output-1-2.exp diff --git a/challenge-004/abigail/c/ch-1.c b/challenge-004/abigail/c/ch-1.c index ef1a11aa53..21131ffb53 100644 --- a/challenge-004/abigail/c/ch-1.c +++ b/challenge-004/abigail/c/ch-1.c @@ -11,39 +11,64 @@ */ int main (void) { - char fst = '"' + 1; + char first_ord = '"' + 1; + char skip_ord = '\\'; + char last_ord = '~'; + int range = last_ord - first_ord; + size_t in_size = 5; + size_t out_size = 6; - /* Pi, base-60, encoded. '\' is escaped. */ char * pi = - "$T2/ZF.CU[H=&:\\X*^)?$KCV+Z@7<-*@+\\@'*H$J@;#SA3Y^.(OG7<':]P.6" - "-DVB4B'02VUR$/;J?2)A4L^C)XC'?S).0\\8M-S[=,X-\\@DP^+4:J5,*&UN[G" - "(LNP32+DU2*L&JN-0N'W.;/P&@2II.(W0FOW'>#*[U(UDI?%$N7OIQ#606[J+'-NC2%KD,L-KB>?C" - "/IQ2[%(K#Q0U.&ON.E+0>B5\\%>+S3I*U1KH\\#LG9C[&Q/^W&-X854=,VQA5W" - "##=5*V(T28+%-#P12M,OMV+.,?.4./$X572$%XEAI8(^-O%4$8'QOJ+VU+*2" - "(;0L#.%O3E^7.)LFG8*LB@M\\)+,:WK)K108X)L:-Z'>KE-=(?)20P'5'J-F&9)=I$,*Z#(0-'UB8=*D7GL:-?1NSH,VP5LN" - "*LGZ2'&LWN$0$@?7RN.7TMOF/&:L%]%:7U+W%/*-$)$K6;JR+A*:5@%Q^>0," - "'X[LF7$9/S4N&F->G$)VXSD3-F&1^/#>17M,+W9@3%&7E6;V&/L.FW-O*OPV" - "*-,B>9(U<@MJ)C/.?B+T>2AZ.=#X&&-AT9,))8*0*F#QG784#/XKBK/J[;=W" - ".%5\\R2+.E40A)&=:W9/47DX,)#VQFO/,$Z9^,\\Q^$.#B0VB'*^#\\;O&6X\\?C" - "/##QF%.DG=LO,K96%T+@=LGN-?W9IB&2AK(#'EFPDO,I73.(B=&Z+[,1A,.V8F&'&A5'%9*5[X)6#I,T7X)#.7B=&A*Q=5*TEZJN" - "-IVV%Q-?A0YZ'^K@CK/0C\\\\9&0W%8V,A=QY[$'YU1Q&>YT#;%BICA9%MCT\\N" - "#W%8'9%H7N%<#G8J/4.-^M*3(H78?*)#ZQ32,ALV@T$)S@'(/S9?5;-%&X&@"; + "%(uP7+Y`ME)gy(7')v?;%s^qc(Mj1}16idp'ONGs'2m.o,1HLY'}~P61@@Y-" \ + "*O/.v,Jc~D+ttA'&EPjR(zXxD$dr,M$P=-f*YQqe,GIZ`0x5oL1(mpl17en`" \ + ")Q$ge,L6_5.I;hj%yy6n,L_t')dtyy)[ugS&-3(c&lC:a&~8SP#+iis+WR&8" \ + "*Y;V3/+JD@-J>7u0$Nh<#2&:@+#=`/*YtP-0t8uf+tf/V&yjx>+]S=&%d}7z" \ + "0YXa9$SOyt$*mzv1&X(W(.{0G-Vya`0a}KI0pQD2,nV0:,WE0+#?F[>(iMb}" \ + "%k(tB/UO0m.8R'x%Vys_-|IgL.y-n6(v[*#+/-J1#[`]" \ + "&*M#'1wg" \ + "-}+B}*jWDi)/2&k,h|/)+eu-3)9{mU-`:]M/YF$a.O0SF0{~2C.EjkZ&>|lD" \ + "#%UmL+w)$V&14Ty0arq+%xnAo/XX/y0_=Bl/)f*}'Gc88'GV;X1RG~<+gJ8p" \ + "&^E~A'/3N=*R2|j&SgD@-0St?*jL@'-ZsbD$+_hy.#HkF0cO_[#t0wL-8._r" \ + "#0)@p#4(ha+lyD6,[|1w%_K//+c2#j.4xl2)SpX=.>)gp$R)ZP,IS%@,}%#J" \ + "*1zj[,sIw#%6pwl%D'fk#Bx6'%4?.0&c9'?#R7P|&ZJ;M&q6q&&|h9?0LVI}" \ + "(2lq>#/G+<,Bv`l+U'K?'2i}q+,J8W/7dU++X(l51R>#T&)fV0'I%FC%HHkt" \ + "%{(NN&Kn$]*e0," \ + "$K`U.%bSL*&dG^f,lN@.+jGbU.g8,s&FwUP$9p3S/)f(4,y>{*/L)t" \ + "-Oi$Y*&I1x1Kyk#$}~i|)^4uG%|&sU)XNR-,PLl/.lmT'&_~it-16U9-B~A[" \ + "(}s.a0~]Zj*<*~%-~N27%$O,*/a,,c%<#@60On3z0~3@B13UOG/A^&K,GRHi" \ + ",S_:*&9I{_$nCM9&U^*9)WmPj+$TL8.]WpP)CWDR$u#7])K/Bi+,[B9(0~a&" \ + "&=aag,L-UG#HoAx/=@p,&ux{:0($3X*[J<4,eh{E1F&tE$cGo.&C}15*:u{Z" \ + ",:*H^'f,=~$,z%B)WZbL$DjA;/oFKa%.>ig/^o.90e/P=*Auex0TD}p/hncA" \ + "/%d87#/u19,r&sM(A+4V0%4u$.}F+P0o|4e.g(<[#5yy*]3@5%II741/XZ>)Lm6e0``3L%.JF[+Z?8b(tj7C" \ + "'S/z}#vS|i)S9[=*/nCG)PMaY-{pML);vN?%kRcr#*.Tg,x;42'(1w.0dA)S" \ + ")-us%.#1$R-rkwf%m%B-(ctK8+4Sn^%*C1Y-wqsr%eNg11%$De&&07q+%1>-" \ + "+mCl2%)V#w%#y:[,?t*D$64`9.U+{`-SBX-+gi/o)0B$q#V$tW+#lmM)';EH" \ + "%yFPZ/Gy(~,dl@h)A&ju-Co2,-du++)[Awk&wE}p*H;._.[]4W+Eb7K#iiKB"; printf ("3."); size_t l = strlen (pi); - for (size_t i = 0; i < l; i += 6) { - long number = 0; - for (size_t j = i; j < i + 6; j ++) { - number *= 60; - number += pi [j] - fst; + for (size_t i = 0; i < l; i += in_size) { + long out = 0; + for (size_t j = i; j < i + in_size; j ++) { + out *= range; + char n = pi [j]; + if (n >= skip_ord) { + n --; + } + out += n - first_ord; } - printf ("%ld", number); + printf ("%09ld", out); } printf ("\n"); } + +/* + * FODDER FODDER FODDER FODDER FODDER FODDER FODDER + * FODDER FODDER FODDER FODDER FODDER FODDER FODDER. + * FODDER FODDER FODDER FODDER FODDER FODDER FODDER. + * FODDER FODDER FODDER FODDER FODDER FODDER FODDER. + */ diff --git a/challenge-004/abigail/t/ctest.ini b/challenge-004/abigail/t/ctest.ini index fdbdfa7461..0383d4c587 100644 --- a/challenge-004/abigail/t/ctest.ini +++ b/challenge-004/abigail/t/ctest.ini @@ -1,17 +1,5 @@ [names] 1-1 = Pi, 3242 digits -1-2 = Pi, 1978 digits - - -[1-1,1-2] -no_input = 1 - - -[1-1/c] -skip = Program size is different - -[1-2/awk,perl] -skip = Program size is different [challenges/1] extra_tests = Check_Program_Size diff --git a/challenge-004/abigail/t/input-1-2 b/challenge-004/abigail/t/input-1-2 deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/challenge-004/abigail/t/output-1-2.exp b/challenge-004/abigail/t/output-1-2.exp deleted file mode 100644 index 5be82f04d1..0000000000 --- a/challenge-004/abigail/t/output-1-2.exp +++ /dev/null @@ -1 +0,0 @@ -3.14159265358979323846264338327950288419716939937510582097494459230781646286208998628034825342117067982148086513282306647938446095505822317253594081284811174502841027019385211055596446229489549303819644288109756659334461284756482337867831652712019091456485669234603486104543266482133936072624914127372458700666315588174881520920962829254091715364367892590360113305305488204665213841469519415116094330572703657595919539218611738193261179310511854874462379962749567351885752724891227938183011949129833673362440656643086021394946395224737190702179860943702775392171762931767523846748184676694051325681271452635608277857713427577896091736371787214684409012249534301465495853710507922796892589235420199561121290219608640344181598136297747713099605187072113499999983729780499515973173281609631859502445945534690830264252230825334468503526193118817101000313783875288658753320838142061717766914730359825349042875546873115956286388235378759375195778185778053217122680661300192787661119590921642019893809525720106548586327886593615338182796823030195235301852968995773622599413891249721775283479131515574857242454150695950829533116861727855889075098381754637464939319255604009277167113900984882401285836160356370766010471018194295559619894676783744944825537977472684714047534646208046684259069491293313677028989152104752162056966024058038150193511253382430035587640247496473263914199272642699227967823547816360093417216412199245863150302861829745557067498385054945885869269956909272107975093029553211653449872027559623648066549911988183479775356636980742654252786255181841757467289097777279380008164706001614524919217321721477235014144197356854816136115735255213347574184946843852332397394143334547762416862518983569485562099219222184272550254256887671794946016534668049886272327917860857843838279679766814541009538837863609506800642251252051173929848968412848862694560424196528502221066118636744278622039194945471237137869609563643719172874677646575739624138986583264599581339047802759009 -- cgit