Skip to content

Commit 5bfa5c3

Browse files
committed
Add DataRow receiver in DataFrame.map. Update docs.
1 parent d333c73 commit 5bfa5c3

File tree

2 files changed

+6
-5
lines changed
  • docs/StardustDocs/topics
  • src/main/kotlin/org/jetbrains/kotlinx/dataframe/api

2 files changed

+6
-5
lines changed

docs/StardustDocs/topics/map.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Creates `List`, [DataFrame](DataFrame.md) or [DataColumn](DataColumn.md) with va
77
**Map into `List`:**
88

99
```text
10-
map { transform }: List<T>
10+
map { rowExpression }: List<T>
1111
12-
transform: (DataRow) -> T
12+
rowExpression: DataRow.(DataRow) -> Value
1313
```
1414

1515
<!---FUN map-->
@@ -23,7 +23,7 @@ df.map { 2021 - it.age }
2323
**Map into `DataColumn`:**
2424

2525
```text
26-
map(columnName) { rowExpression }: DataColumn
26+
mapToColumn(columnName) { rowExpression }: DataColumn
2727
2828
rowExpression: DataRow.(DataRow) -> Value
2929
```
@@ -61,7 +61,7 @@ See [row expressions](DataRow.md#row-expressions)
6161
**Map into `DataFrame`:**
6262

6363
```kotlin
64-
map {
64+
mapToFrame {
6565
columnMapping
6666
columnMapping
6767
...

src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/map.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import org.jetbrains.kotlinx.dataframe.ColumnsContainer
55
import org.jetbrains.kotlinx.dataframe.DataColumn
66
import org.jetbrains.kotlinx.dataframe.DataFrame
77
import org.jetbrains.kotlinx.dataframe.DataRow
8+
import org.jetbrains.kotlinx.dataframe.RowExpression
89
import org.jetbrains.kotlinx.dataframe.Selector
910
import org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor
1011
import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
@@ -46,7 +47,7 @@ public fun <T, R> DataColumn<T>.map(
4647

4748
// region DataFrame
4849

49-
public fun <T, R> DataFrame<T>.map(transform: (DataRow<T>) -> R): List<R> = rows().map(transform)
50+
public fun <T, R> DataFrame<T>.map(transform: RowExpression<T, R>): List<R> = rows().map { transform(it, it) }
5051

5152
public inline fun <T, reified R> ColumnsContainer<T>.mapToColumn(
5253
name: String,

0 commit comments

Comments
 (0)