dnrops
/
Surge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed `internal`-scoped `func modInPlace([_], [_])` to the more appropriate `elmodInPlace`

This commit is contained in:
Vincent Esche 2019-10-03 15:57:24 +02:00
parent 9d217f4e45
commit a30b24ca18
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/Surge/Arithmetic/Arithmetic.swift
View File

@ -413,14 +413,14 @@ public func % <L>(lhs: L, rhs: Double) -> [Double] where L: UnsafeMemoryAccessib
/// - Warning: does not support memory stride (assumes stride is 1). /// - Warning: does not support memory stride (assumes stride is 1).
func modInPlace<L>(_ lhs: inout L, _ rhs: Float) where L: UnsafeMutableMemoryAccessible, L.Element == Float { func modInPlace<L>(_ lhs: inout L, _ rhs: Float) where L: UnsafeMutableMemoryAccessible, L.Element == Float {
let rhs = Array(repeating: rhs, count: lhs.count) let rhs = Array(repeating: rhs, count: lhs.count)
modInPlace(&lhs, rhs) elmodInPlace(&lhs, rhs)
} }
/// - Warning: Allocates a temporary array from `rhs` via `Array(repeating: rhs, count: lhs.count)`. /// - Warning: Allocates a temporary array from `rhs` via `Array(repeating: rhs, count: lhs.count)`.
/// - Warning: does not support memory stride (assumes stride is 1). /// - Warning: does not support memory stride (assumes stride is 1).
func modInPlace<L>(_ lhs: inout L, _ rhs: Double) where L: UnsafeMutableMemoryAccessible, L.Element == Double { func modInPlace<L>(_ lhs: inout L, _ rhs: Double) where L: UnsafeMutableMemoryAccessible, L.Element == Double {
let rhs = Array(repeating: rhs, count: lhs.count) let rhs = Array(repeating: rhs, count: lhs.count)
modInPlace(&lhs, rhs) elmodInPlace(&lhs, rhs)
} }
/// - Warning: Allocates a temporary array from `rhs` via `Array(repeating: rhs, count: lhs.count)`. /// - Warning: Allocates a temporary array from `rhs` via `Array(repeating: rhs, count: lhs.count)`.
@ -439,12 +439,12 @@ public func .%= <L>(lhs: inout L, rhs: Double) where L: UnsafeMutableMemoryAcces
/// - Warning: does not support memory stride (assumes stride is 1). /// - Warning: does not support memory stride (assumes stride is 1).
public func mod<L, R>(_ lhs: L, _ rhs: R) -> [Float] where L: UnsafeMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Float, R.Element == Float { public func mod<L, R>(_ lhs: L, _ rhs: R) -> [Float] where L: UnsafeMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Float, R.Element == Float {
return withArray(from: lhs) { modInPlace(&$0, rhs) } return withArray(from: lhs) { elmodInPlace(&$0, rhs) }
} }
/// - Warning: does not support memory stride (assumes stride is 1). /// - Warning: does not support memory stride (assumes stride is 1).
public func mod<L, R>(_ lhs: L, _ rhs: R) -> [Double] where L: UnsafeMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Double, R.Element == Double { public func mod<L, R>(_ lhs: L, _ rhs: R) -> [Double] where L: UnsafeMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Double, R.Element == Double {
return withArray(from: lhs) { modInPlace(&$0, rhs) } return withArray(from: lhs) { elmodInPlace(&$0, rhs) }
} }
public func .% <L, R>(lhs: L, rhs: R) -> [Float] where L: UnsafeMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Float, R.Element == Float { public func .% <L, R>(lhs: L, rhs: R) -> [Float] where L: UnsafeMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Float, R.Element == Float {
@ -458,7 +458,7 @@ public func .% <L, R>(lhs: L, rhs: R) -> [Double] where L: UnsafeMemoryAccessibl
// MARK: - Element-wise Modulo: In Place // MARK: - Element-wise Modulo: In Place
/// - Warning: does not support memory stride (assumes stride is 1). /// - Warning: does not support memory stride (assumes stride is 1).
func modInPlace<L, R>(_ lhs: inout L, _ rhs: R) where L: UnsafeMutableMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Float, R.Element == Float { func elmodInPlace<L, R>(_ lhs: inout L, _ rhs: R) where L: UnsafeMutableMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Float, R.Element == Float {
precondition(lhs.count == rhs.count, "Collections must have the same size") precondition(lhs.count == rhs.count, "Collections must have the same size")
var elementCount: Int32 = numericCast(lhs.count) var elementCount: Int32 = numericCast(lhs.count)
withUnsafeMutableMemory(&lhs) { lm in withUnsafeMutableMemory(&lhs) { lm in
@ -469,7 +469,7 @@ func modInPlace<L, R>(_ lhs: inout L, _ rhs: R) where L: UnsafeMutableMemoryAcce
} }
/// - Warning: does not support memory stride (assumes stride is 1). /// - Warning: does not support memory stride (assumes stride is 1).
func modInPlace<L, R>(_ lhs: inout L, _ rhs: R) where L: UnsafeMutableMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Double, R.Element == Double { func elmodInPlace<L, R>(_ lhs: inout L, _ rhs: R) where L: UnsafeMutableMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Double, R.Element == Double {
precondition(lhs.count == rhs.count, "Collections must have the same size") precondition(lhs.count == rhs.count, "Collections must have the same size")
var elementCount: Int32 = numericCast(lhs.count) var elementCount: Int32 = numericCast(lhs.count)
withUnsafeMutableMemory(&lhs) { lm in withUnsafeMutableMemory(&lhs) { lm in
@ -480,11 +480,11 @@ func modInPlace<L, R>(_ lhs: inout L, _ rhs: R) where L: UnsafeMutableMemoryAcce
} }
public func .%= <L, R>(lhs: inout L, rhs: R) where L: UnsafeMutableMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Float, R.Element == Float { public func .%= <L, R>(lhs: inout L, rhs: R) where L: UnsafeMutableMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Float, R.Element == Float {
return modInPlace(&lhs, rhs) return elmodInPlace(&lhs, rhs)
} }
public func .%= <L, R>(lhs: inout L, rhs: R) where L: UnsafeMutableMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Double, R.Element == Double { public func .%= <L, R>(lhs: inout L, rhs: R) where L: UnsafeMutableMemoryAccessible, R: UnsafeMemoryAccessible, L.Element == Double, R.Element == Double {
return modInPlace(&lhs, rhs) return elmodInPlace(&lhs, rhs)
} }
// MARK: - Remainder // MARK: - Remainder

4
Tests/SurgeTests/ArithmeticTests.swift
View File

@ -155,7 +155,7 @@ class ArithmeticTests: XCTestCase {
let rhs: [Scalar] = [Scalar].constant(of: 2.0) let rhs: [Scalar] = [Scalar].constant(of: 2.0)
var actual: [Scalar] = lhs var actual: [Scalar] = lhs
Surge.modInPlace(&actual, rhs) Surge.elmodInPlace(&actual, rhs)
let expected = zip(lhs, rhs).map { fmod($0, $1) } let expected = zip(lhs, rhs).map { fmod($0, $1) }
@ -169,7 +169,7 @@ class ArithmeticTests: XCTestCase {
let rhs: [Scalar] = [Scalar].constant(of: 2.0) let rhs: [Scalar] = [Scalar].constant(of: 2.0)
var actual: [Scalar] = lhs var actual: [Scalar] = lhs
Surge.modInPlace(&actual, rhs) Surge.elmodInPlace(&actual, rhs)
let expected = zip(lhs, rhs).map { fmod($0, $1) } let expected = zip(lhs, rhs).map { fmod($0, $1) }