Merge branch 'main' into coconut_compilation

Author: ntindle

.devcontainer/devcontainer.json

@@ -1,26 +1,24 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/ubuntu
+// For format details, see https://aka.ms/devcontainer.json.
 {
-	"name": "Ubuntu",
-	"build": {
-		"dockerfile": "../Dockerfile",
-		// Update 'VARIANT' to pick an Ubuntu version: focal, bionic
-		"args": { "VARIANT": "focal" }
-	},
+	"name": "Arcane Algorithm Archive All Languages",
+
+	// Comment out 'image' and uncomment 'build' to test changes to the dockerfile locally
+	"image": "ghcr.io/algorithm-archivists/aaa-langs:latest",
+	// "build": {\
+	//  // For config options, see the README at:https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/ubuntu
+	// 	"dockerfile": "../Dockerfile",
+	// 	// Update 'VARIANT' to pick an Ubuntu version: focal, bionic
+	// 	"args": { "VARIANT": "focal" }
+	// },
 
 	// Set *default* container specific settings.json values on container create.
 	"settings": {},
 
-
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [],
 
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "uname -a",
-
-	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	// "remoteUser": "vscode"
+	// Use 'forwardPorts' to make a list of ports inside the container available locally (outside the container).
+	// Port : Usage
+	// 4000 : Honkit serves by default on this port
+	"forwardPorts": [4000]
 }

.github/workflows/build.yml

@@ -4,6 +4,12 @@ on: pull_request
 jobs:
   build:
     runs-on: ubuntu-latest
+    container:
+      options: --entrypoint /bin/bash --user 0 
+      image: ghcr.io/algorithm-archivists/aaa-langs:latest
+    defaults:
+      run:
+        shell: bash --rcfile /root/.bashrc -eo pipefail {0} 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -14,3 +20,10 @@ jobs:
         run: |
           npm install
           npx honkit build
+          
+      - name: Initalize cargo and run SCons
+        env:
+          HOME: /root
+        run:  |
+          . "$HOME/.cargo/env"
+          scons -Q

.github/workflows/deploy.yml

@@ -2,7 +2,7 @@ name: Build and Deploy
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build-and-deploy:

.github/workflows/publish_container.yml

@@ -2,10 +2,11 @@ name: Publish Docker
 on:
   push:
     branches:
-      - master
+      - main
 jobs:
   build:
     runs-on: ubuntu-latest
+    if: github.repository == 'algorithm-archivists/algorithm-archive'
     steps:
     - uses: actions/checkout@master
     - name: Publish to Registry
@@ -14,4 +15,4 @@ jobs:
         name: algorithm-archivists/aaa-langs
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
-        registry: ghcr.io
+        registry: ghcr.io

.gitignore

@@ -478,7 +478,7 @@ paket-files/
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 *.pyc
-
+*.ipynb_checkpoints*
 # Cake - Uncomment if you are using it
 # tools/**
 # !tools/packages.config
@@ -528,3 +528,6 @@ build/
 # Cargo artifacts
 Cargo.lock
 target/
+
+*.out
+*.class

.travis.yml

@@ -51,7 +51,7 @@ This file lists everyone, who contributed to this repo and wanted to show up her
 - Vincent Zalzal
 - Jonathan D B Van Schenck
 - James Goytia
-- Sammy Plat 
+- Sammy Plat
 - Jonathan Dönszelmann
 - Ishaan Verma
 - Delphi1024
@@ -60,4 +60,6 @@ This file lists everyone, who contributed to this repo and wanted to show up her
 - Ridham177
 - Hugo Salou
 - Dimitri Belopopsky
-+ Henrik Abel Christensen
+- Henrik Abel Christensen
+- K. Shudipto Amin
+- Peanutbutter_Warrior

CONTRIBUTORS.md

@@ -26,7 +26,7 @@ env = Environment(ENV=os.environ,
                             'Coconut': coconut_builder},
                   tools=['gcc', 'gnulink', 'g++', 'gas', 'gfortran'])
 
-env['CCFLAGS'] = ''
+env['CFLAGS'] = '-Wall -Wextra -Werror'
 env['CXXFLAGS'] = '-std=c++17'
 env['ASFLAGS'] = '--64'
 env['COCONUTFLAGS'] = '--target 3.8'

SConstruct

@@ -3,6 +3,7 @@
 * [Algorithm Archive](README.md)
 * [Introduction](contents/introduction/introduction.md)
 * [How To Contribute](contents/how_to_contribute/how_to_contribute.md)
+    * [Code Reviewers](contents/code_reviews/code_reviewers.md)
 * [Plotting](contents/plotting/plotting.md)
     * [Domain Coloring](contents/domain_coloring/domain_coloring.md)
     * [Iterated Function Systems](contents/IFS/IFS.md)
@@ -19,9 +20,11 @@
         * [Multiplication as a Convolution](contents/convolutions/multiplication/multiplication.md)
         * [Convolutions of Images (2D)](contents/convolutions/2d/2d.md)
         * [Convolutional Theorem](contents/convolutions/convolutional_theorem/convolutional_theorem.md)
+	* [Probability Distributions](contents/probability/distributions/distributions.md)	
 * [Tree Traversal](contents/tree_traversal/tree_traversal.md)
 * [Euclidean Algorithm](contents/euclidean_algorithm/euclidean_algorithm.md)
 * [Monte Carlo](contents/monte_carlo_integration/monte_carlo_integration.md)
+    * [Metropolis](contents/metropolis/metropolis.md)
 * [Matrix Methods](contents/matrix_methods/matrix_methods.md)
     * [Gaussian Elimination](contents/gaussian_elimination/gaussian_elimination.md)
     * [Thomas Algorithm](contents/thomas_algorithm/thomas_algorithm.md)

SUMMARY.md

@@ -146,6 +146,8 @@ Here, instead of tracking children of children, we track a single individual tha
 [import:4-16, lang:"coconut"](code/coconut/IFS.coco)
 {% sample lang="java" %}
 [import:16-39, lang:"java"](code/java/IFS.java)
+{% sample lang="ps1" %}
+[import:2-19, lang:"powershell"](code/powershell/IFS.ps1)
 {% endmethod %}
 
 If we set the initial point to the on the equilateral triangle we saw before, we can see the Sierpinski triangle again after a few thousand iterations, as shown below:
@@ -232,6 +234,8 @@ In addition, we have written the chaos game code to take in a set of points so t
 [import, lang:"coconut"](code/coconut/IFS.coco)
 {%sample lang="java" %}
 [import, lang:"java"](code/java/IFS.java)
+{% sample lang="ps1" %}
+[import, lang:"powershell"](code/powershell/IFS.ps1)
 {% endmethod %}
 
 ### Bibliography
@@ -246,7 +250,7 @@ MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
 
 ##### 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)).
+The code examples are licensed under the MIT license (found in [LICENSE.md](https://github.com/algorithm-archivists/algorithm-archive/blob/main/LICENSE.md)).
 
 ##### Text
 

contents/IFS/IFS.md

@@ -20,7 +20,7 @@ void chaos_game(struct point *in, size_t in_n, struct point *out,
 
     struct point cur_point = {drand(), drand()};
 
-    for (int i = 0; i < out_n; ++i) {
+    for (size_t i = 0; i < out_n; ++i) {
         out[i] = cur_point;
         struct point tmp = random_element(in, in_n);
         cur_point.x = 0.5 * (cur_point.x + tmp.x);
@@ -29,21 +29,22 @@ void chaos_game(struct point *in, size_t in_n, struct point *out,
 }
 
 int main() {
+    const int point_count = 10000;
+    
     struct point shape_points [3] = {{0.0,0.0}, {0.5,sqrt(0.75)}, {1.0,0.0}};
-    struct point out_points[1000];
+    struct point out_points[point_count];
 
     srand(time(NULL));
 
-    chaos_game(shape_points, 3, out_points, 1000);
+    chaos_game(shape_points, 3, out_points, point_count);
 
     FILE *fp = fopen("sierpinksi.dat", "w+");
 
-    for (int i = 0; i < 1000; ++i) {
+    for (int i = 0; i < point_count; ++i) {
         fprintf(fp, "%f\t%f\n", out_points[i].x, out_points[i].y);
     }
 
     fclose(fp);
 
     return 0;
 }
-

contents/IFS/code/c/IFS.c

@@ -21,7 +21,7 @@
     `((0 0) (0.5 ,(sqrt 0.75)) (1 0))))
 
 ;; output the data to the "out.dat" file
-(with-open-file (out "out.dat" :direction :output :if-exists :supersede)
+(with-open-file (out "sierpinski.dat" :direction :output :if-exists :supersede)
   (flet ((format-point (p)
            ;; this is not very clean, but it's the simplest way to insert a tab into a string.
            (format nil "~f~c~f" (point-x p) #\tab (point-y p))))

contents/IFS/code/clisp/ifs.lisp

@@ -27,4 +27,4 @@ main = do
       points = chaosGame g 10000 sierpinski
       showPoint (Point x y) = show x ++ "\t" ++ show y
 
-  writeFile "out.dat" $ intercalate "\n" $ map showPoint points
+  writeFile "sierpinski.dat" $ intercalate "\n" $ map showPoint points

contents/IFS/code/haskell/IFS.hs

@@ -0,0 +1,34 @@
+# This function simulates a "chaos game"
+function Simulate-ChaosGame($n, $shapePoints) {
+    $outputPoints = New-Object System.Collections.ArrayList
+    
+    # Initialize the starting point
+    $point = @($(Get-Random -Minimum 0.0 -Maximum 1.0), $(Get-Random -Minimum 0.0 -Maximum 1.0))
+
+    for ($i = 0; $i -lt $n; $i++) {
+      $outputPoints.add($point) | Out-Null
+      $temp = $shapePoints[$(Get-Random -Maximum $shapePoints.Count)]
+
+      $point = @(
+          0.5 * ($point[0] + $temp[0])
+          0.5 * ($point[1] + $temp[1])
+      )
+    }
+
+    return $outputPoints
+}
+
+
+# This will generate a Sierpinski triangle with a chaos game of n points for an
+# initial triangle with three points on the vertices of an equilateral triangle:
+#     A = (0.0, 0.0)
+#     B = (0.5, sqrt(0.75))
+#     C = (1.0, 0.0)
+# It will output the file sierpinski.dat, which can be plotted after
+$shapePoints = @(
+    @(0.0, 0.0),
+    @(0.5, [math]::sqrt(0.75)),
+    @(1.0, 0.0)
+)
+
+Simulate-ChaosGame -n 10000 -shapePoints $shapePoints | % { "$($_[0])`t$($_[1])" } | Out-File -Path "sierpinski.dat"

contents/IFS/code/powershell/IFS.ps1

@@ -308,7 +308,7 @@ MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
 
 ##### 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)).
+The code examples are licensed under the MIT license (found in [LICENSE.md](https://github.com/algorithm-archivists/algorithm-archive/blob/main/LICENSE.md)).
 
 ##### Text
 

contents/affine_transformations/affine_transformations.md

@@ -366,6 +366,8 @@ As we do not have any objects to count, we will instead simulate the counting wi
 [import, lang:"cpp"](code/cpp/approximate_counting.cpp)
 {% sample lang="python" %}
 [import, lang:"python"](code/python/approximate_counting.py)
+{% sample lang="java" %}
+[import, lang:"java"](code/java/ApproximateCounting.java)
 {% endmethod %}
 
 ### Bibliography
@@ -380,7 +382,7 @@ MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
 
 ##### 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)).
+The code examples are licensed under the MIT license (found in [LICENSE.md](https://github.com/algorithm-archivists/algorithm-archive/blob/main/LICENSE.md)).
 
 ##### Text