aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--index.html16
-rw-r--r--main.js14
-rw-r--r--readme.md2
3 files changed, 21 insertions, 11 deletions
diff --git a/index.html b/index.html
index 40f7a26..aa4e228 100644
--- a/index.html
+++ b/index.html
@@ -35,6 +35,8 @@ br = \\0
<option
value="map = \\(0 \\\\\((((0 (6 4)) (6 3)) (6 2)) (6 1)))
invert = \\\((2 0) 1)
+
+-- the first argument is the empty screen, therefore we can use point-free style
(map invert)"
>
Invert
@@ -53,12 +55,20 @@ y = \(\(1 (0 0)) \(1 (0 0)))
Sierpiński triangle
</option>
<option
- value="00010001010101000000000001010101101111101111011101100101000001101100000110100101000001101100000110010100000110110000010100101000001101100000110010100000110110000010010100000110110000010100101000001101100000110010100000110110000010010100000110110000010010100000110110000010100100010001010100010001110000101110110100001110000101110110100000000101100000000101000000010110111011001111110111001011111110111110110000010000110110100101010001000111000010111011010000111000010111011010000000010110000000010100000001011011101100111111011100101111111011111011000001000000101010001000111000010111011010000111000010111011010000000010110000000010111111100111111011101101101100101010001000111000010111011010000111000010111011010000000010110000000010100000001011011101100111111011100101111111011111011000001000000101110111010101001010000000101101110110000000000101010100000000000101010110111110111101110110111101110110000010010100000001011011101100000000001010101000000000001010101101111101111011101101111011100000101001010000000101101110110000000000101010100000000000101010110111110111101110110111100000101101001000101000000010110111011010000010000000000101010100000000000101010110111110111101110110000010111011010"
+ value="y = \(\(1 (0 0)) \(1 (0 0)))
+vfix = (y \\((\(y \\((0 \\\\((0 (6 3)) (5 2))) 0)) \(0 (2 1))) 0))
+mut = \((0 \\((((0 (1 \\1)) ((1 \\0) \\1)) (((1 \\0) \\0) \\1)) \\0)) \((0 \\((((0 (1 \\1)) ((1 \\0) \\1)) \\0) ((((1 \\0) \\0) \\0) \\1))) \((0 \\((((0 (1 \\1)) \\0) (((1 \\0) \\0) \\1)) ((((1 \\0) \\0) \\0) \\1))) \((0 \\((((0 \\0) ((1 \\0) \\1)) (((1 \\0) \\0) \\1)) ((((1 \\0) \\0) \\0) \\1))) \\0))))
+build = \\((((0 (1 \\1)) ((1 \\0) \\1)) (((1 \\0) \\0) \\1)) ((((1 \\0) \\0) \\0) \\1))
+\(build (vfix mut))"
>
T-square
</option>
<option
- value="000100010101010000000000010101011011111011110111011001010000011011000001101001010000011011000001100101000001101100000101001010000011011000001100101000001101100000100101000001101100000101001010000011011000001100101000001101100000100101000001101100000100101000001101100000101001000100010101000100011100001011101101000011100001011101101000000001011000000001010000000101101110110011111101110010111111101111101100000100001101101001010100010001110000101110110100001110000101110110100000000101100000000101000000010110111011001111110111001011111110111110110000010000001010100010001110000101110110100001110000101110110100000000101100000000101111111001111110111011011011001010100010001110000101110110100001110000101110110100000000101100000000101000000010110111011001111110111001011111110111110110000010000001011101110101010010100000001011011101100000000001010101000000000001010101101111101111011101101111011101100101010100000000000101010110111110111101110110010101010000000000010101011011111011110111011000001000001100000110000011000001100000110000010010100000001011011101100000000001010101000000000001010101101111101111011101101111011100101010100000000000101010110111110111101110110000011001010101000000000001010101101111101111011101100000110000010000011000001100000100000110100101000000010110111011000000000010101010000000000010101011011111011110111011011110010101010000000000010101011011111011110111011000001100000100101010100000000000101010110111110111101110110000011000001100000100000110000011011010010001010000000101101110110100000100000000001010101000000000001010101101111101111011101100101010100000000000101010110111110111101110110000010000011000001100101010100000000000101010110111110111101110110000011000001100000110000010111011010"
+ value="y = \(\(1 (0 0)) \(1 (0 0)))
+vfix = (y \\((\(y \\((0 \\\\((0 (6 3)) (5 2))) 0)) \(0 (2 1))) 0))
+mut = \((0 \\((((0 (1 \\1)) ((1 \\0) \\1)) (((1 \\0) \\0) \\1)) \((((0 \((((0 \\0) \\1) \\1) \\1)) \\1) \\1) \\0))) \((0 \\((((0 (1 \\1)) ((1 \\0) \\1)) \((((0 \\1) \((((0 \\1) \\0) \\1) \\1)) \\0) \\1)) ((((1 \\0) \\0) \\0) \\1))) \((0 \\((((0 (1 \\1)) \((((0 \\1) \\0) \((((0 \\1) \\1) \\0) \\1)) \\1)) (((1 \\0) \\0) \\1)) ((((1 \\0) \\0) \\0) \\1))) \((0 \\((((0 \((((0 \\0) \\1) \\1) \((((0 \\1) \\1) \\1) \\0))) ((1 \\0) \\1)) (((1 \\0) \\0) \\1)) ((((1 \\0) \\0) \\0) \\1))) \\0))))
+build = \\((((0 (1 \\1)) ((1 \\0) \\1)) (((1 \\0) \\0) \\1)) ((((1 \\0) \\0) \\0) \\1))
+\(build (vfix mut))"
>
Sierpiński carpet (variant)
</option>
@@ -76,7 +86,7 @@ y = \(\(1 (0 0)) \(1 (0 0)))
<span id="error"></span>
<textarea
type="text"
- rows="5"
+ rows="6"
placeholder="e.g. \\(0...) or 00000110... (BLC) or [[0 ...]] (bruijn)"
name="term"
id="term"
diff --git a/main.js b/main.js
index 6b005f3..e583a7a 100644
--- a/main.js
+++ b/main.js
@@ -290,7 +290,7 @@ let depth = 0;
let canceled = false;
const cancelReduction = () => {
if (depth++ > MAX && !canceled) {
- MAX **= 1.4;
+ MAX **= 1.3;
if (
!confirm(
`This takes awfully long (${depth} steps!). The reduction potentially won't converge to a valid screen (or at all!). Do you want to continue?\nWarning: This might crash your browser!`,
@@ -465,11 +465,11 @@ const reduceLoop = (worker, root, _t) => {
const stack = [{ ctx: root, t: _t }];
for (let i = 0; stack.length > 0; i++) {
// console.log(i, stack.length);
- let [{ ctx, t }] = stack.splice(
- Math.floor(Math.random() * stack.length),
- 1,
- );
- // let { ctx, t } = stack.shift();
+ // let [{ ctx, t }] = stack.splice(
+ // Math.floor(Math.random() * stack.length),
+ // 1,
+ // );
+ let { ctx, t } = stack.shift();
// let { ctx, t } = stack.pop();
// TODO: priority queue on context size
@@ -495,7 +495,7 @@ const reduceLoop = (worker, root, _t) => {
}
// smaller resolutions apparently crash the browser tab lol
- if (ctx.x[1] - ctx.x[0] < 2) continue;
+ if (ctx.x[1] - ctx.x[0] < MAXRES) continue;
if (seemsScreeny(t)) {
const tl = t.body.left.left.left.right;
diff --git a/readme.md b/readme.md
index 94ca96d..95b438a 100644
--- a/readme.md
+++ b/readme.md
@@ -8,7 +8,7 @@ information.
- WebGL for drawing the squares
- 1 Webworker for handling paint requests
-- single-threaded reduction via randomized stack popping (see
+- single-threaded reduction (see
[4fa7012](https://github.com/marvinborner/lambda-screen/tree/4fa7012e03e09fa62bd0080f2c7bfbf02b00a6ca)
for an implementation using 4 parallel reduction workers; they
crashed firefox consistently)