From 9f82b27f70e1f1f71db236bf44db44954d90c4a2 Mon Sep 17 00:00:00 2001 From: Marius Becker Date: Fri, 6 Jul 2018 14:03:45 +0200 Subject: [PATCH 1/5] Renamed code/js/ directories to code/javascript/ --- chapters/monte_carlo/code/{js => javascript}/monte_carlo.js | 0 chapters/monte_carlo/monte_carlo.md | 4 ++-- chapters/sorting_searching/bogo/bogo_sort.md | 2 +- .../sorting_searching/bogo/code/{js => javascript}/bogo.js | 0 chapters/sorting_searching/bubble/bubble_sort.md | 2 +- .../bubble/code/{js => javascript}/bubble.js | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename chapters/monte_carlo/code/{js => javascript}/monte_carlo.js (100%) rename chapters/sorting_searching/bogo/code/{js => javascript}/bogo.js (100%) rename chapters/sorting_searching/bubble/code/{js => javascript}/bubble.js (100%) diff --git a/chapters/monte_carlo/code/js/monte_carlo.js b/chapters/monte_carlo/code/javascript/monte_carlo.js similarity index 100% rename from chapters/monte_carlo/code/js/monte_carlo.js rename to chapters/monte_carlo/code/javascript/monte_carlo.js diff --git a/chapters/monte_carlo/monte_carlo.md b/chapters/monte_carlo/monte_carlo.md index fd30227c3..3e75dd410 100644 --- a/chapters/monte_carlo/monte_carlo.md +++ b/chapters/monte_carlo/monte_carlo.md @@ -44,7 +44,7 @@ each point is tested to see whether it's in the circle or not: {% sample lang="c" %} [import:7-9, lang:"c_cpp"](code/c/monte_carlo.c) {% sample lang="js" %} -[import:2-6, lang:"javascript"](code/js/monte_carlo.js) +[import:2-6, lang:"javascript"](code/javascript/monte_carlo.js) {% sample lang="hs" %} [import:7-7, lang:"haskell"](code/haskell/monteCarlo.hs) {% sample lang="rs" %} @@ -101,7 +101,7 @@ Feel free to submit your version via pull request, and thanks for reading! [import, lang:"c_cpp"](code/c/monte_carlo.c) {% sample lang="js" %} ### Javascript -[import, lang:"javascript"](code/js/monte_carlo.js) +[import, lang:"javascript"](code/javascript/monte_carlo.js) {% sample lang="hs" %} ### Haskell [import, lang:"haskell"](code/haskell/monteCarlo.hs) diff --git a/chapters/sorting_searching/bogo/bogo_sort.md b/chapters/sorting_searching/bogo/bogo_sort.md index e62089252..3cd9a7c2b 100644 --- a/chapters/sorting_searching/bogo/bogo_sort.md +++ b/chapters/sorting_searching/bogo/bogo_sort.md @@ -24,7 +24,7 @@ In code, it looks something like this: {% sample lang="java" %} [import:2-17, lang:"java"](code/java/bogo.java) {% sample lang="js" %} -[import:1-16, lang:"javascript"](code/js/bogo.js) +[import:1-16, lang:"javascript"](code/javascript/bogo.js) {% sample lang="py" %} [import:4-12, lang:"python"](code/python/bogo.py) {% sample lang="hs" %} diff --git a/chapters/sorting_searching/bogo/code/js/bogo.js b/chapters/sorting_searching/bogo/code/javascript/bogo.js similarity index 100% rename from chapters/sorting_searching/bogo/code/js/bogo.js rename to chapters/sorting_searching/bogo/code/javascript/bogo.js diff --git a/chapters/sorting_searching/bubble/bubble_sort.md b/chapters/sorting_searching/bubble/bubble_sort.md index 073037515..a1346ba85 100644 --- a/chapters/sorting_searching/bubble/bubble_sort.md +++ b/chapters/sorting_searching/bubble/bubble_sort.md @@ -17,7 +17,7 @@ This means that we need to go through the vector $$\mathcal{O}(n^2)$$ times with {% sample lang="java" %} [import:2-12, lang:"java"](code/java/bubble.java) {% sample lang="js" %} -[import:1-11, lang:"javascript"](code/js/bubble.js) +[import:1-11, lang:"javascript"](code/javascript/bubble.js) {% sample lang="py" %} [import:4-9, lang:"python"](code/python/bubblesort.py) {% sample lang="m" %} diff --git a/chapters/sorting_searching/bubble/code/js/bubble.js b/chapters/sorting_searching/bubble/code/javascript/bubble.js similarity index 100% rename from chapters/sorting_searching/bubble/code/js/bubble.js rename to chapters/sorting_searching/bubble/code/javascript/bubble.js From 0d459fa718dc92291bf7db5d111250e329b42752 Mon Sep 17 00:00:00 2001 From: Marius Becker Date: Fri, 6 Jul 2018 14:09:01 +0200 Subject: [PATCH 2/5] Renamed code/hs/ directories to code/haskell/ --- chapters/FFT/code/{hs => haskell}/fft.hs | 0 chapters/FFT/cooley_tukey.md | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename chapters/FFT/code/{hs => haskell}/fft.hs (100%) diff --git a/chapters/FFT/code/hs/fft.hs b/chapters/FFT/code/haskell/fft.hs similarity index 100% rename from chapters/FFT/code/hs/fft.hs rename to chapters/FFT/code/haskell/fft.hs diff --git a/chapters/FFT/cooley_tukey.md b/chapters/FFT/cooley_tukey.md index b01331516..ce5ad476c 100644 --- a/chapters/FFT/cooley_tukey.md +++ b/chapters/FFT/cooley_tukey.md @@ -121,7 +121,7 @@ In the end, the code looks like: {% sample lang="cpp" %} [import:27-57, lang:"c_cpp"](code/c++/fft.cpp) {% sample lang="hs" %} -[import:6-19, lang:"haskell"](code/hs/fft.hs) +[import:6-19, lang:"haskell"](code/haskell/fft.hs) {% sample lang="py" %} [import:5-16, lang:"python"](code/python/fft.py) {% sample lang="scratch" %} @@ -229,7 +229,7 @@ Note: I implemented this in Julia because the code seems more straightforward in [import, lang:"c_cpp"](code/c++/fft.cpp) {% sample lang="hs" %} ### Haskell -[import, lang:"haskell"](code/hs/fft.hs) +[import, lang:"haskell"](code/haskell/fft.hs) {% sample lang="py" %} ### Python [import, lang:"python"](code/python/fft.py) From 736d2f89773e335a544ac435e054ad9695a8075f Mon Sep 17 00:00:00 2001 From: Marius Becker Date: Fri, 6 Jul 2018 14:16:42 +0200 Subject: [PATCH 3/5] Renamed code/R/ directories to code/r/ --- chapters/monte_carlo/code/{R => r}/monte_carlo.R | 0 chapters/monte_carlo/monte_carlo.md | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename chapters/monte_carlo/code/{R => r}/monte_carlo.R (100%) diff --git a/chapters/monte_carlo/code/R/monte_carlo.R b/chapters/monte_carlo/code/r/monte_carlo.R similarity index 100% rename from chapters/monte_carlo/code/R/monte_carlo.R rename to chapters/monte_carlo/code/r/monte_carlo.R diff --git a/chapters/monte_carlo/monte_carlo.md b/chapters/monte_carlo/monte_carlo.md index 3e75dd410..e777bdaa4 100644 --- a/chapters/monte_carlo/monte_carlo.md +++ b/chapters/monte_carlo/monte_carlo.md @@ -54,7 +54,7 @@ each point is tested to see whether it's in the circle or not: {% sample lang="go" %} [import:12-14, lang:"golang"](code/go/monteCarlo.go) {% sample lang="r" %} -[import:2-6, lang:"r"](code/R/monte_carlo.R) +[import:2-6, lang:"r"](code/r/monte_carlo.R) {% sample lang="java" %} [import:13-15, lang:"java"](code/java/MonteCarlo.java) {% sample lang="swift" %} @@ -116,7 +116,7 @@ Feel free to submit your version via pull request, and thanks for reading! [import, lang:"golang"](code/go/monteCarlo.go) {%sample lang="r" %} ### R -[import, lang:"r"](code/R/monte_carlo.R) +[import, lang:"r"](code/r/monte_carlo.R) {% sample lang="java" %} ### Java [import, lang:"java"](code/java/MonteCarlo.java) From 27eebf27e07bcd19ab20db6ba1961c48751c702e Mon Sep 17 00:00:00 2001 From: Marius Becker Date: Fri, 6 Jul 2018 16:09:44 +0200 Subject: [PATCH 4/5] Updated a reference to a JS file in a code file --- chapters/sorting_searching/bogo/code/javascript/bogo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapters/sorting_searching/bogo/code/javascript/bogo.js b/chapters/sorting_searching/bogo/code/javascript/bogo.js index 5e6175509..b3c56b644 100644 --- a/chapters/sorting_searching/bogo/code/javascript/bogo.js +++ b/chapters/sorting_searching/bogo/code/javascript/bogo.js @@ -8,7 +8,7 @@ function isSorted(arr) { return true; } -// The shuffle() function can be found in code/js/bogo.js +// The shuffle() function can be found in code/javascript/bogo.js function bogoSort(arr) { while (!isSorted(arr)) { shuffle(arr); From 579092ab4ec49da1da79646788a4d90959618db6 Mon Sep 17 00:00:00 2001 From: Marius Becker Date: Fri, 6 Jul 2018 18:56:06 +0200 Subject: [PATCH 5/5] Renamed code/cs/ directories to code/csharp/ --- .../code/{cs => csharp}/JarvisMarch.cs | 0 .../jarvis_march/code/{cs => csharp}/Program.cs | 0 .../gift_wrapping/jarvis_march/jarvis_march.md | 4 ++-- .../huffman/code/{cs => csharp}/HuffmanCoding.cs | 0 .../huffman/code/{cs => csharp}/Program.cs | 0 chapters/data_compression/huffman/huffman.md | 4 ++-- .../code/{cs => csharp}/GaleShapleyAlgorithm.cs | 0 .../code/{cs => csharp}/ListExtensions.cs | 0 .../code/{cs => csharp}/Person.cs | 0 .../code/{cs => csharp}/Program.cs | 0 .../stable_marriage/stable_marriage.md | 8 ++++---- .../code/{cs => csharp}/EuclideanAlgorithm.cs | 0 .../code/{cs => csharp}/Program.cs | 0 chapters/euclidean_algorithm/euclidean.md | 8 ++++---- chapters/sorting_searching/bogo/bogo_sort.md | 2 +- .../bogo/code/{cs => csharp}/BogoSort.cs | 0 .../bogo/code/{cs => csharp}/Program.cs | 0 chapters/sorting_searching/bubble/bubble_sort.md | 2 +- .../bubble/code/{cs => csharp}/BubbleSort.cs | 0 .../bubble/code/{cs => csharp}/Program.cs | 0 .../code/{cs => csharp}/Program.cs | 0 .../tree_traversal/code/{cs => csharp}/Tree.cs | 0 chapters/tree_traversal/tree_traversal.md | 16 ++++++++-------- 23 files changed, 22 insertions(+), 22 deletions(-) rename chapters/computational_geometry/gift_wrapping/jarvis_march/code/{cs => csharp}/JarvisMarch.cs (100%) rename chapters/computational_geometry/gift_wrapping/jarvis_march/code/{cs => csharp}/Program.cs (100%) rename chapters/data_compression/huffman/code/{cs => csharp}/HuffmanCoding.cs (100%) rename chapters/data_compression/huffman/code/{cs => csharp}/Program.cs (100%) rename chapters/decision_problems/stable_marriage/code/{cs => csharp}/GaleShapleyAlgorithm.cs (100%) rename chapters/decision_problems/stable_marriage/code/{cs => csharp}/ListExtensions.cs (100%) rename chapters/decision_problems/stable_marriage/code/{cs => csharp}/Person.cs (100%) rename chapters/decision_problems/stable_marriage/code/{cs => csharp}/Program.cs (100%) rename chapters/euclidean_algorithm/code/{cs => csharp}/EuclideanAlgorithm.cs (100%) rename chapters/euclidean_algorithm/code/{cs => csharp}/Program.cs (100%) rename chapters/sorting_searching/bogo/code/{cs => csharp}/BogoSort.cs (100%) rename chapters/sorting_searching/bogo/code/{cs => csharp}/Program.cs (100%) rename chapters/sorting_searching/bubble/code/{cs => csharp}/BubbleSort.cs (100%) rename chapters/sorting_searching/bubble/code/{cs => csharp}/Program.cs (100%) rename chapters/tree_traversal/code/{cs => csharp}/Program.cs (100%) rename chapters/tree_traversal/code/{cs => csharp}/Tree.cs (100%) diff --git a/chapters/computational_geometry/gift_wrapping/jarvis_march/code/cs/JarvisMarch.cs b/chapters/computational_geometry/gift_wrapping/jarvis_march/code/csharp/JarvisMarch.cs similarity index 100% rename from chapters/computational_geometry/gift_wrapping/jarvis_march/code/cs/JarvisMarch.cs rename to chapters/computational_geometry/gift_wrapping/jarvis_march/code/csharp/JarvisMarch.cs diff --git a/chapters/computational_geometry/gift_wrapping/jarvis_march/code/cs/Program.cs b/chapters/computational_geometry/gift_wrapping/jarvis_march/code/csharp/Program.cs similarity index 100% rename from chapters/computational_geometry/gift_wrapping/jarvis_march/code/cs/Program.cs rename to chapters/computational_geometry/gift_wrapping/jarvis_march/code/csharp/Program.cs diff --git a/chapters/computational_geometry/gift_wrapping/jarvis_march/jarvis_march.md b/chapters/computational_geometry/gift_wrapping/jarvis_march/jarvis_march.md index 53ee94794..dae06205c 100644 --- a/chapters/computational_geometry/gift_wrapping/jarvis_march/jarvis_march.md +++ b/chapters/computational_geometry/gift_wrapping/jarvis_march/jarvis_march.md @@ -26,9 +26,9 @@ Since this algorithm, there have been many other algorithms that have advanced t {% sample lang="cs" %} ### C# # JarvisMarch.cs -[import, lang="csharp"](code/cs/JarvisMarch.cs) +[import, lang="csharp"](code/csharp/JarvisMarch.cs) Program.cs -[import, lang="csharp"](code/cs/Program.cs) +[import, lang="csharp"](code/csharp/Program.cs) {% sample lang="jl" %} ### Julia [import, lang:"julia"](code/julia/jarvis.jl) diff --git a/chapters/data_compression/huffman/code/cs/HuffmanCoding.cs b/chapters/data_compression/huffman/code/csharp/HuffmanCoding.cs similarity index 100% rename from chapters/data_compression/huffman/code/cs/HuffmanCoding.cs rename to chapters/data_compression/huffman/code/csharp/HuffmanCoding.cs diff --git a/chapters/data_compression/huffman/code/cs/Program.cs b/chapters/data_compression/huffman/code/csharp/Program.cs similarity index 100% rename from chapters/data_compression/huffman/code/cs/Program.cs rename to chapters/data_compression/huffman/code/csharp/Program.cs diff --git a/chapters/data_compression/huffman/huffman.md b/chapters/data_compression/huffman/huffman.md index f0409f5be..77a4953bf 100644 --- a/chapters/data_compression/huffman/huffman.md +++ b/chapters/data_compression/huffman/huffman.md @@ -69,9 +69,9 @@ Whether you use a stack or straight-up recursion also depends on the language, b {% sample lang="cs" %} ### C# # HuffmanCoding.cs -[import, lang:"csharp"](code/cs/HuffmanCoding.cs) +[import, lang:"csharp"](code/csharp/HuffmanCoding.cs) Program.cs -[import, lang:"csharp"](code/cs/Program.cs) +[import, lang:"csharp"](code/csharp/Program.cs) {% sample lang="cpp" %} ### C++ [import, lang:"c_cpp"](code/c++/huffman.cpp) diff --git a/chapters/decision_problems/stable_marriage/code/cs/GaleShapleyAlgorithm.cs b/chapters/decision_problems/stable_marriage/code/csharp/GaleShapleyAlgorithm.cs similarity index 100% rename from chapters/decision_problems/stable_marriage/code/cs/GaleShapleyAlgorithm.cs rename to chapters/decision_problems/stable_marriage/code/csharp/GaleShapleyAlgorithm.cs diff --git a/chapters/decision_problems/stable_marriage/code/cs/ListExtensions.cs b/chapters/decision_problems/stable_marriage/code/csharp/ListExtensions.cs similarity index 100% rename from chapters/decision_problems/stable_marriage/code/cs/ListExtensions.cs rename to chapters/decision_problems/stable_marriage/code/csharp/ListExtensions.cs diff --git a/chapters/decision_problems/stable_marriage/code/cs/Person.cs b/chapters/decision_problems/stable_marriage/code/csharp/Person.cs similarity index 100% rename from chapters/decision_problems/stable_marriage/code/cs/Person.cs rename to chapters/decision_problems/stable_marriage/code/csharp/Person.cs diff --git a/chapters/decision_problems/stable_marriage/code/cs/Program.cs b/chapters/decision_problems/stable_marriage/code/csharp/Program.cs similarity index 100% rename from chapters/decision_problems/stable_marriage/code/cs/Program.cs rename to chapters/decision_problems/stable_marriage/code/csharp/Program.cs diff --git a/chapters/decision_problems/stable_marriage/stable_marriage.md b/chapters/decision_problems/stable_marriage/stable_marriage.md index 3243c1426..79f842898 100644 --- a/chapters/decision_problems/stable_marriage/stable_marriage.md +++ b/chapters/decision_problems/stable_marriage/stable_marriage.md @@ -40,13 +40,13 @@ I am incredibly interested to see what you guys do and how you implement the alg {% sample lang="cs" %} ### C# # GaleShapleyAlgorithm.cs -[import, lang:"csharp"](code/cs/GaleShapleyAlgorithm.cs) +[import, lang:"csharp"](code/csharp/GaleShapleyAlgorithm.cs) Person.cs -[import, lang:"csharp"](code/cs/Person.cs) +[import, lang:"csharp"](code/csharp/Person.cs) Program.cs -[import, lang:"csharp"](code/cs/Program.cs) +[import, lang:"csharp"](code/csharp/Program.cs) ListExtensions.cs -[import, lang:"csharp"](code/cs/ListExtensions.cs) +[import, lang:"csharp"](code/csharp/ListExtensions.cs) {% endmethod %}