From 61d76192eb172286fed3daa5ee4eb2046e9adf12 Mon Sep 17 00:00:00 2001 From: LepilkinaElena Date: Thu, 30 Jan 2020 11:46:07 +0300 Subject: [PATCH] Fix benchmarks with Swift interop after enabling -Xobjc-generics (#3804) --- performance/KotlinVsSwift/ring/src/main.swift | 4 ++-- performance/swiftinterop/swiftSrc/benchmarks.swift | 14 +++++++------- performance/swiftinterop/swiftSrc/main.swift | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/performance/KotlinVsSwift/ring/src/main.swift b/performance/KotlinVsSwift/ring/src/main.swift index 5f68fd4274e..486541f3a57 100644 --- a/performance/KotlinVsSwift/ring/src/main.swift +++ b/performance/KotlinVsSwift/ring/src/main.swift @@ -7,8 +7,8 @@ import Foundation import benchmark var runner = BenchmarksRunner() -let args = KotlinArray(size: Int32(CommandLine.arguments.count - 1), init: {index in - CommandLine.arguments[Int(truncating: index) + 1] +let args = KotlinArray(size: Int32(CommandLine.arguments.count - 1), init: {index in + CommandLine.arguments[Int(truncating: index) + 1] as NSString }) let companion = BenchmarkEntryWithInit.Companion() diff --git a/performance/swiftinterop/swiftSrc/benchmarks.swift b/performance/swiftinterop/swiftSrc/benchmarks.swift index 7196dcf185a..6b2e02450ef 100644 --- a/performance/swiftinterop/swiftSrc/benchmarks.swift +++ b/performance/swiftinterop/swiftSrc/benchmarks.swift @@ -40,7 +40,7 @@ class SwiftInteropBenchmarks { let BENCHMARK_SIZE = 10000 let SMALL_BENCHMARK_SIZE = 50 let MEDIUM_BENCHMARK_SIZE = 100 - var multigraph = Multigraph() + var multigraph = Multigraph() var cityMap = CityMap() func randomInt(border: Int) -> Int { @@ -88,11 +88,11 @@ class SwiftInteropBenchmarks { } func initMultigraph(size: Int) { - multigraph = Multigraph() + multigraph = Multigraph() for i in 1...size { - multigraph.addEdge(from: i, to: i + 1, cost: SimpleCost(cost: (i + 1) % i )) - multigraph.addEdge(from: i, to: i * 2, cost: SimpleCost(cost: (i * 2) % i)) - multigraph.addEdge(from: i + 5, to: i, cost: SimpleCost(cost: (i + 5) % i)) + multigraph.addEdge(from: NSNumber(value: i), to: NSNumber(value: i + 1), cost: SimpleCost(cost: (i + 1) % i )) + multigraph.addEdge(from: NSNumber(value: i), to: NSNumber(value: i * 2), cost: SimpleCost(cost: (i * 2) % i)) + multigraph.addEdge(from: NSNumber(value: i + 5), to: NSNumber(value: i), cost: SimpleCost(cost: (i + 5) % i)) } } @@ -134,7 +134,7 @@ class SwiftInteropBenchmarks { for _ in 0...SMALL_BENCHMARK_SIZE { var vertexes = Array(multigraph.allVertexes) var result = multigraph.searchRoutesWithLimits(start: 1, - finish: SMALL_BENCHMARK_SIZE / 2 + SMALL_BENCHMARK_SIZE / 4, + finish: NSNumber(value: SMALL_BENCHMARK_SIZE / 2 + SMALL_BENCHMARK_SIZE / 4), limits: SimpleCost(cost: SMALL_BENCHMARK_SIZE / 5)) var count = result.map{ $0.count }.reduce(0, +) } @@ -199,7 +199,7 @@ class SwiftInteropBenchmarks { var edges = multigraphCopy.allEdges while (!edges.isEmpty) { multigraphCopy.removeEdge(id: UInt32(edges.randomElement()!)) - let vertexes = multigraphCopy.allVertexes + let vertexes = multigraphCopy.allVertexes as! Set multigraphCopy.removeVertex(vertex: vertexes.randomElement()!) edges = multigraphCopy.allEdges } diff --git a/performance/swiftinterop/swiftSrc/main.swift b/performance/swiftinterop/swiftSrc/main.swift index e6ac51d6253..9e8116de78e 100644 --- a/performance/swiftinterop/swiftSrc/main.swift +++ b/performance/swiftinterop/swiftSrc/main.swift @@ -7,8 +7,8 @@ import Foundation import benchmark var runner = BenchmarksRunner() -let args = KotlinArray(size: Int32(CommandLine.arguments.count - 1), init: {index in - CommandLine.arguments[Int(truncating: index) + 1] +let args = KotlinArray(size: Int32(CommandLine.arguments.count - 1), init: {index in + CommandLine.arguments[Int(truncating: index) + 1] as NSString }) let companion = BenchmarkEntryWithInit.Companion()