Merge branch 'master' into tree-traversal-ruby

Author: tarunvelli

.devcontainer/Dockerfile

@@ -82,17 +82,21 @@ RUN mkdir -p ~/swift && wget https://swift.org/builds/swift-5.5-release/ubuntu20
 ENV PATH=$PATH:~/swift/usr/bin
 
 # Setup viml
-## ?
+# To run vim script commands use `/usr/bin/vim -c ":source %" <path_to_file>`
+RUN export DEBIAN_FRONTEND=noninteractive && apt-get -y install --no-install-recommends vim
 
 # Setup whitespace
 ## ?
 
 # Setup Elm
-## https://github.com/elm/compiler/blob/master/installers/linux/README.md
+RUN mkdir -p ~/elm && curl -L -o ~/elm/elm.gz https://github.com/elm/compiler/releases/download/0.19.1/binary-for-linux-64-bit.gz && \
+    gunzip ~/elm/elm.gz && chmod +x ~/elm/elm
+ENV PATH=$PATH:~/elm
 
 # Setup V
-## https://github.com/vlang/v/blob/master/doc/docs.md
-
+RUN mkdir -p ~/vlang && wget https://github.com/vlang/v/releases/download/weekly.2021.44/v_linux.zip -O ~/vlang/vlang.zip && \
+    unzip ~/vlang/vlang.zip -d ~/vlang 
+ENV PATH=$PATH:~/vlang/v
 
 # Install the packages that needed extra help
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

contents/IFS/IFS.md

@@ -135,7 +135,7 @@ Here, instead of tracking children of children, we track a single individual tha
 {% sample lang="hs" %}
 [import:7-13, lang:"haskell"](code/haskell/IFS.hs)
 {% sample lang="cpp" %}
-[import:39-52, lang:"cpp"](code/c++/IFS.cpp)
+[import:39-52, lang:"cpp"](code/cpp/IFS.cpp)
 {% sample lang="py" %}
 [import:5-12, lang:"python"](code/python/IFS.py)
 {% sample lang="c" %}
@@ -221,7 +221,7 @@ In addition, we have written the chaos game code to take in a set of points so t
 {% sample lang="hs" %}
 [import, lang:"haskell"](code/haskell/IFS.hs)
 {% sample lang="cpp" %}
-[import, lang:"cpp"](code/c++/IFS.cpp)
+[import, lang:"cpp"](code/cpp/IFS.cpp)
 {% sample lang="py" %}
 [import, lang:"python"](code/python/IFS.py)
 {% sample lang="c" %}

contents/IFS/code/c++/IFS.cpp renamed to contents/IFS/code/cpp/IFS.cpp

@@ -363,7 +363,7 @@ As we do not have any objects to count, we will instead simulate the counting wi
 {% sample lang="c" %}
 [import, lang:"c"](code/c/approximate_counting.c)
 {% sample lang="cpp" %}
-[import, lang:"cpp"](code/c++/approximate_counting.cpp)
+[import, lang:"cpp"](code/cpp/approximate_counting.cpp)
 {% sample lang="python" %}
 [import, lang:"python"](code/python/approximate_counting.py)
 {% endmethod %}

contents/approximate_counting/approximate_counting.md

@@ -128,7 +128,7 @@ The biggest differences between the two code implementations is that the Barnsle
 {% sample lang="rs" %}
 [import, lang:"rust"](code/rust/src/main.rs)
 {% sample lang="cpp" %}
-[import, lang:"cpp"](code/c++/barnsley.cpp)
+[import, lang:"cpp"](code/cpp/barnsley.cpp)
 {% sample lang="c" %}
 [import, lang:"c"](code/c/barnsley.c)
 {% sample lang="java" %}

contents/approximate_counting/code/c++/approximate_counting.cpp renamed to contents/approximate_counting/code/cpp/approximate_counting.cpp

@@ -315,7 +315,7 @@ For now, we have the code outputting a tuple of $$d$$ and $$e$$, so users can us
 {% sample lang="c" %}
 [import, lang:"c"](code/c/gauss_easter.c)
 {% sample lang="cpp" %}
-[import, lang:"cpp"](code/c++/gauss_easter.cpp)
+[import, lang:"cpp"](code/cpp/gauss_easter.cpp)
 {% sample lang="lisp" %}
 [import, lang:"lisp"](code/clisp/gauss-easter.lisp)
 {% sample lang="nim" %}

contents/barnsley/barnsley.md

@@ -76,7 +76,7 @@ For some reason, though, putting code to this transformation really helped me fi
 {% sample lang="clj" %}
 [import:15-30, lang:"clojure"](code/clojure/fft.clj)
 {% sample lang="cpp" %}
-[import:23-33, lang:"cpp"](code/c++/fft.cpp)
+[import:23-33, lang:"cpp"](code/cpp/fft.cpp)
 {% sample lang="hs" %}
 [import:7-13, lang:"haskell"](code/haskell/fft.hs)
 {% sample lang="py" %}
@@ -129,7 +129,7 @@ In the end, the code looks like:
 {% sample lang="clj" %}
 [import:31-58, lang:"clojure"](code/clojure/fft.clj)
 {% sample lang="cpp" %}
-[import:36-66, lang:"cpp"](code/c++/fft.cpp)
+[import:36-66, lang:"cpp"](code/cpp/fft.cpp)
 {% sample lang="hs" %}
 [import:15-28, lang:"haskell"](code/haskell/fft.hs)
 {% sample lang="py" %}
@@ -242,7 +242,7 @@ Note: I implemented this in Julia because the code seems more straightforward in
 {% sample lang="clj" %}
 [import, lang:"clojure"](code/clojure/fft.clj)
 {% sample lang="cpp" %}
-[import, lang:"cpp"](code/c++/fft.cpp)
+[import, lang:"cpp"](code/cpp/fft.cpp)
 {% sample lang="hs" %}
 [import, lang:"haskell"](code/haskell/fft.hs)
 {% sample lang="py" %}

contents/barnsley/code/c++/barnsley.cpp renamed to contents/barnsley/code/cpp/barnsley.cpp

@@ -14,7 +14,7 @@ The algorithm is a simple way to find the *greatest common divisor* (GCD) of two
 {% sample lang="clj" %}
 [import:2-8, lang="clojure"](code/clojure/euclidean_example.clj)
 {% sample lang="cpp" %}
-[import:18-31, lang="c_cpp"](code/c++/euclidean.cpp)
+[import:18-31, lang="c_cpp"](code/cpp/euclidean.cpp)
 {% sample lang="java" %}
 [import:3-16, lang="java"](code/java/EuclideanAlgo.java)
 {% sample lang="kotlin" %}
@@ -56,7 +56,7 @@ The algorithm is a simple way to find the *greatest common divisor* (GCD) of two
 {% sample lang="scala" %}
 [import:3-8, lang="scala"](code/scala/euclidean.scala)
 {% sample lang="racket" %}
-[import:3-14, lang="lisp"](code/racket/euclidean_algorithm.rkt)
+[import:3-14, lang="racket"](code/racket/euclidean_algorithm.rkt)
 {% sample lang="ruby" %}
 [import:8-19, lang="ruby"](code/ruby/euclidean.rb)
 {% sample lang="st" %}
@@ -104,7 +104,7 @@ Modern implementations, though, often use the modulus operator (%) like so
 {% sample lang="clj" %}
 [import:9-13, lang="clojure"](code/clojure/euclidean_example.clj)
 {% sample lang="cpp" %}
-[import:5-15, lang="c_cpp"](code/c++/euclidean.cpp)
+[import:5-15, lang="c_cpp"](code/cpp/euclidean.cpp)
 {% sample lang="java" %}
 [import:18-26, lang="java"](code/java/EuclideanAlgo.java)
 {% sample lang="kotlin" %}
@@ -146,7 +146,7 @@ Modern implementations, though, often use the modulus operator (%) like so
 {% sample lang="scala" %}
 [import:10-14, lang="scala"](code/scala/euclidean.scala)
 {% sample lang="racket" %}
-[import:16-24, lang="lisp"](code/racket/euclidean_algorithm.rkt)
+[import:16-24, lang="racket"](code/racket/euclidean_algorithm.rkt)
 {% sample lang="ruby" %}
 [import:1-6, lang="ruby"](code/ruby/euclidean.rb)
 {% sample lang="st" %}
@@ -207,7 +207,7 @@ Here's a video on the Euclidean algorithm:
 {% sample lang="clj" %}
 [import, lang="clojure"](code/clojure/euclidean_example.clj)
 {% sample lang="cpp" %}
-[import, lang="c_cpp"](code/c++/euclidean.cpp)
+[import, lang="c_cpp"](code/cpp/euclidean.cpp)
 {% sample lang="java" %}
 [import, lang="java"](code/java/EuclideanAlgo.java)
 {% sample lang="kotlin" %}
@@ -252,7 +252,7 @@ and modulo method:
 {% sample lang="scala" %}
 [import, lang="scala"](code/scala/euclidean.scala)
 {% sample lang="racket" %}
-[import, lang="lisp"](code/racket/euclidean_algorithm.rkt)
+[import, lang="racket"](code/racket/euclidean_algorithm.rkt)
 {% sample lang="ruby" %}
 [import, lang="ruby"](code/ruby/euclidean.rb)
 {% sample lang="st" %}

contents/computus/code/c++/gauss_easter.cpp renamed to contents/computus/code/cpp/gauss_easter.cpp

@@ -0,0 +1,28 @@
+{
+    "type": "application",
+    "source-directories": [
+        "src"
+    ],
+    "elm-version": "0.19.1",
+    "dependencies": {
+        "direct": {
+            "bemyak/elm-slider": "1.0.0",
+            "elm/browser": "1.0.2",
+            "elm/core": "1.0.5",
+            "elm/html": "1.0.0",
+            "elm/json": "1.1.3",
+            "elm/svg": "1.0.1",
+            "elm/time": "1.0.0",
+            "rtfeldman/elm-hex": "1.0.0"
+        },
+        "indirect": {
+            "debois/elm-dom": "1.3.0",
+            "elm/url": "1.0.0",
+            "elm/virtual-dom": "1.0.2"
+        }
+    },
+    "test-dependencies": {
+        "direct": {},
+        "indirect": {}
+    }
+}