Skip to content

Commit f31cb7a

Browse files
committed
Upgrade ihaskell-notebook to v003
ihaskell-widgets API change IHaskell/IHaskell#1525
1 parent 1033d22 commit f31cb7a

File tree

2 files changed

+26
-65
lines changed

2 files changed

+26
-65
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# docker run --rm -p 8888:8888 --name learn-you-a-haskell learn-you-a-haskell:latest jupyter lab --ServerApp.token=''
77
#
88

9-
FROM ghcr.io/ihaskell/ihaskell-notebook:master@sha256:d6d694711a3930be5439bfff3d82c3ff214ae0d13a1a8c9af104084d5ac3b89b
9+
FROM ghcr.io/ihaskell/ihaskell-notebook:master@sha256:3619fe7a14c8c17e196760377ef3500a1f8db32c9c51ce83c41b4e213a97f1bf
1010

1111
USER root
1212

notebook_extra/WidgetRevival.ipynb

+25-64
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,9 @@
4242
},
4343
{
4444
"cell_type": "code",
45-
"execution_count": 1,
45+
"execution_count": null,
4646
"metadata": {},
47-
"outputs": [
48-
{
49-
"data": {
50-
"application/vnd.jupyter.widget-view+json": {
51-
"model_id": "be93de90-c346-4955-9e83-ce5cb7b4e746",
52-
"version_major": 2,
53-
"version_minor": 0
54-
}
55-
},
56-
"metadata": {},
57-
"output_type": "display_data"
58-
},
59-
{
60-
"data": {
61-
"application/vnd.jupyter.widget-view+json": {
62-
"model_id": "82697020-e4c2-4a71-b28e-96ec8515dd23",
63-
"version_major": 2,
64-
"version_minor": 0
65-
}
66-
},
67-
"metadata": {},
68-
"output_type": "display_data"
69-
}
70-
],
47+
"outputs": [],
7148
"source": [
7249
"import Graphics.Rendering.Chart\n",
7350
"import IHaskell.Display.Widgets\n",
@@ -85,15 +62,15 @@
8562
"integralTrapezoid _ = 0\n",
8663
"\n",
8764
"sliderRange <- mkFloatRangeSlider\n",
88-
"setField sliderRange MinFloat (fst domain)\n",
89-
"setField sliderRange MaxFloat (snd domain)\n",
90-
"setField sliderRange StepFloat (Just grain)\n",
91-
"setField sliderRange FloatPairValue (fst domain, snd domain)\n",
65+
"setField @MinFloat sliderRange (fst domain)\n",
66+
"setField @MaxFloat sliderRange (snd domain)\n",
67+
"setField @StepFloat sliderRange (Just grain)\n",
68+
"setField @FloatPairValue sliderRange (fst domain, snd domain)\n",
9269
"\n",
9370
"outChart <- mkOutput\n",
9471
"\n",
9572
"drawChart = do \n",
96-
" (rangeMin, rangeMax) <- getField sliderRange FloatPairValue\n",
73+
" (rangeMin, rangeMax) <- getField @FloatPairValue sliderRange\n",
9774
" let \n",
9875
" pts = [(x, f x) | x <- [fst domain, fst domain + grain .. snd domain]] \n",
9976
" ptsRange = [(x,y) | (x,y) <- pts, x >= rangeMin, x <= rangeMax]\n",
@@ -103,9 +80,9 @@
10380
" [ toPlot $ def & plot_lines_values .~ [pts]\n",
10481
" , toPlot $ def & plot_fillbetween_values .~ [(x,(0.0,y)) | (x,y) <- ptsRange]\n",
10582
" ]\n",
106-
" setField outChart Outputs [OutputData displayCaption, OutputData displayChart]\n",
83+
" setField @Outputs outChart [OutputData displayCaption, OutputData displayChart]\n",
10784
" \n",
108-
"setField sliderRange ChangeHandler drawChart\n",
85+
"setField @ChangeHandler sliderRange drawChart\n",
10986
"\n",
11087
"sliderRange\n",
11188
"outChart\n",
@@ -127,55 +104,39 @@
127104
},
128105
{
129106
"cell_type": "code",
130-
"execution_count": 2,
107+
"execution_count": null,
131108
"metadata": {},
132-
"outputs": [
133-
{
134-
"data": {
135-
"application/vnd.jupyter.widget-view+json": {
136-
"model_id": "42d8c25d-9542-490c-a843-b284e2482e2d",
137-
"version_major": 2,
138-
"version_minor": 0
139-
}
140-
},
141-
"metadata": {},
142-
"output_type": "display_data"
143-
},
144-
{
145-
"data": {
146-
"application/vnd.jupyter.widget-view+json": {
147-
"model_id": "6fd1b872-30e4-4c07-b864-2f293d13dca8",
148-
"version_major": 2,
149-
"version_minor": 0
150-
}
151-
},
152-
"metadata": {},
153-
"output_type": "display_data"
154-
}
155-
],
109+
"outputs": [],
156110
"source": [
157111
"import Diagrams.Prelude\n",
158112
"import Diagrams.TwoD.Apollonian\n",
159113
"import IHaskell.Display.Widgets\n",
160114
"\n",
161115
"sliderApollo <- mkFloatSlider\n",
162-
"setField sliderApollo MinFloat 3.0\n",
163-
"setField sliderApollo MaxFloat 9.0\n",
164-
"setField sliderApollo StepFloat (Just 0.1)\n",
165-
"setField sliderApollo FloatValue 6.0\n",
116+
"setField @MinFloat sliderApollo 3.0\n",
117+
"setField @MaxFloat sliderApollo 9.0\n",
118+
"setField @StepFloat sliderApollo (Just 0.1)\n",
119+
"setField @FloatValue sliderApollo 6.0\n",
166120
"\n",
167121
"outApollo <- mkOutput\n",
168122
"\n",
169123
"drawApollo = do\n",
170-
" val <- getField sliderApollo FloatValue\n",
124+
" val <- getField @FloatValue sliderApollo\n",
171125
" replaceOutput outApollo $ diagram $ apollonianGasket 0.01 2 4 val\n",
172126
"\n",
173-
"setField sliderApollo ChangeHandler drawApollo\n",
127+
"setField @ChangeHandler sliderApollo drawApollo\n",
174128
"\n",
175129
"sliderApollo\n",
176130
"outApollo\n",
177131
"drawApollo"
178132
]
133+
},
134+
{
135+
"cell_type": "code",
136+
"execution_count": null,
137+
"metadata": {},
138+
"outputs": [],
139+
"source": []
179140
}
180141
],
181142
"metadata": {
@@ -190,7 +151,7 @@
190151
"mimetype": "text/x-haskell",
191152
"name": "haskell",
192153
"pygments_lexer": "Haskell",
193-
"version": "8.10.4"
154+
"version": "9.8.4"
194155
}
195156
},
196157
"nbformat": 4,

0 commit comments

Comments
 (0)