Skip to content

Commit 1326faf

Browse files
authored
Make Kotlin collection example clearer (#12)
* Make Kotlin collection example clearer * Use val over var in collection example
1 parent 02c2237 commit 1326faf

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

code/collections.kt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
var datas = listOf(
1+
val datas = listOf(
22
SensorData(1, "A", 2.89),
33
SensorData(2, "B", 12.01),
44
SensorData(3, "B", 11.89),
55
SensorData(4, "A", 3.11),
66
SensorData(5, "A", -456.0)
77
)
88

9-
var avgs = datas
10-
.filter { it.value > -50.0 }
11-
.groupBy { it.location }
12-
.map { g ->
13-
Location(g.key,
14-
g.value.map { it.value }.average()) }
15-
9+
val avgs = datas
10+
.filter { it.value > -50.0 }
11+
.groupBy(SensorData::location)
12+
.map { Location(it.key, it.value.map(SensorData::value).average()) }
13+
1614
// (location=A, value=3.0)
1715
// (location=B, value=11.95)

index.html

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -398,20 +398,18 @@
398398
var multiplied = numbers.Select(e => 3 * e);
399399
// [ 60, 57, 21, 36 ]</code></pre></div></div></div><div class="case"><div class="name">Sort</div><div class="pair"><div class="card"><div class="lang">Kotlin</div><pre class="code"><code>val ordered = listOf(1, 5, 3, 12, 2).sorted()
400400
// [ 1, 2, 3, 5, 12 ]</code></pre></div><div class="card"><div class="lang">C#</div><pre class="code"><code>var ordered = new[] { 1, 5, 3, 12, 2 }.OrderBy(i => i);
401-
// [ 1, 2, 3, 5, 12 ]</code></pre></div></div></div><div class="case"><div class="name">Filter / GroupBy / Average</div><div class="pair"><div class="card"><div class="lang">Kotlin</div><pre class="code"><code>var datas = listOf(
401+
// [ 1, 2, 3, 5, 12 ]</code></pre></div></div></div><div class="case"><div class="name">Filter / GroupBy / Average</div><div class="pair"><div class="card"><div class="lang">Kotlin</div><pre class="code"><code>val datas = listOf(
402402
SensorData(1, "A", 2.89),
403403
SensorData(2, "B", 12.01),
404404
SensorData(3, "B", 11.89),
405405
SensorData(4, "A", 3.11),
406406
SensorData(5, "A", -456.0)
407407
)
408408

409-
var avgs = datas
410-
.filter { it.value > -50.0 }
411-
.groupBy { it.location }
412-
.map { g ->
413-
Location(g.key,
414-
g.value.map { it.value }.average()) }
409+
val avgs = datas
410+
.filter { it.value > -50.0 }
411+
.groupBy(SensorData::location)
412+
.map { Location(it.key, it.value.map(SensorData::value).average()) }
415413

416414
// (location=A, value=3.0)
417415
// (location=B, value=11.95)</code></pre></div><div class="card"><div class="lang">C#</div><pre class="code"><code>var datas = new List&lt;SensorData>

0 commit comments

Comments
 (0)