Merge branch 'master' into gaussianEliminationInCpp

Author: Gathros

CONTRIBUTORS.md

@@ -37,6 +37,8 @@ This file lists everyone, who contributed to this repo and wanted to show up her
 - Ken Power
 - PaddyKe
 - nic-hartley
+- Thijs Raymakers
 - crafter312
 - Christopher Milan
-- Vexatos
+- Vexatos
+- Björn Heinrichs 

README.md

@@ -1,6 +1,6 @@
 > **IMPORTANT NOTE FOR NEW CONTRIBUTORS:**
 >
-> We do **not** yet accept entirely new chapters by everyone. If you would like to start work on one, get in contact with Leios first. If you create a full chapter, including text, and submit it as a pull request it is most likely going to get rejected.
+> We do **not** yet accept entirely new chapters by everyone. If you would like to start working on one, please contact James Schloss (Leios) first. If you create a full chapter, including text, and submit it as a pull request it is most likely going to get rejected.
 >
 > If you want to help, it is best to write language examples for *existing* chapters. You can also try to find spelling or other mistakes in existing chapters and submit fixes for those.
 
@@ -32,7 +32,9 @@ Thanks for reading and let me know if there's anything wrong or if you want to s
 ----
 
 ## License
-The content of this project itself is licensed under the Creative Commons Attribution-NonCommercial 4.0 International License (link below). The code examples are licensed under the MIT license (found in LICENSE.md).
+The code examples for this project are licensed under the MIT license (found in [LICENSE.md](https://github.com/algorithm-archivists/algorithm-archive/blob/master/LICENSE.md)).
+All text content is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode) with attribution specified at the end of every chapter.
+All graphics are licensed under the license stated at the end of every chapter.
+If no attribution is specified, please attribute James Schloss.
 
-{% creativecommons type="by-nc" %}
-{% endcreativecommons %}
+[<p><img  class="center" src="contents/cc/CC-BY-SA_icon.svg" /></p>](https://creativecommons.org/licenses/by-sa/4.0/)

SUMMARY.md

@@ -8,7 +8,6 @@
 * [Mathematical Background](contents/mathematical_background/mathematical_background.md)
     * [Complexity Notation](contents/notation/notation.md)
     * [Bit Logic](contents/bitlogic/bitlogic.md)
-    * [Convolutions](contents/convolutions/convolutions.md)
     * [Taylor Series](contents/taylor_series_expansion/taylor_series_expansion.md)
 * [Sorting and Searching](contents/sorting_and_searching/sorting_and_searching.md)
     * [Bubble Sort](contents/bubble_sort/bubble_sort.md)

book.json

@@ -4,12 +4,13 @@
     "fontsettings",
     "mathjax@https://github.com/algorithm-archivists/plugin-mathjax",
     "bibtex-cite",
-    "creativecommons",
     "wordcount",
     "api-language-selector@https://github.com/algorithm-archivists/gitbook-plugin-api-language-selector.git",
     "include-codeblock",
     "ga",
-    "bulk-redirect"
+    "bulk-redirect",
+    "prism",
+    "-highlight"
   ],
   "lunr": {
     "maxIndexSize": 1000000000
@@ -29,6 +30,18 @@
     "ga": {
       "token": "UA-118252470-1"
     },
+    "prism": {
+      "lang": {
+        "asm-x64": "nasm"
+      },
+      "ignore": [
+        "emojicode",
+        "text"
+      ],
+      "css": [
+        "prismjs/themes/prism-tomorrow.css"
+      ]
+    },
     "api-language-selector": {
       "languages": [
         {
@@ -52,6 +65,10 @@
           "lang": "c",
           "name": "C"
         },
+        {
+          "lang": "c8",
+          "name": "chip-8"
+        },
         {
           "lang": "py",
           "name": "Python"
@@ -167,6 +184,10 @@
         {
           "lang": "lolcode",
           "name": "LOLCODE"
+        },
+        {
+          "lang": "piet",
+          "name": "Piet"
         }
       ]
     }

contents/backward_euler_method/backward_euler_method.md

@@ -8,3 +8,20 @@ MORE TO COME!!!
 <script>
 MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
 </script>
+
+## License
+
+##### Code Examples
+
+The code examples are licensed under the MIT license (found in [LICENSE.md](https://github.com/algorithm-archivists/algorithm-archive/blob/master/LICENSE.md)).
+
+##### Text
+
+The text of this chapter was written by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
+
+[<p><img  class="center" src="../cc/CC-BY-SA_icon.svg" /></p>](https://creativecommons.org/licenses/by-sa/4.0/)
+
+##### Pull Requests
+
+After initial licensing ([#560](https://github.com/algorithm-archivists/algorithm-archive/pull/560)), the following pull requests have modified the text or graphics of this chapter:
+- none

contents/barnes_hut_algorithm/barnes_hut_algorithm.md

@@ -11,3 +11,20 @@ TODO
 <script>
 MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
 </script>
+
+## License
+
+##### Code Examples
+
+The code examples are licensed under the MIT license (found in [LICENSE.md](https://github.com/algorithm-archivists/algorithm-archive/blob/master/LICENSE.md)).
+
+##### Text
+
+The text of this chapter was written by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
+
+[<p><img  class="center" src="../cc/CC-BY-SA_icon.svg" /></p>](https://creativecommons.org/licenses/by-sa/4.0/)
+
+##### Pull Requests
+
+After initial licensing ([#560](https://github.com/algorithm-archivists/algorithm-archive/pull/560)), the following pull requests have modified the text or graphics of this chapter:
+- none

contents/bitlogic/bitlogic.md

@@ -133,6 +133,38 @@ There are a few other gates, but this is enough for most things. We'll add more
 
 That's about it for bitlogic. I realize it was a bit long, but this is absolutely essential to understanding how computers think and how to use programming as an effective tool!
 
+## Video Explanation
+Here is a video describing the contents of this chapter:
+
+<div style="text-align:center">
+<iframe width="560" height="315" src="https://www.youtube.com/embed/zMuEk44Ufkw" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+</div>
+
 <script>
 MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
 </script>
+
+## License
+
+##### Code Examples
+
+The code examples are licensed under the MIT license (found in [LICENSE.md](https://github.com/algorithm-archivists/algorithm-archive/blob/master/LICENSE.md)).
+
+##### Text
+
+The text of this chapter was written by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
+
+[<p><img  class="center" src="../cc/CC-BY-SA_icon.svg" /></p>](https://creativecommons.org/licenses/by-sa/4.0/)
+
+##### Images/Graphics
+- The image "[ANDgate](res/and.jpg)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
+- The image "[ORgate](res/or.jpg)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
+- The image "[XORgate](res/xor.jpg)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
+- The image "[NOTgate](res/not.jpg)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
+- The image "[NANDgate](res/nand.jpg)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
+- The image "[NORgate](res/nor.jpg)" was created by [James Schloss](https://github.com/leios) and is licenced under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
+
+##### Pull Requests
+
+After initial licensing ([#560](https://github.com/algorithm-archivists/algorithm-archive/pull/560)), the following pull requests have modified the text or graphics of this chapter:
+- none

contents/bogo_sort/bogo_sort.md

@@ -20,7 +20,7 @@ In code, it looks something like this:
 {% sample lang="clj" %}
 [import:7-11, lang:"clojure"](code/clojure/bogo.clj)
 {% sample lang="c" %}
-[import:25-29, lang:"c_cpp"](code/c/bogo_sort.c)
+[import:25-29, lang:"c"](code/c/bogo_sort.c)
 {% sample lang="java" %}
 [import:2-6, lang:"java"](code/java/bogo.java)
 {% sample lang="js" %}
@@ -34,7 +34,7 @@ In code, it looks something like this:
 {% sample lang="lua" %}
 [import:1-22, lang="lua"](code/lua/bogosort.lua)
 {% sample lang="cpp" %}
-[import:33-38, lang:"c_cpp"](code/c++/bogosort.cpp)
+[import:33-38, lang:"cpp"](code/c++/bogosort.cpp)
 {% sample lang="rs" %}
 [import:16-20, lang:"rust"](code/rust/bogosort.rs)
 {% sample lang="swift" %}
@@ -54,7 +54,7 @@ In code, it looks something like this:
 {% sample lang="racket" %}
 [import:3-8, lang:"lisp"](code/racket/bogo_sort.rkt)
 {% sample lang="st" %}
-[import:2-6, lang:"st"](code/smalltalk/bogosort.st)
+[import:2-6, lang:"smalltalk"](code/smalltalk/bogosort.st)
 {% sample lang="bash" %}
 [import:38-45, lang:"bash"](code/bash/bogo_sort.bash)
 {% sample lang="asm-x64" %}
@@ -65,6 +65,10 @@ In code, it looks something like this:
 [import:10-14, lang:"crystal"](code/crystal/bogo.cr)
 {% sample lang="r" %}
 [import:1-6, lang:"r"](code/r/bogo_sort.r)
+{% sample lang="scala" %}
+[import:12-16, lang:"scala"](code/scala/bogo.scala)
+{% sample lang="go" %}
+[import:27-31, lang:"go"](code/go/bogo_sort.go)
 {% endmethod %}
 
 That's it.
@@ -84,7 +88,7 @@ We are done here!
 {% sample lang="clj" %}
 [import, lang:"clojure"](code/clojure/bogo.clj)
 {% sample lang="c" %}
-[import, lang:"c_cpp"](code/c/bogo_sort.c)
+[import, lang:"c"](code/c/bogo_sort.c)
 {% sample lang="java" %}
 [import, lang:"java"](code/java/bogo.java)
 {% sample lang="js" %}
@@ -98,7 +102,7 @@ We are done here!
 {% sample lang="lua" %}
 [import, lang="lua"](code/lua/bogosort.lua)
 {% sample lang="cpp" %}
-[import, lang:"c_cpp"](code/c++/bogosort.cpp)
+[import, lang:"cpp"](code/c++/bogosort.cpp)
 {% sample lang="rs" %}
 [import, lang:"rust"](code/rust/bogosort.rs)
 {% sample lang="swift" %}
@@ -118,7 +122,7 @@ We are done here!
 {% sample lang="racket" %}
 [import, lang:"lisp"](code/racket/bogo_sort.rkt)
 {% sample lang="st" %}
-[import, lang:"st"](code/smalltalk/bogosort.st)
+[import, lang:"smalltalk"](code/smalltalk/bogosort.st)
 {% sample lang="bash" %}
 [import, lang:"bash"](code/bash/bogo_sort.bash)
 {% sample lang="asm-x64" %}
@@ -129,9 +133,30 @@ We are done here!
 [import, lang:"crystal"](code/crystal/bogo.cr)
 {% sample lang="r" %}
 [import, lang:"r"](code/r/bogo_sort.r)
+{% sample lang="scala" %}
+[import, lang:"scala"](code/scala/bogo.scala)
+{% sample lang="go" %}
+[import, lang:"go"](code/go/bogo_sort.go)
 {% endmethod %}
 
 
 <script>
 MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
 </script>
+
+## License
+
+##### Code Examples
+
+The code examples are licensed under the MIT license (found in [LICENSE.md](https://github.com/algorithm-archivists/algorithm-archive/blob/master/LICENSE.md)).
+
+##### Text
+
+The text of this chapter was written by [James Schloss](https://github.com/leios) and is licensed under the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
+
+[<p><img  class="center" src="../cc/CC-BY-SA_icon.svg" /></p>](https://creativecommons.org/licenses/by-sa/4.0/)
+
+##### Pull Requests
+
+After initial licensing ([#560](https://github.com/algorithm-archivists/algorithm-archive/pull/560)), the following pull requests have modified the text or graphics of this chapter:
+- none

contents/bogo_sort/code/go/main.go contents/bogo_sort/code/go/bogo_sort.gocontents/bogo_sort/code/go/main.go renamed to contents/bogo_sort/code/go/bogo_sort.go

@@ -0,0 +1,25 @@
+import scala.util.Random.shuffle
+
+object BogoSort {
+
+  def isSorted(list: List[Int]): Boolean =
+    list match {
+      case Nil => true
+      case a :: b :: _ if a > b => false
+      case _ :: tail => isSorted(tail)
+    }
+
+  def bogoSort(list: List[Int]): List[Int] =
+    isSorted(list) match {
+      case false => bogoSort(shuffle(list))
+      case _ => list
+    }
+
+  def main(args: Array[String]): Unit = {
+    val unsorted = List(5, 2, 7, 1, -5)
+    
+    println("Unsorted list is " + unsorted)
+    println("  Sorted list is " + bogoSort(unsorted))
+  }
+
+}