@@ -261,31 +261,31 @@ public inline fun <reified T> column(values: Iterable<T>): DataColumn<T> =
261
261
* @throws [UnequalColumnSizesException] if column size are not equal
262
262
* @param columns columns for [DataFrame]
263
263
*/
264
- public fun dataFrameOf (columns : Iterable <AnyBaseCol >): AnyFrame {
264
+ public fun dataFrameOf (columns : Iterable <AnyBaseCol >): DataFrame < * > {
265
265
val cols = columns.map { it.unbox() }
266
266
val nrow = if (cols.isEmpty()) 0 else cols[0 ].size
267
267
return DataFrameImpl <Unit >(cols, nrow)
268
268
}
269
269
270
270
public fun dataFrameOf (vararg header : ColumnReference <* >): DataFrameBuilder = DataFrameBuilder (header.map { it.name() })
271
271
272
- public fun dataFrameOf (vararg columns : AnyBaseCol ): AnyFrame = dataFrameOf(columns.asIterable())
272
+ public fun dataFrameOf (vararg columns : AnyBaseCol ): DataFrame < * > = dataFrameOf(columns.asIterable())
273
273
274
274
@Interpretable(" DataFrameOf0" )
275
275
public fun dataFrameOf (vararg header : String ): DataFrameBuilder = dataFrameOf(header.toList())
276
276
277
- public inline fun <reified C > dataFrameOf (vararg header : String , fill : (String ) -> Iterable <C >): AnyFrame =
277
+ public inline fun <reified C > dataFrameOf (vararg header : String , fill : (String ) -> Iterable <C >): DataFrame < * > =
278
278
dataFrameOf(header.asIterable(), fill)
279
279
280
280
public fun dataFrameOf (header : Iterable <String >): DataFrameBuilder = DataFrameBuilder (header.asList())
281
281
282
- public fun dataFrameOf (vararg columns : Pair <String , List <Any ?>>): AnyFrame =
282
+ public fun dataFrameOf (vararg columns : Pair <String , List <Any ?>>): DataFrame < * > =
283
283
columns.map { it.second.toColumn(it.first, Infer .Type ) }.toDataFrame()
284
284
285
- public fun dataFrameOf (header : Iterable <String >, values : Iterable <Any ?>): AnyFrame =
285
+ public fun dataFrameOf (header : Iterable <String >, values : Iterable <Any ?>): DataFrame < * > =
286
286
dataFrameOf(header).withValues(values)
287
287
288
- public inline fun <T , reified C > dataFrameOf (header : Iterable <T >, fill : (T ) -> Iterable <C >): AnyFrame =
288
+ public inline fun <T , reified C > dataFrameOf (header : Iterable <T >, fill : (T ) -> Iterable <C >): DataFrame < * > =
289
289
header.map { value ->
290
290
fill(value).asList().let {
291
291
DataColumn .create(value.toString(), it)
@@ -296,9 +296,9 @@ public fun dataFrameOf(header: CharProgression): DataFrameBuilder = dataFrameOf(
296
296
297
297
public class DataFrameBuilder (private val header : List <String >) {
298
298
299
- public operator fun invoke (vararg columns : AnyCol ): AnyFrame = invoke(columns.asIterable())
299
+ public operator fun invoke (vararg columns : AnyCol ): DataFrame < * > = invoke(columns.asIterable())
300
300
301
- public operator fun invoke (columns : Iterable <AnyCol >): AnyFrame {
301
+ public operator fun invoke (columns : Iterable <AnyCol >): DataFrame < * > {
302
302
val cols = columns.asList()
303
303
require(cols.size == header.size) { " Number of columns differs from number of column names" }
304
304
return cols.mapIndexed { i, col ->
@@ -308,19 +308,19 @@ public class DataFrameBuilder(private val header: List<String>) {
308
308
309
309
@Refine
310
310
@Interpretable(" DataFrameBuilderInvoke0" )
311
- public operator fun invoke (vararg values : Any? ): AnyFrame = withValues(values.asIterable())
311
+ public operator fun invoke (vararg values : Any? ): DataFrame < * > = withValues(values.asIterable())
312
312
313
313
@JvmName(" invoke1" )
314
- internal fun withValues (values : Iterable <Any ?>): AnyFrame =
314
+ internal fun withValues (values : Iterable <Any ?>): DataFrame < * > =
315
315
withValuesImpl(header, values.asList()).map { (name, values) ->
316
316
DataColumn .createWithTypeInference(name, values)
317
317
}.toDataFrame()
318
318
319
- public operator fun invoke (args : Sequence <Any ?>): AnyFrame = invoke(* args.toList().toTypedArray())
319
+ public operator fun invoke (args : Sequence <Any ?>): DataFrame < * > = invoke(* args.toList().toTypedArray())
320
320
321
- public fun withColumns (columnBuilder : (String ) -> AnyCol ): AnyFrame = header.map(columnBuilder).toDataFrame()
321
+ public fun withColumns (columnBuilder : (String ) -> AnyCol ): DataFrame < * > = header.map(columnBuilder).toDataFrame()
322
322
323
- public inline operator fun <reified T > invoke (crossinline valuesBuilder : (String ) -> Iterable <T >): AnyFrame =
323
+ public inline operator fun <reified T > invoke (crossinline valuesBuilder : (String ) -> Iterable <T >): DataFrame < * > =
324
324
withColumns { name ->
325
325
valuesBuilder(name).let {
326
326
DataColumn .create(
@@ -330,7 +330,7 @@ public class DataFrameBuilder(private val header: List<String>) {
330
330
}
331
331
}
332
332
333
- public inline fun <reified C > fill (nrow : Int , value : C ): AnyFrame =
333
+ public inline fun <reified C > fill (nrow : Int , value : C ): DataFrame < * > =
334
334
withColumns { name ->
335
335
DataColumn .createValueColumn(
336
336
name = name,
@@ -339,17 +339,17 @@ public class DataFrameBuilder(private val header: List<String>) {
339
339
)
340
340
}
341
341
342
- public inline fun <reified C > nulls (nrow : Int ): AnyFrame = fill<C ?>(nrow, null )
342
+ public inline fun <reified C > nulls (nrow : Int ): DataFrame < * > = fill<C ?>(nrow, null )
343
343
344
- public inline fun <reified C > fillIndexed (nrow : Int , crossinline init : (Int , String ) -> C ): AnyFrame =
344
+ public inline fun <reified C > fillIndexed (nrow : Int , crossinline init : (Int , String ) -> C ): DataFrame < * > =
345
345
withColumns { name ->
346
346
DataColumn .create(
347
347
name,
348
348
List (nrow) { init (it, name) },
349
349
)
350
350
}
351
351
352
- public inline fun <reified C > fill (nrow : Int , crossinline init : (Int ) -> C ): AnyFrame =
352
+ public inline fun <reified C > fill (nrow : Int , crossinline init : (Int ) -> C ): DataFrame < * > =
353
353
withColumns { name ->
354
354
DataColumn .create(
355
355
name = name,
@@ -366,23 +366,23 @@ public class DataFrameBuilder(private val header: List<String>) {
366
366
)
367
367
}
368
368
369
- public fun randomInt (nrow : Int ): AnyFrame = fillNotNull(nrow) { Random .nextInt() }
369
+ public fun randomInt (nrow : Int ): DataFrame < * > = fillNotNull(nrow) { Random .nextInt() }
370
370
371
- public fun randomInt (nrow : Int , range : IntRange ): AnyFrame = fillNotNull(nrow) { Random .nextInt(range) }
371
+ public fun randomInt (nrow : Int , range : IntRange ): DataFrame < * > = fillNotNull(nrow) { Random .nextInt(range) }
372
372
373
- public fun randomDouble (nrow : Int ): AnyFrame = fillNotNull(nrow) { Random .nextDouble() }
373
+ public fun randomDouble (nrow : Int ): DataFrame < * > = fillNotNull(nrow) { Random .nextDouble() }
374
374
375
- public fun randomDouble (nrow : Int , range : ClosedRange <Double >): AnyFrame =
375
+ public fun randomDouble (nrow : Int , range : ClosedRange <Double >): DataFrame < * > =
376
376
fillNotNull(nrow) { Random .nextDouble(range.start, range.endInclusive) }
377
377
378
- public fun randomFloat (nrow : Int ): AnyFrame = fillNotNull(nrow) { Random .nextFloat() }
378
+ public fun randomFloat (nrow : Int ): DataFrame < * > = fillNotNull(nrow) { Random .nextFloat() }
379
379
380
- public fun randomLong (nrow : Int ): AnyFrame = fillNotNull(nrow) { Random .nextLong() }
380
+ public fun randomLong (nrow : Int ): DataFrame < * > = fillNotNull(nrow) { Random .nextLong() }
381
381
382
- public fun randomLong (nrow : Int , range : ClosedRange <Long >): AnyFrame =
382
+ public fun randomLong (nrow : Int , range : ClosedRange <Long >): DataFrame < * > =
383
383
fillNotNull(nrow) { Random .nextLong(range.start, range.endInclusive) }
384
384
385
- public fun randomBoolean (nrow : Int ): AnyFrame = fillNotNull(nrow) { Random .nextBoolean() }
385
+ public fun randomBoolean (nrow : Int ): DataFrame < * > = fillNotNull(nrow) { Random .nextBoolean() }
386
386
}
387
387
388
388
/* *
@@ -408,7 +408,7 @@ public class DynamicDataFrameBuilder {
408
408
return uniqueName
409
409
}
410
410
411
- public fun toDataFrame (): AnyFrame = dataFrameOf(cols)
411
+ public fun toDataFrame (): DataFrame < * > = dataFrameOf(cols)
412
412
}
413
413
414
414
/* *
0 commit comments