Skip to content

Commit b99f3f4

Browse files
JolanrensenJolanrensen
committed
updating from master
1 parent 7b54184 commit b99f3f4

8 files changed

+19
-19
lines changed

‎core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.junit.Test
88

99
class SelectTests : ColumnsSelectionDslTests() {
1010

11-
// @Suppress("CANDIDATE_CHOSEN_USING_OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION")
11+
@Suppress("CANDIDATE_CHOSEN_USING_OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION")
1212
@Test
1313
fun select() {
1414
// should not compile:

‎core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/select.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.junit.Test
88

99
class SelectTests : ColumnsSelectionDslTests() {
1010

11-
// @Suppress("CANDIDATE_CHOSEN_USING_OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION")
11+
@Suppress("CANDIDATE_CHOSEN_USING_OVERLOAD_RESOLUTION_BY_LAMBDA_ANNOTATION")
1212
@Test
1313
fun select() {
1414
// should not compile:

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectors.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
</details>
306306
<br>
307307
<details>
308-
<summary>df.select { name.all() }</summary>
308+
<summary>df.select { name.allCols() }</summary>
309309
<details>
310310
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
311311
<table class="dataframe" id="df_16"></table>
@@ -321,7 +321,7 @@
321321
</details>
322322
<br>
323323
<details>
324-
<summary>df.select { name.cols { !it.isColumnGroup() }.recursively() }</summary>
324+
<summary>df.select { name.colsAtAnyDepth { !it.isColumnGroup() } }</summary>
325325
<details>
326326
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
327327
<table class="dataframe" id="df_18"></table>

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsMisc.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
<br>
355355
<details>
356356
<summary>df.select {
357-
colGroup(&quot;name&quot;).last { it.name().endsWith(&quot;Name&quot;) }
357+
colGroup(&quot;name&quot;).lastCol { it.name().endsWith(&quot;Name&quot;) }
358358
}</summary>
359359
<details>
360360
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
@@ -372,7 +372,7 @@
372372
<br>
373373
<details>
374374
<summary>df.select {
375-
Person::name.single { it.name().startsWith(&quot;first&quot;) }
375+
Person::name.singleCol { it.name().startsWith(&quot;first&quot;) }
376376
}</summary>
377377
<details>
378378
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
@@ -389,7 +389,7 @@
389389
</details>
390390
<br>
391391
<details>
392-
<summary>df.select { cols { !it.isColumnGroup() }.recursively() }</summary>
392+
<summary>df.select { colsAtAnyDepth { !it.isColumnGroup() } }</summary>
393393
<details>
394394
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
395395
<table class="dataframe" id="df_26"></table>
@@ -405,7 +405,7 @@
405405
</details>
406406
<br>
407407
<details>
408-
<summary>df.select { all().recursively() }</summary>
408+
<summary>df.select { colsAtAnyDepth() }</summary>
409409
<details>
410410
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
411411
<table class="dataframe" id="df_28"></table>
@@ -421,7 +421,7 @@
421421
</details>
422422
<br>
423423
<details>
424-
<summary>df.select { cols { it.name().contains(&quot;:&quot;) }.recursively() }</summary>
424+
<summary>df.select { colsAtAnyDepth { it.name().contains(&quot;:&quot;) } }</summary>
425425
<details>
426426
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
427427
<table class="dataframe" id="df_30"></table>
@@ -437,7 +437,7 @@
437437
</details>
438438
<br>
439439
<details>
440-
<summary>df.select { colsOf&amp;lt;String&amp;gt;().rec() }</summary>
440+
<summary>df.select { colsAtAnyDepth().colsOf&amp;lt;String&amp;gt;() }</summary>
441441
<details>
442442
<summary>Input DataFrame: rowsCount = 7, columnsCount = 6</summary>
443443
<table class="dataframe" id="df_32"></table>

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsModifySet.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
</head>
178178
<body>
179179
<details>
180-
<summary>df.select { cols { !it.isColumnGroup() }.recursively().take(3) }</summary>
180+
<summary>df.select { colsAtAnyDepth { !it.isColumnGroup() }.take(3) }</summary>
181181
<details>
182182
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
183183
<table class="dataframe" id="df_0"></table>
@@ -193,7 +193,7 @@
193193
</details>
194194
<br>
195195
<details>
196-
<summary>df.select { cols { !it.isColumnGroup() }.recursively().takeLast(3) }</summary>
196+
<summary>df.select { colsAtAnyDepth { !it.isColumnGroup() }.takeLast(3) }</summary>
197197
<details>
198198
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
199199
<table class="dataframe" id="df_2"></table>
@@ -209,7 +209,7 @@
209209
</details>
210210
<br>
211211
<details>
212-
<summary>df.select { cols { !it.isColumnGroup() }.recursively().drop(3) }</summary>
212+
<summary>df.select { colsAtAnyDepth { !it.isColumnGroup() }.drop(3) }</summary>
213213
<details>
214214
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
215215
<table class="dataframe" id="df_4"></table>
@@ -225,7 +225,7 @@
225225
</details>
226226
<br>
227227
<details>
228-
<summary>df.select { cols { !it.isColumnGroup() }.recursively().dropLast(3) }</summary>
228+
<summary>df.select { colsAtAnyDepth { !it.isColumnGroup() }.dropLast(3) }</summary>
229229
<details>
230230
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
231231
<table class="dataframe" id="df_6"></table>
@@ -241,7 +241,7 @@
241241
</details>
242242
<br>
243243
<details>
244-
<summary>df.select { cols { !it.isColumnGroup() }.rec().filter { it.name().startsWith(&quot;year&quot;) } }</summary>
244+
<summary>df.select { colsAtAnyDepth { !it.isColumnGroup() }.filter { it.name().startsWith(&quot;year&quot;) } }</summary>
245245
<details>
246246
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
247247
<table class="dataframe" id="df_8"></table>
@@ -257,7 +257,7 @@
257257
</details>
258258
<br>
259259
<details>
260-
<summary>df.select { cols { !it.isColumnGroup() }.rec().except { age } }</summary>
260+
<summary>df.select { colsAtAnyDepth { !it.isColumnGroup() }.except { age } }</summary>
261261
<details>
262262
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
263263
<table class="dataframe" id="df_10"></table>

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Access.columnSelectorsUsages.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
</details>
194194
<br>
195195
<details>
196-
<summary>df.fillNaNs { colsOf&amp;lt;Double&amp;gt;().recursively() }.withZero()</summary>
196+
<summary>df.fillNaNs { colsAtAnyDepth().colsOf&amp;lt;Double&amp;gt;() }.withZero()</summary>
197197
<details>
198198
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
199199
<table class="dataframe" id="df_2"></table>

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Modify.convert.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
</details>
198198
<br>
199199
<details>
200-
<summary>df.convert { colsOf&amp;lt;String&amp;gt;().recursively() }.with { it.toCharArray().toList() }</summary>
200+
<summary>df.convert { colsAtAnyDepth().colsOf&amp;lt;String&amp;gt;() }.with { it.toCharArray().toList() }</summary>
201201
<details>
202202
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
203203
<table class="dataframe" id="df_2"></table>

‎docs/StardustDocs/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Modify.update.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
</details>
200200
<br>
201201
<details>
202-
<summary>df.update { colsOf&amp;lt;String&amp;gt;().recursively() }.with { it.uppercase() }</summary>
202+
<summary>df.update { colsAtAnyDepth().colsOf&amp;lt;String&amp;gt;() }.with { it.uppercase() }</summary>
203203
<details>
204204
<summary>Input DataFrame: rowsCount = 7, columnsCount = 5</summary>
205205
<table class="dataframe" id="df_3"></table>

0 commit comments

Comments
 (0)