ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-21 16:49:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Replace for ..-1 with until (#1513)

Browse Source
This commit is contained in:
Ross Nicoll
2017-09-26 13:37:13 +01:00
committed by GitHub
parent 63168c0299
commit e1b040ba0e
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/rpc/src/test/kotlin/net/corda/client/rpc/RepeatingBytesInputStream.kt
View File

@ -14,11 +14,11 @@ class RepeatingBytesInputStream(val bytesToRepeat: ByteArray, val numberOfBytes:
} }
} }
override fun read(byteArray: ByteArray, offset: Int, length: Int): Int { override fun read(byteArray: ByteArray, offset: Int, length: Int): Int {
val until = Math.min(Math.min(offset + length, byteArray.size), offset + bytesLeft) val lastIdx = Math.min(Math.min(offset + length, byteArray.size), offset + bytesLeft)
for (i in offset .. until - 1) { for (i in offset until lastIdx) {
byteArray[i] = bytesToRepeat[(numberOfBytes - bytesLeft + i - offset) % bytesToRepeat.size] byteArray[i] = bytesToRepeat[(numberOfBytes - bytesLeft + i - offset) % bytesToRepeat.size]
} }
val bytesRead = until - offset val bytesRead = lastIdx - offset
bytesLeft -= bytesRead bytesLeft -= bytesRead
return if (bytesRead == 0 && bytesLeft == 0) -1 else bytesRead return if (bytesRead == 0 && bytesLeft == 0) -1 else bytesRead
} }

2
core/src/test/kotlin/net/corda/core/crypto/CryptoUtilsTest.kt
View File

@ -613,7 +613,7 @@ class CryptoUtilsTest {
val encodedPrivK1 = privK1.encoded val encodedPrivK1 = privK1.encoded
// fail on malformed key. // fail on malformed key.
for (i in 0..encodedPrivK1.size - 1) { for (i in 0 until encodedPrivK1.size) {
val b = encodedPrivK1[i] val b = encodedPrivK1[i]
encodedPrivK1[i] = b.inc() encodedPrivK1[i] = b.inc()
try { try {

10
finance/src/main/kotlin/net/corda/finance/contracts/math/Interpolators.kt
View File

@ -29,7 +29,7 @@ class LinearInterpolator(private val xs: DoubleArray, private val ys: DoubleArra
require(x > x0) { "Can't interpolate below $x0" } require(x > x0) { "Can't interpolate below $x0" }
for (i in 1..xs.size - 1) { for (i in 1 until xs.size) {
if (xs[i] == x) return xs[i] if (xs[i] == x) return xs[i]
else if (xs[i] > x) return interpolateBetween(x, xs[i - 1], xs[i], ys[i - 1], ys[i]) else if (xs[i] > x) return interpolateBetween(x, xs[i - 1], xs[i], ys[i - 1], ys[i])
} }
@ -78,15 +78,15 @@ class CubicSplineInterpolator(private val xs: DoubleArray, private val ys: Doubl
val h = DoubleArray(n) val h = DoubleArray(n)
val g = DoubleArray(n) val g = DoubleArray(n)
for (i in 0..n - 1) for (i in 0 until n)
h[i] = xs[i + 1] - xs[i] h[i] = xs[i + 1] - xs[i]
for (i in 1..n - 1) for (i in 1 until n)
g[i] = 3 / h[i] * (ys[i + 1] - ys[i]) - 3 / h[i - 1] * (ys[i] - ys[i - 1]) g[i] = 3 / h[i] * (ys[i + 1] - ys[i]) - 3 / h[i - 1] * (ys[i] - ys[i - 1])
// Solve tridiagonal linear system (using Crout Factorization) // Solve tridiagonal linear system (using Crout Factorization)
val m = DoubleArray(n) val m = DoubleArray(n)
val z = DoubleArray(n) val z = DoubleArray(n)
for (i in 1..n - 1) { for (i in 1 until n) {
val l = 2 * (xs[i + 1] - xs[i - 1]) - h[i - 1] * m[i - 1] val l = 2 * (xs[i + 1] - xs[i - 1]) - h[i - 1] * m[i - 1]
m[i] = h[i] / l m[i] = h[i] / l
z[i] = (g[i] - h[i - 1] * z[i - 1]) / l z[i] = (g[i] - h[i - 1] * z[i - 1]) / l
@ -98,7 +98,7 @@ class CubicSplineInterpolator(private val xs: DoubleArray, private val ys: Doubl
} }
val segmentMap = TreeMap<Double, Polynomial>() val segmentMap = TreeMap<Double, Polynomial>()
for (i in 0..n - 1) { for (i in 0 until n) {
val coefficients = doubleArrayOf(ys[i], b[i], c[i], d[i]) val coefficients = doubleArrayOf(ys[i], b[i], c[i], d[i])
segmentMap.put(xs[i], Polynomial(coefficients)) segmentMap.put(xs[i], Polynomial(coefficients))
} }

2
tools/loadtest/src/main/kotlin/net/corda/loadtest/tests/CrossCashTest.kt
View File

@ -277,7 +277,7 @@ val crossCashTest = LoadTest<CrossCashCommand, CrossCashState>(
minimumMatches.forEach { originator, consumedTxs -> minimumMatches.forEach { originator, consumedTxs ->
if (consumedTxs > 0) { if (consumedTxs > 0) {
newNodeDiffQueues!! newNodeDiffQueues!!
for (i in 0..consumedTxs - 1) { for (i in 0 until consumedTxs) {
val (issuer, quantity) = newNodeDiffQueues[originator]!!.removeAt(0) val (issuer, quantity) = newNodeDiffQueues[originator]!!.removeAt(0)
newNodeVault.put(issuer, (newNodeVault[issuer] ?: 0L) + quantity) newNodeVault.put(issuer, (newNodeVault[issuer] ?: 0L) + quantity)
} }