Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CU-fh2vcf - Deprecate mapN and fix zip for collections #2324

Merged
merged 11 commits into from
Mar 13, 2021
Merged

CU-fh2vcf - Deprecate mapN and fix zip for collections #2324

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cfb2e98
mapN -> zip for NonEmptyList.kt
danimontoya Mar 11, 2021
cafc3d4
mapN -> zip for NonEmptyListApply.kt
danimontoya Mar 11, 2021
0e78895
Merge branch 'master' into CU-fh2vcf-replace-mapN-with-zip
danimontoya Mar 11, 2021
86e337c
Add missing import in the example
danimontoya Mar 11, 2021
4b5efd4
Fix example
danimontoya Mar 11, 2021
687a5d1
Remove creation of intermediate lists in zip
danimontoya Mar 11, 2021
46e46b2
Update zip
danimontoya Mar 12, 2021
6dbe687
Fix map#zip
nomisRev Mar 12, 2021
e70c87f
Fix Iterable#zip & NonEmptyList#zip
nomisRev Mar 12, 2021
b934478
Fix Sequence#test
nomisRev Mar 12, 2021
e599d9a
Update deprecations mapN collectiosn
nomisRev Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
230 changes: 186 additions & 44 deletions arrow-libs/core/arrow-core-data/src/main/kotlin/arrow/core/Iterable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,101 @@ import kotlin.collections.foldRight as _foldRight
inline fun <B, C, D, E> Iterable<B>.zip(
c: Iterable<C>,
d: Iterable<D>,
map: (B, C, D) -> E
): List<E> =
zip(c, d, unit, unit, unit, unit, unit, unit, unit) { b, c, d, _, _, _, _, _, _, _ -> map(b, c, d) }
transform: (B, C, D) -> E
): List<E> {
val bb = iterator()
val cc = c.iterator()
val dd = d.iterator()

val size = minOf(
collectionSizeOrDefault(10),
c.collectionSizeOrDefault(10),
d.collectionSizeOrDefault(10)
)
val list = ArrayList<E>(size)
while (bb.hasNext() && cc.hasNext() && dd.hasNext()) {
list.add(transform(bb.next(), cc.next(), dd.next()))
}
return list
Comment on lines +14 to +27
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This impl was inspired by the Kotlin Std implementation

}

inline fun <B, C, D, E, F> Iterable<B>.zip(
c: Iterable<C>,
d: Iterable<D>,
e: Iterable<E>,
map: (B, C, D, E) -> F
): List<F> =
zip(c, d, e, unit, unit, unit, unit, unit, unit) { b, c, d, e, _, _, _, _, _, _ -> map(b, c, d, e) }
transform: (B, C, D, E) -> F
): List<F> {
val bb = iterator()
val cc = c.iterator()
val dd = d.iterator()
val ee = e.iterator()
val size = minOf(
collectionSizeOrDefault(10),
c.collectionSizeOrDefault(10),
d.collectionSizeOrDefault(10),
e.collectionSizeOrDefault(10)
)
val list = ArrayList<F>(size)
while (bb.hasNext() && cc.hasNext() && dd.hasNext() && ee.hasNext()) {
list.add(transform(bb.next(), cc.next(), dd.next(), ee.next()))
}
return list
}

inline fun <B, C, D, E, F, G> Iterable<B>.zip(
c: Iterable<C>,
d: Iterable<D>,
e: Iterable<E>,
f: Iterable<F>,
map: (B, C, D, E, F) -> G
): List<G> =
zip(c, d, e, f, unit, unit, unit, unit, unit) { b, c, d, e, f, _, _, _, _, _ -> map(b, c, d, e, f) }
transform: (B, C, D, E, F) -> G
): List<G> {
val bb = iterator()
val cc = c.iterator()
val dd = d.iterator()
val ee = e.iterator()
val ff = f.iterator()
val size = minOf(
collectionSizeOrDefault(10),
c.collectionSizeOrDefault(10),
d.collectionSizeOrDefault(10),
e.collectionSizeOrDefault(10),
f.collectionSizeOrDefault(10)
)
val list = ArrayList<G>(size)
while (bb.hasNext() && cc.hasNext() && dd.hasNext() && ee.hasNext() && ff.hasNext()) {
list.add(transform(bb.next(), cc.next(), dd.next(), ee.next(), ff.next()))
}
return list
}

inline fun <B, C, D, E, F, G, H> Iterable<B>.zip(
c: Iterable<C>,
d: Iterable<D>,
e: Iterable<E>,
f: Iterable<F>,
g: Iterable<G>,
map: (B, C, D, E, F, G) -> H
): List<H> =
zip(c, d, e, f, g, unit, unit, unit, unit) { b, c, d, e, f, g, _, _, _, _ -> map(b, c, d, e, f, g) }
transform: (B, C, D, E, F, G) -> H
): List<H> {
val bb = iterator()
val cc = c.iterator()
val dd = d.iterator()
val ee = e.iterator()
val ff = f.iterator()
val gg = g.iterator()
val size = minOf(
collectionSizeOrDefault(10),
c.collectionSizeOrDefault(10),
d.collectionSizeOrDefault(10),
e.collectionSizeOrDefault(10),
f.collectionSizeOrDefault(10),
g.collectionSizeOrDefault(10)
)
val list = ArrayList<H>(size)
while (bb.hasNext() && cc.hasNext() && dd.hasNext() && ee.hasNext() && ff.hasNext() && gg.hasNext()) {
list.add(transform(bb.next(), cc.next(), dd.next(), ee.next(), ff.next(), gg.next()))
}
return list
}

inline fun <B, C, D, E, F, G, H, I> Iterable<B>.zip(
c: Iterable<C>,
Expand All @@ -47,9 +112,30 @@ inline fun <B, C, D, E, F, G, H, I> Iterable<B>.zip(
f: Iterable<F>,
g: Iterable<G>,
h: Iterable<H>,
map: (B, C, D, E, F, G, H) -> I
): List<I> =
zip(c, d, e, f, g, h, unit, unit, unit) { b, c, d, e, f, g, h, _, _, _ -> map(b, c, d, e, f, g, h) }
transform: (B, C, D, E, F, G, H) -> I
): List<I> {
val bb = iterator()
val cc = c.iterator()
val dd = d.iterator()
val ee = e.iterator()
val ff = f.iterator()
val gg = g.iterator()
val hh = h.iterator()
val size = minOf(
collectionSizeOrDefault(10),
c.collectionSizeOrDefault(10),
d.collectionSizeOrDefault(10),
e.collectionSizeOrDefault(10),
f.collectionSizeOrDefault(10),
g.collectionSizeOrDefault(10),
h.collectionSizeOrDefault(10)
)
val list = ArrayList<I>(size)
while (bb.hasNext() && cc.hasNext() && dd.hasNext() && ee.hasNext() && ff.hasNext() && gg.hasNext() && hh.hasNext()) {
list.add(transform(bb.next(), cc.next(), dd.next(), ee.next(), ff.next(), gg.next(), hh.next()))
}
return list
}

inline fun <B, C, D, E, F, G, H, I, J> Iterable<B>.zip(
c: Iterable<C>,
Expand All @@ -59,9 +145,32 @@ inline fun <B, C, D, E, F, G, H, I, J> Iterable<B>.zip(
g: Iterable<G>,
h: Iterable<H>,
i: Iterable<I>,
map: (B, C, D, E, F, G, H, I) -> J
): List<J> =
zip(c, d, e, f, g, h, i, unit, unit) { b, c, d, e, f, g, h, i, _, _ -> map(b, c, d, e, f, g, h, i) }
transform: (B, C, D, E, F, G, H, I) -> J
): List<J> {
val bb = iterator()
val cc = c.iterator()
val dd = d.iterator()
val ee = e.iterator()
val ff = f.iterator()
val gg = g.iterator()
val hh = h.iterator()
val ii = i.iterator()
val size = minOf(
collectionSizeOrDefault(10),
c.collectionSizeOrDefault(10),
d.collectionSizeOrDefault(10),
e.collectionSizeOrDefault(10),
f.collectionSizeOrDefault(10),
g.collectionSizeOrDefault(10),
h.collectionSizeOrDefault(10),
i.collectionSizeOrDefault(10)
)
val list = ArrayList<J>(size)
while (bb.hasNext() && cc.hasNext() && dd.hasNext() && ee.hasNext() && ff.hasNext() && gg.hasNext() && hh.hasNext() && ii.hasNext()) {
list.add(transform(bb.next(), cc.next(), dd.next(), ee.next(), ff.next(), gg.next(), hh.next(), ii.next()))
}
return list
}

inline fun <B, C, D, E, F, G, H, I, J, K> Iterable<B>.zip(
c: Iterable<C>,
Expand All @@ -72,9 +181,34 @@ inline fun <B, C, D, E, F, G, H, I, J, K> Iterable<B>.zip(
h: Iterable<H>,
i: Iterable<I>,
j: Iterable<J>,
map: (B, C, D, E, F, G, H, I, J) -> K
): List<K> =
zip(c, d, e, f, g, h, i, j, unit) { b, c, d, e, f, g, h, i, j, _ -> map(b, c, d, e, f, g, h, i, j) }
transform: (B, C, D, E, F, G, H, I, J) -> K
): List<K> {
val bb = iterator()
val cc = c.iterator()
val dd = d.iterator()
val ee = e.iterator()
val ff = f.iterator()
val gg = g.iterator()
val hh = h.iterator()
val ii = i.iterator()
val jj = j.iterator()
val size = minOf(
collectionSizeOrDefault(10),
c.collectionSizeOrDefault(10),
d.collectionSizeOrDefault(10),
e.collectionSizeOrDefault(10),
f.collectionSizeOrDefault(10),
g.collectionSizeOrDefault(10),
h.collectionSizeOrDefault(10),
i.collectionSizeOrDefault(10),
j.collectionSizeOrDefault(10)
)
val list = ArrayList<K>(size)
while (bb.hasNext() && cc.hasNext() && dd.hasNext() && ee.hasNext() && ff.hasNext() && gg.hasNext() && hh.hasNext() && ii.hasNext() && jj.hasNext()) {
list.add(transform(bb.next(), cc.next(), dd.next(), ee.next(), ff.next(), gg.next(), hh.next(), ii.next(), jj.next()))
}
return list
}

inline fun <B, C, D, E, F, G, H, I, J, K, L> Iterable<B>.zip(
c: Iterable<C>,
Expand All @@ -86,33 +220,41 @@ inline fun <B, C, D, E, F, G, H, I, J, K, L> Iterable<B>.zip(
i: Iterable<I>,
j: Iterable<J>,
k: Iterable<K>,
map: (B, C, D, E, F, G, H, I, J, K) -> L
transform: (B, C, D, E, F, G, H, I, J, K) -> L
): List<L> {
val buffer = ArrayList<L>()
for (bb in this) {
for (cc in c) {
for (dd in d) {
for (ee in e) {
for (ff in f) {
for (gg in g) {
for (hh in h) {
for (ii in i) {
for (jj in j) {
for (kk in k) {
buffer.add(map(bb, cc, dd, ee, ff, gg, hh, ii, jj, kk))
}
}
}
}
}
}
}
}
}
val bb = iterator()
val cc = c.iterator()
val dd = d.iterator()
val ee = e.iterator()
val ff = f.iterator()
val gg = g.iterator()
val hh = h.iterator()
val ii = i.iterator()
val jj = j.iterator()
val kk = k.iterator()
val size = minOf(
collectionSizeOrDefault(10),
c.collectionSizeOrDefault(10),
d.collectionSizeOrDefault(10),
e.collectionSizeOrDefault(10),
f.collectionSizeOrDefault(10),
g.collectionSizeOrDefault(10),
h.collectionSizeOrDefault(10),
i.collectionSizeOrDefault(10),
j.collectionSizeOrDefault(10),
k.collectionSizeOrDefault(10)
)
val list = ArrayList<L>(size)
while (bb.hasNext() && cc.hasNext() && dd.hasNext() && ee.hasNext() && ff.hasNext() && gg.hasNext() && hh.hasNext() && ii.hasNext() && jj.hasNext() && kk.hasNext()) {
list.add(transform(bb.next(), cc.next(), dd.next(), ee.next(), ff.next(), gg.next(), hh.next(), ii.next(), jj.next(), kk.next()))
}
return buffer
return list
}

@PublishedApi
internal fun <T> Iterable<T>.collectionSizeOrDefault(default: Int): Int =
if (this is Collection<*>) this.size else default

inline fun <A, B> Iterable<A>.foldRight(initial: B, operation: (A, acc: B) -> B): B =
when (this) {
is List -> _foldRight(initial, operation)
Expand Down