Skip to content

Commit dd9b728

Browse files
author
Julian
authored
Merge branch 'master' into master
2 parents 0c14af1 + b5c438b commit dd9b728

File tree

143 files changed

+5999
-575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+5999
-575
lines changed

‎.editorconfig

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ trim_trailing_whitespace = true
66
insert_final_newline = true
77
end_of_line = lf
88

9+
# Bash
10+
[*.bash]
11+
indent_style = space
12+
indent_size = 4
13+
914
# C
1015
[*.c]
1116
indent_style = space
@@ -41,6 +46,16 @@ indent_size = 4
4146
indent_style = space
4247
indent_size = 2
4348

49+
# Emojicode
50+
[*.emojic]
51+
indent_style = space
52+
indent_size = 2
53+
54+
# Factor
55+
[*.factor]
56+
indent_style = space
57+
indent_size = 2
58+
4459
# Go
4560
[*.go]
4661
indent_style = tab
@@ -80,6 +95,16 @@ indent_size = 2
8095
indent_style = space
8196
indent_size = 2
8297

98+
# LOLCODE
99+
[*.lol]
100+
indent_style = space
101+
indent_size = 4
102+
103+
# Lua
104+
[*.lua]
105+
indent_style = space
106+
indent_size = 2
107+
83108
# Matlab
84109
[*.m]
85110
indent_style = space
@@ -95,6 +120,11 @@ indent_size = 2
95120
indent_style = space
96121
indent_size = 2
97122

123+
# PHP
124+
[*.php]
125+
indent_style = space
126+
indent_size = 4
127+
98128
# Python
99129
[*.py]
100130
indent_style = space
@@ -109,3 +139,11 @@ indent_size = 2
109139
[*.rs]
110140
indent_style = space
111141
indent_size = 4
142+
143+
# Whitespace
144+
[*.ws]
145+
indent_style = space
146+
indent_size = 0
147+
trim_trailing_whitespace = false
148+
insert_final_newline = false
149+
end_of_line = lf

‎.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,3 +498,11 @@ __pycache__/
498498

499499
-# Other
500500
-*.xcf
501+
502+
# Cache files for sublime text
503+
*.sublime-workspace
504+
*.sublime-project
505+
506+
# Settings directory for visual studio code
507+
vscode/
508+

‎.travis.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
dist: trusty
2+
sudo: false
3+
4+
language: node_js
5+
node_js:
6+
- "4"
7+
8+
install:
9+
- npm install gitbook-cli -g
10+
- gitbook install
11+
12+
before_script:
13+
- mkdir -p "${TRAVIS_BUILD_DIR}"/build
14+
15+
script:
16+
- env | sort
17+
- gitbook build . "${TRAVIS_BUILD_DIR}"/build
18+
19+
after_success:
20+
- |
21+
if [[ "${TRAVIS_BRANCH}" == master && "${TRAVIS_PULL_REQUEST}" == false ]]; then
22+
# Commits to master that are not pull requests, that is, only
23+
# actual addition of code to master, should deploy the book to
24+
# the site.
25+
bash "${TRAVIS_BUILD_DIR}"/tools/deploy/update_site_travis.bash
26+
fi

‎CONTRIBUTING.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# Contributing
22

3-
A contribution guide on how to contribute to the Arcane Algorithm Archive (AAA) can be found on this Wiki page:
4-
https://github.com/algorithm-archivists/algorithm-archive/wiki/How-to-Contribute
3+
A contribution guide on how to contribute to the Arcane Algorithm Archive (AAA) can be found on this Wiki page: https://github.com/algorithm-archivists/algorithm-archive/wiki/How-to-Contribute
54

6-
The community member Buttercak3 also created a video series, explaining the contribution process of the AAA.
7-
You can find a playlist with all videos here:
8-
https://www.youtube.com/playlist?list=PL5NSPcN6fRq2vwgdb9noJacF945CeBk8x
5+
The community member Buttercak3 also created a video series, explaining the contribution process of the AAA. You can find a playlist with all videos here: https://www.youtube.com/playlist?list=PL5NSPcN6fRq2vwgdb9noJacF945CeBk8x

‎CONTRIBUTORS.md

Lines changed: 37 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,40 @@ This file lists everyone, who contributed to this repo and wanted to show up her
22

33
# Contributors
44

5-
James Schloss
6-
<br>
7-
Nicole Mazzuca
8-
<br>
9-
Marius Becker
10-
<br>
11-
Gathros
12-
<br>
13-
Jeremie Gillet (- Jie -)
14-
<br>
15-
Salim Khatib
16-
<br>
17-
Hitesh C
18-
<br>
19-
Shaurya
20-
<br>
21-
Maxime Dherbécourt
22-
<br>
23-
Jess 3Jane
24-
<br>
25-
Pen Pal
26-
<br>
27-
Chinmaya Mahesh
28-
<br>
29-
Unlambder
30-
<br>
31-
Kjetil Johannessen
32-
<br>
33-
CDsigma
34-
<br>
35-
Gammison
36-
<br>
37-
hsjoihs
38-
<br>
39-
DominikRafacz
40-
<br>
41-
lulucca12
42-
<br>
43-
GuyPozner
44-
<br>
45-
William Boyles
46-
<br>
47-
Max Weinstein
48-
<br>
49-
Gibus Wearing Brony
50-
<br>
51-
Gorzoid
52-
<br>
53-
Arun Sahadeo
54-
<br>
55-
NIFR91
56-
<br>
57-
Michal Hanajik
58-
<br>
59-
Bendik Samseth
60-
<br>
61-
Trashtalk
62-
<br>
63-
Cyrus Burt
64-
<br>
65-
Christopher Milan
5+
- James Schloss
6+
- Nicole Mazzuca
7+
- Marius Becker
8+
- Gathros
9+
- Jeremie Gillet (- Jie -)
10+
- Salim Khatib
11+
- Hitesh C
12+
- Shaurya
13+
- Maxime Dherbécourt
14+
- Jess 3Jane
15+
- Pen Pal
16+
- Chinmaya Mahesh
17+
- Unlambder
18+
- Kjetil Johannessen
19+
- CDsigma
20+
- Gammison
21+
- hsjoihs
22+
- DominikRafacz
23+
- lulucca12
24+
- GuyPozner
25+
- William Boyles
26+
- Max Weinstein
27+
- Gibus Wearing Brony
28+
- Gorzoid
29+
- Arun Sahadeo
30+
- NIFR91
31+
- Michal Hanajik
32+
- Bendik Samseth
33+
- mukundan314
34+
- Trashtalk
35+
- Cyrus Burt
36+
- Patrik Tesarik
37+
- Ken Power
38+
- PaddyKe
39+
- nic-hartley
40+
- crafter312
41+
- Christopher Milan

‎LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2017 James Schloss et. al
1+
Copyright 2018 James Schloss et. al
22

33
Permission is hereby granted, free of charge, to any person
44
obtaining a copy of this software and associated documentation

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ and live coded on Twitch: https://www.twitch.tv/simuleios.
1515
If you would like to communicate more directly, please feel free to go to our discord: https://discord.gg/Pr2E9S6.
1616

1717

18-
Note that the this project is essentially a book about algorithms collaboratively written by an online community.
18+
Note that this project is essentially a book about algorithms collaboratively written by an online community.
1919
Fortunately, there are a lot of algorithms out there, which means that there is a lot of content material available.
2020
Unfortunately, this means that we will probably never cover every algorithm ever created and instead need to focus on what the community sees as useful and necessary.
2121
That said, we'll still cover a few algorithms for fun that have very little, if any practical purpose.

‎book.json

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"maxIndexSize": 1000000000
1616
},
1717
"pluginsConfig": {
18-
"mathjax":{
18+
"mathjax": {
1919
"version": "2.6.1"
2020
},
2121
"include-codeblock": {
@@ -36,6 +36,10 @@
3636
"name": "Julia",
3737
"default": true
3838
},
39+
{
40+
"lang": "bash",
41+
"name": "Bash"
42+
},
3943
{
4044
"lang": "cs",
4145
"name": "C#"
@@ -135,6 +139,34 @@
135139
{
136140
"lang": "nim",
137141
"name": "Nim"
142+
},
143+
{
144+
"lang": "asm-x64",
145+
"name": "X86-64 Assembly"
146+
},
147+
{
148+
"lang": "f90",
149+
"name": "Fortran90"
150+
},
151+
{
152+
"lang": "factor",
153+
"name": "Factor"
154+
},
155+
{
156+
"lang": "ws",
157+
"name": "Whitespace"
158+
},
159+
{
160+
"lang": "scala",
161+
"name": "Scala"
162+
},
163+
{
164+
"lang": "emojic",
165+
"name": "Emojicode"
166+
},
167+
{
168+
"lang": "lolcode",
169+
"name": "LOLCODE"
138170
}
139171
]
140172
}

‎contents/bitlogic/res/not.jpg

-5.02 KB
Loading

‎contents/bogo_sort/bogo_sort.md

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ In code, it looks something like this:
1414

1515
{% method %}
1616
{% sample lang="jl" %}
17-
[import:10-14, lang:"julia"](code/julia/bogo.jl)
17+
[import:12-16, lang:"julia"](code/julia/bogo.jl)
1818
{% sample lang="cs" %}
1919
[import:9-15, lang:"csharp"](code/csharp/BogoSort.cs)
2020
{% sample lang="clj" %}
@@ -31,18 +31,34 @@ In code, it looks something like this:
3131
[import:17-20, lang:"haskell"](code/haskell/bogoSort.hs)
3232
{% sample lang="m" %}
3333
[import:21-28, lang:"matlab"](code/matlab/bogosort.m)
34+
{% sample lang="lua" %}
35+
[import:1-22, lang="lua"](code/lua/bogosort.lua)
3436
{% sample lang="cpp" %}
3537
[import:33-38, lang:"c_cpp"](code/c++/bogosort.cpp)
3638
{% sample lang="rs" %}
3739
[import:16-20, lang:"rust"](code/rust/bogosort.rs)
3840
{% sample lang="swift" %}
39-
[import:25-31, lang:"swift"](code/swift/bogosort.swift)
41+
[import:13-19, lang:"swift"](code/swift/bogosort.swift)
4042
{% sample lang="php" %}
4143
[import:11-16, lang:"php"](code/php/bogo_sort.php)
4244
{% sample lang="nim" %}
4345
[import:16-18, lang:"nim"](code/nim/bogo_sort.nim)
4446
{% sample lang="ruby" %}
4547
[import:12-16, lang:"ruby"](code/ruby/bogo.rb)
48+
{% sample lang="emojic" %}
49+
[import:2-6, lang:"emojicode"](code/emojicode/bogo_sort.emojic)
50+
{% sample lang="factor" %}
51+
[import:10-12, lang:"factor"](code/factor/bogo_sort.factor)
52+
{% sample lang="f90" %}
53+
[import:24-32, lang:"fortran"](code/fortran/bogo.f90)
54+
{% sample lang="racket" %}
55+
[import:3-8, lang:"lisp"](code/racket/bogo_sort.rkt)
56+
{% sample lang="st" %}
57+
[import:2-6, lang:"st"](code/smalltalk/bogosort.st)
58+
{% sample lang="asm-x64" %}
59+
[import:93-113, lang:"asm-x64"](code/asm-x64/bogosort.s)
60+
{% sample lang="lisp" %}
61+
[import:20-24, lang:"lisp"](code/lisp/bogo-sort.lisp)
4662
{% endmethod %}
4763

4864
That's it.
@@ -73,6 +89,8 @@ We are done here!
7389
[import, lang:"haskell"](code/haskell/bogoSort.hs)
7490
{% sample lang="m" %}
7591
[import, lang:"matlab"](code/matlab/bogosort.m)
92+
{% sample lang="lua" %}
93+
[import, lang="lua"](code/lua/bogosort.lua)
7694
{% sample lang="cpp" %}
7795
[import, lang:"c_cpp"](code/c++/bogosort.cpp)
7896
{% sample lang="rs" %}
@@ -85,6 +103,20 @@ We are done here!
85103
[import, lang:"nim"](code/nim/bogo_sort.nim)
86104
{% sample lang="ruby" %}
87105
[import, lang:"ruby"](code/ruby/bogo.rb)
106+
{% sample lang="emojic" %}
107+
[import, lang:"emojicode"](code/emojicode/bogo_sort.emojic)
108+
{% sample lang="factor" %}
109+
[import, lang:"factor"](code/factor/bogo_sort.factor)
110+
{% sample lang="f90" %}
111+
[import, lang:"fortran"](code/fortran/bogo.f90)
112+
{% sample lang="racket" %}
113+
[import, lang:"lisp"](code/racket/bogo_sort.rkt)
114+
{% sample lang="st" %}
115+
[import, lang:"st"](code/smalltalk/bogosort.st)
116+
{% sample lang="asm-x64" %}
117+
[import, lang:"asm-x64"](code/asm-x64/bogosort.s)
118+
{% sample lang="lisp" %}
119+
[import, lang:"lisp"](code/lisp/bogo-sort.lisp)
88120
{% endmethod %}
89121

90122

0 commit comments

Comments
 (0)