From d3cd6faf8ce944f38cfd56987f3b0ba17cef4dc1 Mon Sep 17 00:00:00 2001 From: newt Date: Wed, 9 Oct 2024 18:02:32 +0100 Subject: [PATCH] Refactor the honk (again) --- ahk/gif keyboard.ahk | 26 ------------------ python/calculators/binomial distribution.py | 3 +- .../calculators/{Square Root.py => sqrt.py} | 0 .../{Standard Deviation.py => stdev.py} | 0 .../{fbPercentActive_res.csv => facebook.csv} | 0 .../{fbPercentActive.py => facebook.py} | 2 +- .../{fakejobs_res.csv => fakejobs.csv} | 0 python/data science/fakejobs.py | 2 +- .../{ => ngrams}/poop, klutzy.csv | 0 .../{ => ngrams}/poop, klutzy.png | Bin .../word popularity.py} | 0 python/gd/{2stars_res.csv => 2stars.csv} | 0 python/gd/2stars.py | 2 +- python/osu/{ppFromID.py => pp.py} | 0 python/{pygame pong => pong}/Ball.py | 0 python/{pygame pong => pong}/Paddle.py | 0 python/{pygame pong => pong}/Pong.py | 0 .../__pycache__/Ball.cpython-38.pyc | Bin 1147 -> 0 bytes .../__pycache__/Paddle.cpython-38.pyc | Bin 901 -> 0 bytes readme.md | 26 ++++++++---------- 20 files changed, 15 insertions(+), 46 deletions(-) delete mode 100644 ahk/gif keyboard.ahk rename python/calculators/{Square Root.py => sqrt.py} (100%) rename python/calculators/{Standard Deviation.py => stdev.py} (100%) rename python/data science/{fbPercentActive_res.csv => facebook.csv} (100%) rename python/data science/{fbPercentActive.py => facebook.py} (92%) rename python/data science/{fakejobs_res.csv => fakejobs.csv} (100%) rename python/data science/{ => ngrams}/poop, klutzy.csv (100%) rename python/data science/{ => ngrams}/poop, klutzy.png (100%) rename python/data science/{wordPopularity.py => ngrams/word popularity.py} (100%) rename python/gd/{2stars_res.csv => 2stars.csv} (100%) rename python/osu/{ppFromID.py => pp.py} (100%) rename python/{pygame pong => pong}/Ball.py (100%) rename python/{pygame pong => pong}/Paddle.py (100%) rename python/{pygame pong => pong}/Pong.py (100%) delete mode 100644 python/pygame pong/__pycache__/Ball.cpython-38.pyc delete mode 100644 python/pygame pong/__pycache__/Paddle.cpython-38.pyc diff --git a/ahk/gif keyboard.ahk b/ahk/gif keyboard.ahk deleted file mode 100644 index fe1dd33..0000000 --- a/ahk/gif keyboard.ahk +++ /dev/null @@ -1,26 +0,0 @@ -:*:a::https://tenor.com/view/a-dancing-dancing-a-pesing-gif-18704788 -:*:b::https://tenor.com/view/letter-b-dancing-gif-9063746 -:*:c::https://tenor.com/view/letter-c-dancing-gif-9063747 -:*:d::https://tenor.com/view/letter-d-dancing-gif-9063748 -:*:e::https://tenor.com/view/letter-e-gif-9063749 -:*:f::https://tenor.com/view/letter-f-gif-9063750 -:*:g::https://tenor.com/view/g-letter-dance-cartoon-gif-13894794 -:*:h::https://tenor.com/view/letter-h-gif-9063752 -:*:i::https://tenor.com/view/letter-i-gif-9063753 -:*:j::https://tenor.com/view/letter-j-dance-gif-9063754 -:*:k::https://tenor.com/view/letter-k-gif-9063755 -:*:l::https://tenor.com/view/red-alphabet-letter-dancing-letter-l-cartoons-gif-12084376 -:*:m::https://tenor.com/view/letter-m-dance-happy-gif-9063757 -:*:n::https://tenor.com/view/letter-n-gif-9063758 -:*:o::https://tenor.com/view/letter-o-gif-9063759 -:*:p::https://tenor.com/view/letter-p-gif-9063760 -:*:q::https://tenor.com/view/letter-q-gif-9063761 -:*:r::https://tenor.com/view/letter-r-gif-9063762 -:*:s::https://tenor.com/view/letter-s-gif-9063763 -:*:t::https://tenor.com/view/letter-t-gif-9063764 -:*:u::https://tenor.com/view/letter-u-gif-9063765 -:*:v::https://tenor.com/view/letter-v-gif-9063766 -:*:w::https://tenor.com/view/letter-w-gif-9063767 -:*:x::https://tenor.com/view/letter-x-gif-9063768 -:*:y::https://tenor.com/view/letter-y-gif-9063769 -:*:z::https://tenor.com/view/letter-z-gif-9063770 \ No newline at end of file diff --git a/python/calculators/binomial distribution.py b/python/calculators/binomial distribution.py index 19b91bf..89a1260 100644 --- a/python/calculators/binomial distribution.py +++ b/python/calculators/binomial distribution.py @@ -9,7 +9,6 @@ def nCr(n, r): def binomial(x, n, p): q = 1 - p - return nCr(n, x) * (p**x) * (q**(n-x)) -print(binomial(5, 100, 0.1)) \ No newline at end of file +print(binomial(5, 100, 0.1)) diff --git a/python/calculators/Square Root.py b/python/calculators/sqrt.py similarity index 100% rename from python/calculators/Square Root.py rename to python/calculators/sqrt.py diff --git a/python/calculators/Standard Deviation.py b/python/calculators/stdev.py similarity index 100% rename from python/calculators/Standard Deviation.py rename to python/calculators/stdev.py diff --git a/python/data science/fbPercentActive_res.csv b/python/data science/facebook.csv similarity index 100% rename from python/data science/fbPercentActive_res.csv rename to python/data science/facebook.csv diff --git a/python/data science/fbPercentActive.py b/python/data science/facebook.py similarity index 92% rename from python/data science/fbPercentActive.py rename to python/data science/facebook.py index 3b7ca94..520adff 100644 --- a/python/data science/fbPercentActive.py +++ b/python/data science/facebook.py @@ -31,4 +31,4 @@ for td1, td2 in zip(tds[::2], tds[1::2]): # Save the data df = pd.DataFrame(data) -df.to_csv(os.path.dirname(os.path.realpath(__file__)) + '/fbPercentActive_res.csv') +df.to_csv(os.path.dirname(os.path.realpath(__file__)) + '/facebook.csv') diff --git a/python/data science/fakejobs_res.csv b/python/data science/fakejobs.csv similarity index 100% rename from python/data science/fakejobs_res.csv rename to python/data science/fakejobs.csv diff --git a/python/data science/fakejobs.py b/python/data science/fakejobs.py index d492c3a..413c6b5 100644 --- a/python/data science/fakejobs.py +++ b/python/data science/fakejobs.py @@ -27,4 +27,4 @@ for job in jobs: # Save the data df = pandas.DataFrame(data) -df.to_csv(os.path.dirname(os.path.realpath(__file__)) + '/fakejobs_res.csv') +df.to_csv(os.path.dirname(os.path.realpath(__file__)) + '/fakejobs.csv') diff --git a/python/data science/poop, klutzy.csv b/python/data science/ngrams/poop, klutzy.csv similarity index 100% rename from python/data science/poop, klutzy.csv rename to python/data science/ngrams/poop, klutzy.csv diff --git a/python/data science/poop, klutzy.png b/python/data science/ngrams/poop, klutzy.png similarity index 100% rename from python/data science/poop, klutzy.png rename to python/data science/ngrams/poop, klutzy.png diff --git a/python/data science/wordPopularity.py b/python/data science/ngrams/word popularity.py similarity index 100% rename from python/data science/wordPopularity.py rename to python/data science/ngrams/word popularity.py diff --git a/python/gd/2stars_res.csv b/python/gd/2stars.csv similarity index 100% rename from python/gd/2stars_res.csv rename to python/gd/2stars.csv diff --git a/python/gd/2stars.py b/python/gd/2stars.py index 2ea8348..12679de 100644 --- a/python/gd/2stars.py +++ b/python/gd/2stars.py @@ -19,7 +19,7 @@ number = 0 page = getPage(number) lines = [] -file = open(os.path.dirname(os.path.realpath(__file__)) + '/2stars_res.csv', 'r+') +file = open(os.path.dirname(os.path.realpath(__file__)) + '/2stars.csv', 'r+') file.truncate(0) while page != -1: diff --git a/python/osu/ppFromID.py b/python/osu/pp.py similarity index 100% rename from python/osu/ppFromID.py rename to python/osu/pp.py diff --git a/python/pygame pong/Ball.py b/python/pong/Ball.py similarity index 100% rename from python/pygame pong/Ball.py rename to python/pong/Ball.py diff --git a/python/pygame pong/Paddle.py b/python/pong/Paddle.py similarity index 100% rename from python/pygame pong/Paddle.py rename to python/pong/Paddle.py diff --git a/python/pygame pong/Pong.py b/python/pong/Pong.py similarity index 100% rename from python/pygame pong/Pong.py rename to python/pong/Pong.py diff --git a/python/pygame pong/__pycache__/Ball.cpython-38.pyc b/python/pygame pong/__pycache__/Ball.cpython-38.pyc deleted file mode 100644 index 61661152eb9c4c48a593f9b8b6c42357a723a266..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1147 zcmZWo!EO^V5FLBHn@yTP0SVM1K~G340pf;)Dny$D2T(5+msKURtes@TCL6pPN>FZ% z)Za*smG~lGIpq%!monodGy<&+}$Kv|0_oaa7Dc{@?&VX|X*7F5ciQU!YK+ zSPn61p0fduIRoXz-dj*Y`7=L3rSKb9j zEl77c=Gk#)n+wb#>k1H;f8w6IBrHn;v;1{^eI2!|UyeuG*ig!Bm{n5RU^M9_18r-k zW7A1eZT)PJbhQ$}9N&to`b&T_9QAv#O^Ldd2Yb z*=SOsMn&)rMg_*G)Xzr~Lk|jYmbXv~9!vx~~IZ|08ElPhNKp=I{|ihT+M`# zeH-o4^$Ee;aWGer|3FgbIFL`!AUFhWXKfuqgyt3+_`f9;TXbufg5jfLled#j#n2$N@G>L&`y+#yQzdDZh-9d=+t&n8$R%0Sen% zvzzKXmvZaU2egICV(5{Cvn0eJYt}>Id{NER(Gv&s`xb*0^cH$-P>xJiX&an6?RIaa Tb}w@k4-Z!;UlUK8{7mpamCp8H diff --git a/python/pygame pong/__pycache__/Paddle.cpython-38.pyc b/python/pygame pong/__pycache__/Paddle.cpython-38.pyc deleted file mode 100644 index 6619517beb8a12cb0f7c381bbcb148c4bacaa77c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 901 zcmYjQ&2G~`5T0GHT_;VTLLekgJ@n!WTq{%|AO{Yh3aLUuR>Wd?H;EG`cGnIim2ZvI zE02&I`$~J|#4B)OW}TKyw6ovNOy=j?^_PCX3n*Xb>+jzb_bVQL(CM!{1!$`F~!$m z?6n1AaSH-spHkc4bD~tPQ)=s82#2^RUo}Kk!wqcM78ulg<2AhT#(c{fkfMR9*!Xp@ zWeglXXmQP_;if~DhN?67AF=gzQQa*@%Z>u6I1ABv)1#oz^xSqlZu=tf+K8 zvc8M6{#B;xi47(?8&B#xW;;@*c~VtU-of8jgV)1Bp|ZtzSWoovq*%;`<*LRVH|poO zEYQ~y_p)3W;>#zldZ>VP*%9mE?*+SlybHRYD8(1?AcTqH0j}x{71D(lGi41s1r8Dk zp5jTd8JH8K5Kj*_J`?6t@z&;O^jaFTU-(EOZm1Q@R)`)Uih23dJVnr|XXF&~;)m`d zs@#KRN4&>EZ2S6f*EIQ~fUaYKL*sRHrJNUPnG^0wdAUsT*5ep3&natv$7HJWT*|$g zPpCQ-HZ(U;R=Ib^dZDvKz99}x2bB$~(qy%^!G+shz+Nsli5nt3Ydd;FpT;hs;Qs(* C#mEi- diff --git a/readme.md b/readme.md index cda93cf..35e698b 100644 --- a/readme.md +++ b/readme.md @@ -11,20 +11,20 @@ - [Data Science](python/data%20science) - [Fake Jobs Scraper](python/data%20science/fakejobs.py) - - [Country Population vs Active Facebook Users in the Country](python/data%20science/fbPercentActive.py) - - [ngrams Word Popularity](python/data%20science/wordPopularity.py) + - [Country Population vs Active Facebook Users in the Country](python/data%20science/facebook.py) + - [ngrams Word Popularity](python/data%20science/ngrams/word%20popularity.py) - [Calculators](python/calculators) - - [Binomial Distribution](python/calculators/Binomial%20Distribution.py) - - [Pearson's Product-Moment Correlation Coefficient](python/calculators/PMCC.py) - - [Quadratic nth Term](python/calculators/Quadratic%20nth%20Term.py) - - [Square Root](python/calculators/Square%20Root.py) - - [Spearman's Rank Correlation Coefficient](python/calculators/SRCC.py) - - [Standard Deviation](python/calculators/Standard%20Deviation.py) + - [Binomial Distribution](python/calculators/binomial%20distribution.py) + - [Pearson's Product-Moment Correlation Coefficient](python/calculators/pmcc.py) + - [Quadratic nth Term](python/calculators/quadratic%20nth%20term.py) + - [Square Root](python/calculators/sqrt.py) + - [Spearman's Rank Correlation Coefficient](python/calculators/srcc.py) + - [Standard Deviation](python/calculators/stdev.py) - [osu!](python/osu!) - - [PP from Beatmap ID](python/osu!/ppFromID.py) + - [PP from Beatmap ID](python/osu!/pp.py) - [Geometry Dash](python/gd) - [2 Stars List](python/gd/2stars.py) -- [Pygame Pong](python/pygame%20pong) +- [Pong (made with Pygame)](python/pong) - [pythonchallenge.com](python/pythonchallenge.com) - [r/dailyprogrammer](python/dailyprogrammmer) @@ -49,7 +49,7 @@ - [Eco Fest](coursework/gcse%20computer%20science/year%209/web/eco%20fest) - [Pet Planet](coursework/gcse%20computer%20science/year%209/python/web/pet%20planet) -- [Year 10 (All Python)](coursework/gcse%20computer%20science/year%2010) +- [Year 10](coursework/gcse%20computer%20science/year%2010) - [Calculator](coursework/gcse%20computer%20science/year%2010/calculator) - [Cat or Dog](coursework/gcse%20computer%20science/year%2010/cat%20or%20dog) - [Mark Analyser](coursework/gcse%20computer%20science/year%2010/mark%20analyser) @@ -59,7 +59,3 @@ - [Raspberry Pie Game](coursework/gcse%20computer%20science/year%2010/raspberry%20pie%20game) - [API Hangman](coursework/gcse%20computer%20science/year%2010/API%20Hangman.py) - [Temperature Bar Chart](coursework/gcse%20computer%20science/year%2010/Temperature%20Bar%20Chart.py) - -### AHK (Auto Hot Key) - -- [GIF Keyboard](ahk/gif%20keyboard.ahk)