@explorable-viz/fluid 0.7.84 → 0.7.85

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,13 @@
1
+ # https://editorconfig.org
2
+ root = true
3
+
4
+ [*]
5
+ indent_style = space
6
+ indent_size = 2
7
+ end_of_line = lf
8
+ charset = utf-8
9
+ trim_trailing_whitespace = true
10
+ insert_final_newline = true
11
+
12
+ [*.md]
13
+ trim_trailing_whitespace = false
@@ -0,0 +1,30 @@
1
+ {
2
+ "env": { "browser": true },
3
+ "extends": "eslint:recommended",
4
+ "parserOptions": { "ecmaVersion": 6, "sourceType": "module" },
5
+ "rules": {
6
+ "block-scoped-var": "error",
7
+ "consistent-return": "error",
8
+ "eqeqeq": "error",
9
+ "guard-for-in": "error",
10
+ "no-bitwise": "error",
11
+ "no-caller": "error",
12
+ "no-constant-condition": ["error", { "checkLoops": false }],
13
+ "no-extra-parens": "off",
14
+ "no-extend-native": "error",
15
+ "no-loop-func": "error",
16
+ "no-new": "error",
17
+ "no-param-reassign": "error",
18
+ "no-return-assign": "error",
19
+ "no-sequences": "error",
20
+ "no-unused-expressions": "error",
21
+ "no-use-before-define": "error",
22
+ "no-undef": "error",
23
+ "no-eq-null": "error",
24
+ "radix": ["error", "always"],
25
+ "indent": ["error", 2, { "SwitchCase": 0 }],
26
+ "quotes": ["error", "double"],
27
+ "semi": ["error", "always"],
28
+ "strict": ["error", "global"]
29
+ }
30
+ }
@@ -0,0 +1,13 @@
1
+ .*
2
+ !.gitignore
3
+ !.github
4
+ !.editorconfig
5
+ !.eslintrc.json
6
+
7
+ output
8
+ generated-docs
9
+ bower_components
10
+
11
+ node_modules
12
+ package-lock.json
13
+ *.lock
@@ -0,0 +1,13 @@
1
+ # https://editorconfig.org
2
+ root = true
3
+
4
+ [*]
5
+ indent_style = space
6
+ indent_size = 2
7
+ end_of_line = lf
8
+ charset = utf-8
9
+ trim_trailing_whitespace = true
10
+ insert_final_newline = true
11
+
12
+ [*.md]
13
+ trim_trailing_whitespace = false
@@ -0,0 +1,9 @@
1
+ .*
2
+ !.gitignore
3
+ !.github
4
+ !.editorconfig
5
+ !.tidyrc.json
6
+
7
+ output
8
+ generated-docs
9
+ bower_components
@@ -0,0 +1,10 @@
1
+ {
2
+ "importSort": "source",
3
+ "importWrap": "source",
4
+ "indent": 2,
5
+ "operatorsFile": null,
6
+ "ribbon": 1,
7
+ "typeArrowPlacement": "first",
8
+ "unicode": "never",
9
+ "width": null
10
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@explorable-viz/fluid",
3
- "version": "0.7.84",
3
+ "version": "0.7.85",
4
4
  "description": "Fluid is an experimental programming language which integrates a bidirectional dynamic analysis to connect outputs to data sources in a fine-grained way. Fluid is implemented in PureScript and runs in the browser.",
5
5
  "main": "index.js",
6
6
  "repository": {
@@ -34,6 +34,7 @@ done
34
34
  echo "Processing other static files:"
35
35
  set +xu # try to remove +u
36
36
  TO_COPY=()
37
+ shopt -s dotglob
37
38
  shopt -s extglob
38
39
  for CHILD in website/$WEBSITE/!(.|..); do
39
40
  BASENAME="$(basename "$CHILD")"
@@ -42,6 +43,7 @@ for CHILD in website/$WEBSITE/!(.|..); do
42
43
  fi
43
44
  done
44
45
  shopt -u extglob
46
+ shopt -u dotglob
45
47
  set -xu
46
48
 
47
49
  for CHILD in "${TO_COPY[@]}"; do
@@ -1,29 +0,0 @@
1
- {
2
- "parserOptions": {
3
- "ecmaVersion": 6,
4
- "sourceType": "module"
5
- },
6
- "extends": "eslint:recommended",
7
- "env": {
8
- "node": true
9
- },
10
- "rules": {
11
- "strict": [2, "global"],
12
- "block-scoped-var": 2,
13
- "consistent-return": 2,
14
- "eqeqeq": [2, "smart"],
15
- "guard-for-in": 2,
16
- "no-caller": 2,
17
- "no-extend-native": 2,
18
- "no-loop-func": 2,
19
- "no-new": 2,
20
- "no-param-reassign": 2,
21
- "no-return-assign": 2,
22
- "no-unused-expressions": 2,
23
- "no-use-before-define": 2,
24
- "radix": [2, "always"],
25
- "indent": [2, 2],
26
- "quotes": [2, "double"],
27
- "semi": [2, "always"]
28
- }
29
- }
@@ -1,8 +0,0 @@
1
- /.*
2
- !/.gitignore
3
- !/.eslintrc.json
4
- !/.github/
5
- /bower_components/
6
- /node_modules/
7
- /output/
8
- package-lock.json
@@ -1,29 +0,0 @@
1
- {
2
- "parserOptions": {
3
- "ecmaVersion": 6,
4
- "sourceType": "module"
5
- },
6
- "extends": "eslint:recommended",
7
- "env": {
8
- "node": true
9
- },
10
- "rules": {
11
- "strict": [2, "global"],
12
- "block-scoped-var": 2,
13
- "consistent-return": 2,
14
- "eqeqeq": [2, "smart"],
15
- "guard-for-in": 2,
16
- "no-caller": 2,
17
- "no-extend-native": 2,
18
- "no-loop-func": 2,
19
- "no-new": 2,
20
- "no-param-reassign": 2,
21
- "no-return-assign": 2,
22
- "no-unused-expressions": 2,
23
- "no-use-before-define": 2,
24
- "radix": [2, "always"],
25
- "indent": [2, 2],
26
- "quotes": [2, "double"],
27
- "semi": [2, "always"]
28
- }
29
- }
@@ -1,8 +0,0 @@
1
- /.*
2
- !/.gitignore
3
- !/.eslintrc.json
4
- !/.github/
5
- /bower_components/
6
- /node_modules/
7
- /output/
8
- package-lock.json
@@ -1,29 +0,0 @@
1
- {
2
- "parserOptions": {
3
- "ecmaVersion": 6,
4
- "sourceType": "module"
5
- },
6
- "extends": "eslint:recommended",
7
- "env": {
8
- "node": true
9
- },
10
- "rules": {
11
- "strict": [2, "global"],
12
- "block-scoped-var": 2,
13
- "consistent-return": 2,
14
- "eqeqeq": [2, "smart"],
15
- "guard-for-in": 2,
16
- "no-caller": 2,
17
- "no-extend-native": 2,
18
- "no-loop-func": 2,
19
- "no-new": 2,
20
- "no-param-reassign": 2,
21
- "no-return-assign": 2,
22
- "no-unused-expressions": 2,
23
- "no-use-before-define": 2,
24
- "radix": [2, "always"],
25
- "indent": [2, 2],
26
- "quotes": [2, "double"],
27
- "semi": [2, "always"]
28
- }
29
- }
@@ -1,8 +0,0 @@
1
- /.*
2
- !/.gitignore
3
- !/.eslintrc.json
4
- !/.github/
5
- /bower_components/
6
- /node_modules/
7
- /output/
8
- package-lock.json
@@ -1,8 +0,0 @@
1
- /.*
2
- !/.github
3
- !/.gitignore
4
- !/.npmrc
5
- !/.travis.yml
6
- /bower_components/
7
- /node_modules/
8
- /output/
@@ -1 +0,0 @@
1
- package-lock=false
@@ -1,31 +0,0 @@
1
- let zero m n image =
2
- let (m_max, n_max) = dims image
3
- in if (m >= 1) `and` (m <= m_max) `and` (n >= 1) `and` (n <= n_max)
4
- then image!(m, n)
5
- else 0;
6
-
7
- let wrap m n image =
8
- let (m_max, n_max) = dims image
9
- in image!( ((m - 1) `mod` m_max) + 1, ((n - 1) `mod` n_max) + 1);
10
-
11
- let extend m n image =
12
- let (m_max, n_max) = dims image;
13
- m' = min (max m 1) m_max;
14
- n' = min (max n 1) n_max
15
- in image!(m', n');
16
-
17
- let matrixSum matr =
18
- let (m, n) = dims matr
19
- in sum [ matr!(i, j) | (i, j) <- range (1, 1) (m, n)];
20
-
21
- let convolve image kernel lookup =
22
- let ((m, n), (i, j)) = (dims image, dims kernel);
23
- (half_i, half_j) = (i `quot` 2, j `quot` 2);
24
- area = i * j
25
- in [|let interMatrix = [|
26
- let x = m' + i' - 1 - half_i;
27
- y = n' + j' - 1 - half_j
28
- in lookup x y image * kernel!(i', j')
29
- | (i', j') in (i, j) |]
30
- in matrixSum interMatrix `quot` area
31
- | (m', n') in (m, n) |];
@@ -1,47 +0,0 @@
1
- let nextIndices n m window =
2
- [(i, j) | i <- [1 .. n],
3
- j <- [max 1 (i - window) .. min m (i + window)]];
4
-
5
- let costMatrixInit rows cols window =
6
- [| let initV = if ((n == 1) `and` (m == 1)) `or` ((abs n m <= window) `and` not ((n == 1) `or` (m == 1)))
7
- then FNum 0
8
- else Infty
9
- in initV | (n, m) in (rows, cols) |];
10
-
11
- let minAndPrev (i, j) im1 jm1 ijm1 =
12
- let minim = minimal [im1, jm1, ijm1] in
13
- if minim `eq` im1 then
14
- ((i, j + 1), minim)
15
- else
16
- if minim `eq` jm1 then
17
- ((i + 1, j ), minim)
18
- else ((i, j), minim);
19
-
20
- let extractPath indmatrix (n, m) accum =
21
- if (n == 1) `and` (m == 1)
22
- then accum
23
- else
24
- extractPath indmatrix (indmatrix!(n, m)) ((n - 1, m - 1) : accum);
25
-
26
- let localMinUpdate seq1 seq2 cost (costmatrix, indmatrix) (i, j) =
27
- let iEntr = nth (i - 1) seq1;
28
- jEntr = nth (j - 1) seq2;
29
- dist = cost iEntr jEntr;
30
- ip = i + 1;
31
- jp = j + 1;
32
- im1 = costmatrix!(i , jp);
33
- jm1 = costmatrix!(ip, j);
34
- im1jm1 = costmatrix!(i, j);
35
- (prev, FNum minim) = minAndPrev (i, j) im1 jm1 im1jm1;
36
- newVal = FNum (dist + minim)
37
- in (matrixUpdate costmatrix (ip, jp) newVal, matrixUpdate indmatrix (ip, jp) prev);
38
-
39
- let computeDTW seq1 seq2 cost window =
40
- let n = length seq1;
41
- m = length seq2;
42
- initD = costMatrixInit (n + 1) (m + 1) window;
43
- initI = [| 0 | (i,j) in (n + 1, m + 1)|];
44
- indexing = nextIndices n m window;
45
- (finished, indices) = foldl (localMinUpdate seq1 seq2 cost) (initD, initI) indexing
46
- in
47
- (finished, extractPath indices (n + 1, m + 1) Nil);
@@ -1,22 +0,0 @@
1
- let comp Infty Infty = EQ;
2
- comp Infty (FNum y) = GT;
3
- comp (FNum x) Infty = LT;
4
- comp (FNum x) (FNum y) = compare x y;
5
-
6
- let fmin x y =
7
- match comp x y as {
8
- LT -> x;
9
- EQ -> x;
10
- GT -> y
11
- };
12
-
13
- let minimal = foldl1 fmin;
14
-
15
- let add Infty _ = Infty;
16
- add (FNum x) Infty = Infty;
17
- add (FNum x) (FNum y) = FNum (x + y);
18
-
19
- let eq Infty Infty = True;
20
- eq Infty (FNum x) = False;
21
- eq (FNum x) Infty = False;
22
- eq (FNum x) (FNum y) = x == y;
@@ -1,221 +0,0 @@
1
- -- typedef Colour = Str
2
- -- typedef Colours = List Colour
3
- -- typedef Cat = Str
4
-
5
- -- Group has location (0, 0) because it doesn't interfere with positioning of its children.
6
- -- GraphicsElement -> Point
7
- let coords (Group gs) = Point 0 0;
8
- coords (Rect x y _ _ _) = Point x y;
9
- coords (String x y _ _ _) = Point x y;
10
- coords (Viewport x y _ _ _ _ _ _ _) = Point x y;
11
-
12
- -- GraphicsElement -> Float
13
- let get_x g = let Point x _ = coords g in x;
14
-
15
- -- GraphicsElement -> Float
16
- let get_y g = let Point _ y = coords g in x;
17
-
18
- -- Want some kind of typeclass mechanism plus record accessors/updaters.
19
- -- Float -> GraphicsElement -> GraphicsElement
20
- let set_x x (Group gs) = error "Group has immutable coordinates";
21
- set_x x (Rect _ y w h fill) = Rect x y w h fill;
22
- set_x x (String _ y str anchor baseline) = String x y str anchor baseline;
23
- set_x x (Viewport _ y w h fill margin scale translate g) = Viewport x y w h fill margin scale translate g;
24
-
25
- -- (Point, Point) -> Point
26
- let dimensions2 (Point x1 y1, Point x2 y2) = Point (max x1 x2) (max y1 y2);
27
-
28
- -- For Group, dimensions are relative to implicit coords of (0, 0), since a Group's children are effectively
29
- -- positioned relative to parent of Group. For Polymarker, will probably have to ignore the markers themselves,
30
- -- since they are scale-invariant.
31
- -- GraphicsElement -> Point
32
- let
33
- dimensions (Group gs) = foldl (curry dimensions2) (Point 0 0) (map (coords_op) gs);
34
- dimensions (Polyline ps _ _) = foldl (curry dimensions2) (Point 0 0) ps;
35
- dimensions (Rect _ _ w h _) = Point w h;
36
- dimensions (String _ _ _ _ _) = Point 0 0; -- treat text like markers; scale-invariant
37
- dimensions (Viewport _ _ w h _ _ _ _ _) = Point w h;
38
-
39
- coords_op g =
40
- let (Point x y, Point w h) = prod coords dimensions g in
41
- Point (x + w) (y + h);
42
-
43
- -- GraphicsElement -> Float
44
- let width g = let Point w _ = dimensions g in w;
45
-
46
- -- GraphicsElement -> Float
47
- let height g = let Point _ h = dimensions g in h;
48
-
49
- -- Float -> Float -> List GraphicsElement -> List GraphicsElement
50
- let spaceRight z sep gs =
51
- zipWith set_x (iterate (length gs) ((+) sep) z) gs;
52
-
53
- -- Bake colour decisions into the library for the time being. Provide two palettes, so we can have two
54
- -- different sets of categorical values (e.g. countries and energy types). Palettes from colorbrewer2.org.
55
- let colours1 = ["#66c2a5", "#a6d854", "#ffd92f", "#e5c494", "#fc8d62", "#b3b3b3", "#8da0cb", "#e78ac3"];
56
- let colours2 = ["#e41a1c", "#377eb8", "#4daf4a", "#984ea3", "#ff7f00", "#ffff33", "#a65628", "#f781bf"];
57
-
58
- -- Compositionality principle: child coords/dimensions are always expressed directly using parent reference
59
- -- frame, to avoid depending on content of child, and so are not themselves scaled. Polyline can't be scaled
60
- -- directly because it inherits its frame of reference from its parent. For Viewport, margin will shrink the
61
- -- available area, possibly to zero, at which point nothing will be rendered.
62
- -- Float -> GraphicsElement -> GraphicsElement
63
- let scaleToWidth w (Rect x y _ h fill) = Rect x y w h fill;
64
- scaleToWidth w (Viewport x y w0 h fill margin (Scale x_scale y_scale) translate g) =
65
- let scale = Scale (x_scale * w / w0) y_scale in
66
- Viewport x y w h fill margin scale translate g;
67
-
68
- -- Float -> List GraphicsElement -> List GraphicsElement
69
- let stackRight sep gs =
70
- map (scaleToWidth (1 - sep)) (spaceRight (sep / 2) 1 gs);
71
-
72
- -- Float -> List GraphicsElement -> GraphicsElement
73
- let groupRight sep gs =
74
- Viewport 0 0 (length gs) (maximum (map height gs)) "none" 0 (Scale 1 1) (Translate 0 0) (Group (stackRight sep gs));
75
-
76
- -- Heuristic saying how often to place a tick on an axis of length n.
77
- -- Float -> Float
78
- let tickEvery n =
79
- let m = floor (logBase 10 n) in
80
- if n <= 2 * 10 ** m
81
- then 2 * 10 ** (m - 1)
82
- else 10 ** m;
83
-
84
- let axisStrokeWidth = 0.5;
85
- axisColour = "black";
86
- backgroundColour = "white";
87
- defaultMargin = 24;
88
- markerRadius = 3.5;
89
- tickLength = 4;
90
-
91
- -- Helpers for axis functions.
92
- -- Orient -> Colour -> Float -> GraphicsElement
93
- let tick Horiz colour len = Line (Point 0 0) (Point 0 (0 - len)) colour axisStrokeWidth;
94
- tick Vert colour len = Line (Point 0 0) (Point (0 - len) 0) colour axisStrokeWidth;
95
-
96
- -- Orient -> Float -> Float -> Str -> GraphicsElement
97
- let label Horiz x distance str = String x (0 - distance - 4) str "middle" "hanging";
98
- label Vert x distance str = String (0 - distance) x str "end" "central";
99
-
100
- -- Orient -> Colour -> Float -> Str -> GraphicsElement
101
- let labelledTick orient colour len str =
102
- Group [tick orient colour len, label orient 0 len str];
103
-
104
- -- Orient -> Float -> Float -> Point
105
- let mkPoint Horiz x y = Point y x;
106
- mkPoint Vert x y = Point x y;
107
-
108
- -- x is position of this axis on the other axis. Returns axis and position of last tick.
109
- -- Orient -> Float -> Float -> Float -> GraphicsElement
110
- let axis orient x start end =
111
- let tickSp = tickEvery (end - start);
112
- firstTick = ceilingToNearest start tickSp;
113
- lastTick = ceilingToNearest end tickSp;
114
- n = floor ((end - firstTick) / tickSp) + 1;
115
- ys = iterate n ((+) tickSp) firstTick;
116
- -- avoid redundant start and end points
117
- ys = match firstTick > start as {
118
- True -> start : ys;
119
- False -> ys
120
- };
121
- ys = match lastTick > end as {
122
- True -> concat2 ys [lastTick];
123
- False -> ys
124
- };
125
- ps = map (mkPoint orient x) ys;
126
- ax = Group [
127
- Line (head ps) (last ps) axisColour axisStrokeWidth,
128
- Polymarkers ps (flip map ys (compose (labelledTick orient axisColour tickLength) numToStr))
129
- ]
130
- in (ax, lastTick);
131
-
132
- -- x is position of this axis on the other axis.
133
- -- Orient -> Float -> List Cat -> GraphicsElement
134
- let catAxis orient x catValues =
135
- let ys = iterate (length catValues + 1) ((+) 1) 0;
136
- ps = map (mkPoint orient x) ys
137
- in Group [
138
- Line (head ps) (last ps) axisColour axisStrokeWidth,
139
- Polymarkers (tail ps) (map (const (tick orient axisColour tickLength)) catValues),
140
- Polymarkers (flip map (tail ps) (fun (Point x y) -> Point (x - 0.5) y)) (map (label orient -0.5 0) catValues)
141
- ];
142
-
143
- -- Float -> Float -> Float -> Float -> List GraphicsElement -> GraphicsElement
144
- let viewport x_start x_finish y_finish margin gs =
145
- Viewport 0 0 (x_finish - x_start) y_finish backgroundColour margin
146
- (Scale 1 1) (Translate (0 - x_start) 0) (Group gs);
147
-
148
- -- Plot a map of x values to lists of (categorical value, y value) pairs. Importantly, assume all data is uniform
149
- -- (categorical keys are the same for each x value and are ordered the same each time).
150
- -- Bool -> Colours -> Float -> List (Float, List (Cat, Float)) -> GraphicsElement
151
- let lineChart withAxes colours x_start data =
152
- let xs = map fst data;
153
- nCat = length (snd (head data));
154
- -- (Int, Colour) -> GraphicsElement
155
- let plot (n, colour) =
156
- let ps = map (fun (x, kvs) -> Point x (snd (nth n kvs))) data
157
- in Group [
158
- Polyline ps colour 1,
159
- Polymarkers ps (repeat (length ps) (Circle 0 0 markerRadius colour))
160
- ];
161
- -- List GraphicsElement
162
- let lines = zipWith (curry plot) (iterate nCat ((+) 1) 0) colours;
163
- x_finish = last xs;
164
- y_finish = maximum (flip map data (fun (_, kvs) -> maximum (map snd kvs)))
165
- in match withAxes as {
166
- True ->
167
- let (x_axis, x_finish) = axis Horiz 0 x_start x_finish;
168
- (y_axis, y_finish') = axis Vert x_start 0 y_finish
169
- in viewport x_start x_finish y_finish' defaultMargin (x_axis : y_axis : lines);
170
- False -> viewport x_start x_finish y_finish 0 lines
171
- };
172
-
173
- -- Plot a chart of categorical values on the x-axis and renderings of the corresponding a-value on the y-axis.
174
- -- (Colours -> List a -> GraphicsElement) -> Bool -> Colours -> Float -> List (Cat, a) -> GraphicsElement
175
- let categoricalChart plotValue withAxes colours sep data =
176
- let gs = stackRight sep (plotValue colours (map snd data));
177
- w = length gs;
178
- h = maximum (map height gs)
179
- in match withAxes as {
180
- True ->
181
- let x_axis = catAxis Horiz 0 (map fst data);
182
- (y_axis, h') = axis Vert 0 0 h
183
- in viewport 0 w h' defaultMargin (concat2 gs [x_axis, y_axis]); -- axes on top
184
- False -> viewport 0 w h 0 gs
185
- };
186
-
187
- -- Colours -> List a -> GraphicsElement
188
- let rects colours ns =
189
- zipWith (fun colour n -> Rect 0 0 1 n colour) colours ns;
190
-
191
- -- First component of data (categorical value) currently ignored; values just mapped positionally to colors.
192
- -- Can we use Group instead of Viewport here?
193
- -- Colours -> List (a, Num) -> GraphicsElement
194
- let stackedBar colours ns =
195
- let heights = map snd ns;
196
- subtotals = scanl1 (+) 0 heights;
197
- dims = zip (0 : subtotals) heights;
198
- rects = map
199
- (fun ((y, height), colour) -> Rect 0 y 1 height colour)
200
- (zip dims colours)
201
- in Viewport 0 0 1 (last subtotals) "none" 0 (Scale 1 1) (Translate 0 0) (Group rects);
202
-
203
- -- Bool -> Colours -> Float -> List (a, Float) -> GraphicsElement
204
- let barChart = categoricalChart rects;
205
-
206
- -- For each categorical value of type a, plot a bar chart for the corresponding b-indexed data.
207
- -- Bool -> Colours -> Float -> List (a, List (b, Float)) -> GraphicsElement
208
- let groupedBarChart = categoricalChart (compose map (flip (barChart False) 0));
209
-
210
- -- See stackedBar for strong (unjustified) assumption about uniformity of data.
211
- -- Bool -> Colours -> Num -> List (a, List (b, Num)) -> GraphicsElement
212
- let stackedBarChart = categoricalChart (compose map stackedBar);
213
-
214
- -- Bit of a hack, but how text fits into our model is a bit unclear at the moment.
215
- -- Str -> GraphicsElement -> GraphicsElement
216
- let caption str (Viewport x y w h fill margin scale translate g) =
217
- let g' = Group [
218
- String (x + w / 2) -2 str "middle" "hanging",
219
- Viewport 0 0 w h fill margin scale translate g
220
- ]
221
- in Viewport x y w h backgroundColour (defaultMargin / 2 + 4) (Scale 1 1) (Translate 0 0) g';