File tree Expand file tree Collapse file tree 4 files changed +10
-12
lines changed
generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe
src/main/kotlin/org/jetbrains/kotlinx/dataframe Expand file tree Collapse file tree 4 files changed +10
-12
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ import org.jetbrains.kotlinx.dataframe.api.indices
1111import org.jetbrains.kotlinx.dataframe.api.isList
1212import org.jetbrains.kotlinx.dataframe.api.name
1313import org.jetbrains.kotlinx.dataframe.api.rows
14- import org.jetbrains.kotlinx.dataframe.api.toDataFrame
14+ import org.jetbrains.kotlinx.dataframe.api.take
1515import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
1616import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
1717import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
@@ -68,7 +68,7 @@ internal fun KlaxonJson.encodeRowWithMetadata(
6868
6969 is FrameColumn <* > -> {
7070 val data = if (rowLimit == null ) encodeFrameWithMetadata(col[index])
71- else encodeFrameWithMetadata(col[index].rows(). take(rowLimit).toDataFrame( ), rowLimit)
71+ else encodeFrameWithMetadata(col[index].take(rowLimit), rowLimit)
7272 obj(
7373 DATA to data,
7474 METADATA to obj(
@@ -205,7 +205,7 @@ internal fun KlaxonJson.encodeDataFrameWithMetadata(
205205 NCOL to frame.columnsCount()
206206 ),
207207 KOTLIN_DATAFRAME to encodeFrameWithMetadata(
208- frame.rows(). take(rowLimit).toDataFrame( ),
208+ frame.take(rowLimit),
209209 rowLimit = nestedRowLimit
210210 ),
211211 )
Original file line number Diff line number Diff line change 11package org.jetbrains.kotlinx.dataframe.jupyter
22
33import com.beust.klaxon.json
4- import org.jetbrains.kotlinx.dataframe.api.rows
5- import org.jetbrains.kotlinx.dataframe.api.toDataFrame
4+ import org.jetbrains.kotlinx.dataframe.api.take
65import org.jetbrains.kotlinx.dataframe.impl.io.encodeFrame
76import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData
87import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
@@ -71,7 +70,7 @@ internal inline fun <reified T : Any> JupyterHtmlRenderer.render(
7170 " nrow" to df.size.nrow,
7271 " ncol" to df.size.ncol,
7372 " columns" to df.columnNames(),
74- " kotlin_dataframe" to encodeFrame(df.rows(). take(limit).toDataFrame( )),
73+ " kotlin_dataframe" to encodeFrame(df.take(limit)),
7574 )
7675 }.toJsonString()
7776 } else {
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ import org.jetbrains.kotlinx.dataframe.api.indices
1111import org.jetbrains.kotlinx.dataframe.api.isList
1212import org.jetbrains.kotlinx.dataframe.api.name
1313import org.jetbrains.kotlinx.dataframe.api.rows
14- import org.jetbrains.kotlinx.dataframe.api.toDataFrame
14+ import org.jetbrains.kotlinx.dataframe.api.take
1515import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
1616import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
1717import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
@@ -68,7 +68,7 @@ internal fun KlaxonJson.encodeRowWithMetadata(
6868
6969 is FrameColumn <* > -> {
7070 val data = if (rowLimit == null ) encodeFrameWithMetadata(col[index])
71- else encodeFrameWithMetadata(col[index].rows(). take(rowLimit).toDataFrame( ), rowLimit)
71+ else encodeFrameWithMetadata(col[index].take(rowLimit), rowLimit)
7272 obj(
7373 DATA to data,
7474 METADATA to obj(
@@ -205,7 +205,7 @@ internal fun KlaxonJson.encodeDataFrameWithMetadata(
205205 NCOL to frame.columnsCount()
206206 ),
207207 KOTLIN_DATAFRAME to encodeFrameWithMetadata(
208- frame.rows(). take(rowLimit).toDataFrame( ),
208+ frame.take(rowLimit),
209209 rowLimit = nestedRowLimit
210210 ),
211211 )
Original file line number Diff line number Diff line change 11package org.jetbrains.kotlinx.dataframe.jupyter
22
33import com.beust.klaxon.json
4- import org.jetbrains.kotlinx.dataframe.api.rows
5- import org.jetbrains.kotlinx.dataframe.api.toDataFrame
4+ import org.jetbrains.kotlinx.dataframe.api.take
65import org.jetbrains.kotlinx.dataframe.impl.io.encodeFrame
76import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData
87import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
@@ -71,7 +70,7 @@ internal inline fun <reified T : Any> JupyterHtmlRenderer.render(
7170 " nrow" to df.size.nrow,
7271 " ncol" to df.size.ncol,
7372 " columns" to df.columnNames(),
74- " kotlin_dataframe" to encodeFrame(df.rows(). take(limit).toDataFrame( )),
73+ " kotlin_dataframe" to encodeFrame(df.take(limit)),
7574 )
7675 }.toJsonString()
7776 } else {
You can’t perform that action at this time.
0 commit comments