Merge branch 'master' of github.com:JetBrains/lets-plot

base-portable/src/commonMain/kotlin/jetbrains/datalore/base/gcommon/collect/Iterables.kt

@@ -21,88 +21,14 @@
 
 package jetbrains.datalore.base.gcommon.collect
 
-import jetbrains.datalore.base.function.Predicate
-
 object Iterables {
  private fun checkNonNegative(position: Int) {
  if (position < 0) {
  throw IndexOutOfBoundsException(position.toString())
  }
  }
 
- fun <T> toList(iterable: Iterable<T>): List<T> {
- return iterable.toList()
- }
-
- fun size(iterable: Iterable<*>): Int {
- return iterable.count()
- }
-
  fun isEmpty(iterable: Iterable<*>): Boolean {
  return (iterable as? Collection<*>)?.isEmpty() ?: !iterable.iterator().hasNext()
  }
-
- fun <T> filter(unfiltered: Iterable<T>, retainIfTrue: Predicate<in T>): Iterable<T> {
- return unfiltered.filter(retainIfTrue)
- }
-
- fun <T> all(iterable: Iterable<T>, predicate: Predicate<in T>): Boolean {
- return iterable.all(predicate)
- }
-
- fun <T> concat(a: Iterable<T>, b: Iterable<T>): Iterable<T> {
- return a + b
- }
-
- operator fun <T> get(iterable: Iterable<T>, position: Int): T {
- checkNonNegative(position)
- if (iterable is List<*>) {
- return (iterable as List<T>)[position]
- }
-
- val it = iterable.iterator()
- for (i in 0..position) {
- if (i == position) {
- return it.next()
- }
- it.next()
- }
- throw IndexOutOfBoundsException(position.toString())
- }
-
- operator fun <T> get(iterable: Iterable<T>, position: Int, defaultValue: T): T {
- checkNonNegative(position)
- if (iterable is List<*>) {
- val list = iterable as List<T>
- return if (position < list.size) list[position] else defaultValue
- }
- val it = iterable.iterator()
- var i = 0
- while (i <= position && it.hasNext()) {
- if (i == position) {
- return it.next()
- }
- it.next()
- i++
- }
- return defaultValue
- }
-
- fun <T> find(iterable: Iterable<T>, predicate: Predicate<in T>, defaultValue: T): T {
- return iterable.find(predicate) ?: defaultValue
- }
-
- fun <T> getLast(iterable: Iterable<T>): T {
- return iterable.last()
- }
-
- internal fun toArray(iterable: Iterable<*>): Array<*> {
- val collection: Collection<*>
- if (iterable is Collection<*>) {
- collection = iterable
- } else {
- collection = iterable.toList()
- }
- return collection.toTypedArray()
- }
 }

base-portable/src/commonMain/kotlin/jetbrains/datalore/base/gcommon/collect/Ordering.kt

@@ -42,14 +42,11 @@ abstract class Ordering<T> : Comparator<T> {
  * @return immutable sorted list
  */
  fun <E : T> sortedCopy(elements: Iterable<E>): List<E> {
- @Suppress("UNCHECKED_CAST")
- val array = Iterables.toArray(elements) as Array<E>
- array.sortWith(object : Comparator<E> {
+ return elements.sortedWith(object : Comparator<E> {
  override fun compare(a: E, b: E): Int {
  return this@Ordering.compare(a, b)
  }
  })
- return array.toList()
  }
 
  fun reverse(): Ordering<T> {