Skip to content

Commit 76665d5

Browse files
committed
Update examples to use nextInt(IntRange)
1 parent e47b384 commit 76665d5

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/Create.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import org.jetbrains.kotlinx.dataframe.api.value
2929
import org.jetbrains.kotlinx.dataframe.explainer.TransformDataFrameExpressions
3030
import org.junit.Test
3131
import java.io.File
32+
import kotlin.random.nextInt
3233
import kotlin.random.Random as KotlinRandom
3334

3435
class Create : TestBase() {
@@ -234,7 +235,7 @@ class Create : TestBase() {
234235
"productId" from { "P${1000 + it}" }
235236
"category" from { categories.random() }
236237
"price" from { Random.nextDouble(10.0, 500.0) }
237-
"inStock" from { Random.nextInt(0, 100) }
238+
"inStock" from { Random.nextInt(0..100) }
238239
}
239240
// SampleEnd
240241
}
@@ -257,14 +258,14 @@ class Create : TestBase() {
257258
// Column Group
258259
"manufacturer" {
259260
"country" from { listOf("USA", "China", "Germany", "Japan").random() }
260-
"yearEstablished" from { Random.nextInt(1950, 2020) }
261+
"yearEstablished" from { Random.nextInt(1950..2020) }
261262
}
262263

263264
// Frame Column
264265
"reviews" from {
265-
val reviewCount = Random.nextInt(0, 8)
266+
val reviewCount = Random.nextInt(0..7)
266267
(0 until reviewCount).toDataFrame {
267-
val ratings: DataColumn<Int> = expr { Random.nextInt(1, 6) }
268+
val ratings: DataColumn<Int> = expr { Random.nextInt(1..5) }
268269
val comments = ratings.map {
269270
when (it) {
270271
5 -> listOf("Amazing quality!", "Best purchase ever!", "Highly recommend!", "Absolutely perfect!")
@@ -275,7 +276,7 @@ class Create : TestBase() {
275276
}.random()
276277
}
277278

278-
"author" from { "User${Random.nextInt(1000, 9999)}" }
279+
"author" from { "User${Random.nextInt(1000..10000)}" }
279280
ratings into "rating"
280281
comments into "comment"
281282
}

docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Create.createNestedRandomDataFrame.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -565,56 +565,56 @@
565565
{ name: "<span title=\"category: String\">category</span>", children: [], rightAlign: false, values: ["Clothing","Electronics","Clothing","Clothing","Books","Electronics","Books"] },
566566
{ name: "<span title=\"price: Double\">price</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">489.054329</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">41.332037</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">339.555785</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">367.194829</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">471.963710</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">65.576163</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">103.849144</span></span>"] },
567567
{ name: "<span title=\"country: String\">country</span>", children: [], rightAlign: false, values: ["China","Japan","China","China","China","China","Germany"] },
568-
{ name: "<span title=\"yearEstablished: Int\">yearEstablished</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">1986</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1986</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2006</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1981</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2015</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2008</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1987</span></span>"] },
569-
{ name: "<span title=\"manufacturer: DataRow<*>\">manufacturer</span>", children: [3, 4], rightAlign: false, values: ["<span class=\"formatted\" title=\"country: China\nyearEstablished: 1986\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>China<span class=\"structural\">, </span><span class=\"structural\">yearEstablished: </span><span class=\"numbers\"><span class=\"structural\">...</span></span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"country: Japan\nyearEstablished: 1986\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>Japan<span class=\"structural\">, </span><span class=\"structural\">yearEstablished: </span><span class=\"numbers\"><span class=\"structural\">...</span></span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"country: China\nyearEstablished: 2006\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>China<span class=\"structural\">, </span><span class=\"structural\">yearEstablished: </span><span class=\"numbers\"><span class=\"structural\">...</span></span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"country: China\nyearEstablished: 1981\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>China<span class=\"structural\">, </span><span class=\"structural\">yearEstablished: </span><span class=\"numbers\"><span class=\"structural\">...</span></span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"country: China\nyearEstablished: 2015\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>China<span class=\"structural\">, </span><span class=\"structural\">yearEstablished: </span><span class=\"numbers\"><span class=\"structural\">...</span></span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"country: China\nyearEstablished: 2008\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>China<span class=\"structural\">, </span><span class=\"structural\">yearEstablished: </span><span class=\"numbers\"><span class=\"structural\">...</span></span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"country: Germany\nyearEstablished: 1987\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>Germany<span class=\"structural\">, </span><span class=\"structural\">yearEstablished...</span><span class=\"structural\"> }</span></span>"] },
568+
{ name: "<span title=\"yearEstablished: Int\">yearEstablished</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">1951</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1998</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2012</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1972</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1984</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1997</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1995</span></span>"] },
569+
{ name: "<span title=\"manufacturer: DataRow<*>\">manufacturer</span>", children: [3, 4], rightAlign: false, values: ["<span class=\"formatted\" title=\"country: China\nyearEstablished: 1951\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>China<span class=\"structural\">, </span><span class=\"structural\">yearEstablished: </span><span class=\"numbers\"><span class=\"structural\">...</span></span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"country: Japan\nyearEstablished: 1998\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>Japan<span class=\"structural\">, </span><span class=\"structural\">yearEstablished: </span><span class=\"numbers\"><span class=\"structural\">...</span></span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"country: China\nyearEstablished: 2012\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>China<span class=\"structural\">, </span><span class=\"structural\">yearEstablished: </span><span class=\"numbers\"><span class=\"structural\">...</span></span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"country: China\nyearEstablished: 1972\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>China<span class=\"structural\">, </span><span class=\"structural\">yearEstablished: </span><span class=\"numbers\"><span class=\"structural\">...</span></span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"country: China\nyearEstablished: 1984\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>China<span class=\"structural\">, </span><span class=\"structural\">yearEstablished: </span><span class=\"numbers\"><span class=\"structural\">...</span></span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"country: China\nyearEstablished: 1997\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>China<span class=\"structural\">, </span><span class=\"structural\">yearEstablished: </span><span class=\"numbers\"><span class=\"structural\">...</span></span><span class=\"structural\"> }</span></span>","<span class=\"formatted\" title=\"country: Germany\nyearEstablished: 1995\"><span class=\"structural\">{ </span><span class=\"structural\">country: </span>Germany<span class=\"structural\">, </span><span class=\"structural\">yearEstablished...</span><span class=\"structural\"> }</span></span>"] },
570570
{ name: "<span title=\"reviews: DataFrame<*>\">reviews</span>", children: [], rightAlign: false, values: [{ frameId: 1, value: "<b>DataFrame 7 x 3</b>" },{ frameId: 2, value: "<b>DataFrame 1 x 3</b>" },{ frameId: 3, value: "<b>DataFrame 3 x 3</b>" },{ frameId: 4, value: "<b>DataFrame 1 x 3</b>" },{ frameId: 5, value: "<b>DataFrame 1 x 3</b>" },{ frameId: 6, value: "<b>DataFrame 5 x 3</b>" },{ frameId: 7, value: "<b>DataFrame 4 x 3</b>" }] },
571571
], id: 0, rootId: 0, totalRows: 7 } ) });
572572
/*-->*/
573573

574574
/*<!--*/
575-
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User7057","User5075","User2452","User3109","User5943"] },
575+
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User2982","User3295","User2521","User8279","User4899"] },
576576
{ name: "<span title=\"rating: Int\">rating</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">3</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">3</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1</span></span>"] },
577577
{ name: "<span title=\"comment: String\">comment</span>", children: [], rightAlign: false, values: ["It&#39;s okay","Not what I expected","Neither good nor bad","Not what I expected","Not worth the price"] },
578578
], id: 1, rootId: 0, totalRows: 7 } ) });
579579
/*-->*/
580580

581581
/*<!--*/
582-
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User1785"] },
582+
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User5188"] },
583583
{ name: "<span title=\"rating: Int\">rating</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">1</span></span>"] },
584584
{ name: "<span title=\"comment: String\">comment</span>", children: [], rightAlign: false, values: ["Do not buy!"] },
585585
], id: 2, rootId: 0, totalRows: 1 } ) });
586586
/*-->*/
587587

588588
/*<!--*/
589-
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User4747","User9875","User9571"] },
589+
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User7766","User5615","User5972"] },
590590
{ name: "<span title=\"rating: Int\">rating</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">3</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">4</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">5</span></span>"] },
591591
{ name: "<span title=\"comment: String\">comment</span>", children: [], rightAlign: false, values: ["Neither good nor bad","Good value for money","Highly recommend!"] },
592592
], id: 3, rootId: 0, totalRows: 3 } ) });
593593
/*-->*/
594594

595595
/*<!--*/
596-
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User6432"] },
596+
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User9297"] },
597597
{ name: "<span title=\"rating: Int\">rating</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">5</span></span>"] },
598598
{ name: "<span title=\"comment: String\">comment</span>", children: [], rightAlign: false, values: ["Absolutely perfect!"] },
599599
], id: 4, rootId: 0, totalRows: 1 } ) });
600600
/*-->*/
601601

602602
/*<!--*/
603-
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User4866"] },
603+
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User1263"] },
604604
{ name: "<span title=\"rating: Int\">rating</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>"] },
605605
{ name: "<span title=\"comment: String\">comment</span>", children: [], rightAlign: false, values: ["Could be better"] },
606606
], id: 5, rootId: 0, totalRows: 1 } ) });
607607
/*-->*/
608608

609609
/*<!--*/
610-
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User1534","User7569","User9979","User4586","User6700"] },
610+
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User6799","User1199","User6496","User2531","User2767"] },
611611
{ name: "<span title=\"rating: Int\">rating</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">3</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>"] },
612612
{ name: "<span title=\"comment: String\">comment</span>", children: [], rightAlign: false, values: ["Average quality","Disappointed","Could be better","Could be better","Could be better"] },
613613
], id: 6, rootId: 0, totalRows: 5 } ) });
614614
/*-->*/
615615

616616
/*<!--*/
617-
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User4051","User8720","User2337","User8609"] },
617+
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"author: String\">author</span>", children: [], rightAlign: false, values: ["User2143","User7435","User7399","User6613"] },
618618
{ name: "<span title=\"rating: Int\">rating</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">2</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">1</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">5</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">3</span></span>"] },
619619
{ name: "<span title=\"comment: String\">comment</span>", children: [], rightAlign: false, values: ["Disappointed","Complete waste of money","Highly recommend!","Does the job"] },
620620
], id: 7, rootId: 0, totalRows: 4 } ) });

docs/StardustDocs/resources/snippets/org.jetbrains.kotlinx.dataframe.samples.api.Create.createRandomDataFrame.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@
564564
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"productId: String\">productId</span>", children: [], rightAlign: false, values: ["P1000","P1001","P1002","P1003","P1004","P1005","P1006"] },
565565
{ name: "<span title=\"category: String\">category</span>", children: [], rightAlign: false, values: ["Clothing","Electronics","Clothing","Clothing","Books","Electronics","Books"] },
566566
{ name: "<span title=\"price: Double\">price</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">489.054329</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">41.332037</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">339.555785</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">367.194829</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">471.963710</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">65.576163</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">103.849144</span></span>"] },
567-
{ name: "<span title=\"inStock: Int\">inStock</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">7</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">10</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">51</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">50</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">59</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">45</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">42</span></span>"] },
567+
{ name: "<span title=\"inStock: Int\">inStock</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">79</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">80</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">29</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">36</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">18</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">83</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">42</span></span>"] },
568568
], id: 0, rootId: 0, totalRows: 7 } ) });
569569
/*-->*/
570570

0 commit comments

Comments
 (0)