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
11
11
import org.jetbrains.kotlinx.dataframe.api.isList
12
12
import org.jetbrains.kotlinx.dataframe.api.name
13
13
import org.jetbrains.kotlinx.dataframe.api.rows
14
- import org.jetbrains.kotlinx.dataframe.api.toDataFrame
14
+ import org.jetbrains.kotlinx.dataframe.api.take
15
15
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
16
16
import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
17
17
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
@@ -68,7 +68,7 @@ internal fun KlaxonJson.encodeRowWithMetadata(
68
68
69
69
is FrameColumn <* > -> {
70
70
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)
72
72
obj(
73
73
DATA to data,
74
74
METADATA to obj(
@@ -205,7 +205,7 @@ internal fun KlaxonJson.encodeDataFrameWithMetadata(
205
205
NCOL to frame.columnsCount()
206
206
),
207
207
KOTLIN_DATAFRAME to encodeFrameWithMetadata(
208
- frame.rows(). take(rowLimit).toDataFrame( ),
208
+ frame.take(rowLimit),
209
209
rowLimit = nestedRowLimit
210
210
),
211
211
)
Original file line number Diff line number Diff line change 1
1
package org.jetbrains.kotlinx.dataframe.jupyter
2
2
3
3
import 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
6
5
import org.jetbrains.kotlinx.dataframe.impl.io.encodeFrame
7
6
import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData
8
7
import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
@@ -71,7 +70,7 @@ internal inline fun <reified T : Any> JupyterHtmlRenderer.render(
71
70
" nrow" to df.size.nrow,
72
71
" ncol" to df.size.ncol,
73
72
" columns" to df.columnNames(),
74
- " kotlin_dataframe" to encodeFrame(df.rows(). take(limit).toDataFrame( )),
73
+ " kotlin_dataframe" to encodeFrame(df.take(limit)),
75
74
)
76
75
}.toJsonString()
77
76
} else {
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ import org.jetbrains.kotlinx.dataframe.api.indices
11
11
import org.jetbrains.kotlinx.dataframe.api.isList
12
12
import org.jetbrains.kotlinx.dataframe.api.name
13
13
import org.jetbrains.kotlinx.dataframe.api.rows
14
- import org.jetbrains.kotlinx.dataframe.api.toDataFrame
14
+ import org.jetbrains.kotlinx.dataframe.api.take
15
15
import org.jetbrains.kotlinx.dataframe.columns.ColumnGroup
16
16
import org.jetbrains.kotlinx.dataframe.columns.ColumnKind
17
17
import org.jetbrains.kotlinx.dataframe.columns.FrameColumn
@@ -68,7 +68,7 @@ internal fun KlaxonJson.encodeRowWithMetadata(
68
68
69
69
is FrameColumn <* > -> {
70
70
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)
72
72
obj(
73
73
DATA to data,
74
74
METADATA to obj(
@@ -205,7 +205,7 @@ internal fun KlaxonJson.encodeDataFrameWithMetadata(
205
205
NCOL to frame.columnsCount()
206
206
),
207
207
KOTLIN_DATAFRAME to encodeFrameWithMetadata(
208
- frame.rows(). take(rowLimit).toDataFrame( ),
208
+ frame.take(rowLimit),
209
209
rowLimit = nestedRowLimit
210
210
),
211
211
)
Original file line number Diff line number Diff line change 1
1
package org.jetbrains.kotlinx.dataframe.jupyter
2
2
3
3
import 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
6
5
import org.jetbrains.kotlinx.dataframe.impl.io.encodeFrame
7
6
import org.jetbrains.kotlinx.dataframe.io.DataFrameHtmlData
8
7
import org.jetbrains.kotlinx.dataframe.io.DisplayConfiguration
@@ -71,7 +70,7 @@ internal inline fun <reified T : Any> JupyterHtmlRenderer.render(
71
70
" nrow" to df.size.nrow,
72
71
" ncol" to df.size.ncol,
73
72
" columns" to df.columnNames(),
74
- " kotlin_dataframe" to encodeFrame(df.rows(). take(limit).toDataFrame( )),
73
+ " kotlin_dataframe" to encodeFrame(df.take(limit)),
75
74
)
76
75
}.toJsonString()
77
76
} else {
You can’t perform that action at this time.
0 commit comments