xevion/exercism
1
0
Fork 0
mirror of https://github.com/Xevion/exercism.git synced 2025-12-05 23:14:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge fixes

Browse Source
This commit is contained in:
Xevion
2019-07-23 23:09:05 -05:00
parent dd2174c65a
commit d75b7d8faf
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
python/COMMENTS.md
View File

@@ -2,11 +2,7 @@
This page represents all my comments from my solutions currently hosted on [Exercism.io](https://exercism.io/). You can view my profile [here](https://exercism.io/profiles/Xevion).
The reason for this is simply to have a place where I can collect my comments, as well as just have some fun with Python and webscraping. Exercise file and exercise submission links will be provided for each and every exercise.
<<<<<<< HEAD
This file is for the **Python** track, contains **48** submissions, **18** of which have comments. This file was built on **24-07-2019** at **04:03:49 UTC**.
=======
This file is for the **Python** track, contains **47** submissions, **17** of which have comments. This file was built on **23-07-2019** at **23:47:58 UTC**.
>>>>>>> refs/remotes/origin/master
This file is for the **Python** track, contains **48** submissions, **18** of which have comments. This file was built on **24-07-2019** at **04:10:14 UTC**.
## Word Count
@@ -237,15 +233,12 @@ I forgot that a couple things could be omitted, and decided to trim the nouns so
<<<<<<< HEAD
## Grep
[Link to File](./grep/grep.py) | [Link to Submission](https://exercism.io/tracks/python/exercises/grep/solutions/c5d464b7392248d6adaab310e49803f5)
I liked this exercise honestly. I learned about some new modules and methods, for example, while trying to create the invert flag, I was looking into how to negate the matching function, and the `functools` module allows one to create a wrapper that can negate any function you pass through it.
=======
>>>>>>> refs/remotes/origin/master
## Tournament
[Link to File](./tournament/tournament.py) | [Link to Submission](https://exercism.io/tracks/python/exercises/tournament/solutions/6617ee41fac443be992d3090e650a16e)

1
python/grep/grep.py
View File

@@ -1,4 +1,3 @@
<<<<<<< HEAD
from functools import partial
all_flags = ['n', 'l', 'i', 'v', 'x', 'm'] # m for multiple files

5
track_comments.py
View File

@@ -82,11 +82,6 @@ for track in tracks.keys():
file.write(markdown)
print('Wrote {} KiB file for {} track'.format(round(os.path.getsize(path) / 1024, 2), track))
t2 = time.time()
<<<<<<< HEAD
# Sorry for this ridiculously long line. ;-;
print('Downloaded {} MiB in webpages.\nDownloaded & parsed in {} seconds with {}ms on average request time.'.format(round(sum([i[1] for i in request_timings]) / (1024 ** 2), 2), round(t2 - t1, 2), round((sum(i[0] for i in request_timings) / len(request_timings)) * 1000, 2)))
=======
# Sorry for this ridiculously long line. ;-;
print('Downloaded {} MiB in webpages.\nDownloaded & Parsed in {} seconds with {}ms on average request time.'.format(round(sum([i[1] for i in request_timings]) / (1024 ** 2), 2), round(t2 - t1, 2), round((sum(i[0] for i in request_timings) / len(request_timings)) * 1000, 2)))
>>>>>>> refs/remotes/origin/master