set default parameters for vramp. (#1)

* set default parameters for vramp. * fixed lint errors.
dastrobu · Apr 9, 2019 · d0af31d · d0af31d
1 parent 7f7530c
commit d0af31d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 /.build
 /Packages
+/DerivedData
 /*.xcodeproj
 
 *.log

diff --git a/AccelerateArray.podspec b/AccelerateArray.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
  #
 
  s.name = "AccelerateArray"
- s.version = "0.0.1"
+ s.version = "0.0.2"
  s.summary = "Swift Array Extensions for the Apple Accelerate Framework"
 
  # This description is used to generate tags and improve search results.

diff --git a/Sources/AccelerateArray/vDSP.swift b/Sources/AccelerateArray/vDSP.swift
@@ -19,7 +19,7 @@ public extension Array where Element == Float {
 
  /// Build ramped vector
  /// https://developer.apple.com/documentation/accelerate/1450369-vdsp_vramp
- init(start: Element, step: Element, n: Int) {
+ init(start: Element = 0.0, step: Element = 1.0, n: Int) {
  self.init(repeating: 0, count: n)
  var a = start
  var b = step
@@ -114,7 +114,7 @@ public extension Array where Element == Double {
 
  /// Build ramped vector
  /// https://developer.apple.com/documentation/accelerate/1449999-vdsp_vrampd
- init(start: Element, step: Element, n: Int) {
+ init(start: Element = 0.0, step: Element = 1.0, n: Int) {
  self.init(repeating: 0, count: n)
  var a = start
  var b = step

diff --git a/Tests/AccelerateArrayTests/vDSP.swift b/Tests/AccelerateArrayTests/vDSP.swift
@@ -4,17 +4,27 @@ import XCTest
 class VDSPTests: XCTestCase {
 
  func testVrampFloat() {
+ XCTAssertEqual([Float].init(stop: 2.0), [0.0, 1.0])
  XCTAssertEqual([Float].init(start: 0.0, stop: 1.0, step: 1.0), [0.0])
  XCTAssertEqual([Float].init(start: 0.0, stop: 2.0, step: 1.1), [0.0, 1.1])
  XCTAssertEqual([Float].init(start: -1.0, stop: 2.0, step: 1.0), [-1.0, 0.0, 1.0])
  XCTAssertEqual([Float].init(start: -1.0, stop: -3.0, step: -1.0), [-1.0, -2.0])
+
+ XCTAssertEqual([Float].init(n: 2), [0.0, 1.0])
+ XCTAssertEqual([Float].init(start: 1.0, n: 2), [1.0, 2.0])
+ XCTAssertEqual([Float].init(start: 1.0, step: 2.0, n: 2), [1.0, 3.0])
  }
 
  func testVrampDouble() {
+ XCTAssertEqual([Double].init(stop: 2.0), [0.0, 1.0])
  XCTAssertEqual([Double].init(start: 0.0, stop: 1.0, step: 1.0), [0.0])
  XCTAssertEqual([Double].init(start: 0.0, stop: 2.0, step: 1.1), [0.0, 1.1])
  XCTAssertEqual([Double].init(start: -1.0, stop: 2.0, step: 1.0), [-1.0, 0.0, 1.0])
  XCTAssertEqual([Double].init(start: -1.0, stop: -3.0, step: -1.0), [-1.0, -2.0])
+
+ XCTAssertEqual([Double].init(n: 2), [0.0, 1.0])
+ XCTAssertEqual([Double].init(start: 1.0, n: 2), [1.0, 2.0])
+ XCTAssertEqual([Double].init(start: 1.0, step: 2.0, n: 2), [1.0, 3.0])
  }
 
  func testMtransFloatWhenEmpty() {