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" %}