-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix observable binding and add array diff.
- Loading branch information
1 parent
599bdaa
commit 9aeac15
Showing
8 changed files
with
249 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| // | ||
| // The MIT License (MIT) | ||
| // | ||
| // Copyright (c) 2015 Srdan Rasic (@srdanrasic) | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
| // | ||
|
|
||
| // Created by Dapeng Gao on 20/10/15. | ||
| // The central idea of this algorithm is taken from https://github.com/jflinter/Dwifft | ||
|
|
||
| internal enum DiffStep<T> { | ||
| case Insert(element: T, index: Int) | ||
| case Delete(element: T, index: Int) | ||
| } | ||
|
|
||
| extension Array where Element: Equatable { | ||
|
|
||
| internal static func diff(x: [Element], _ y: [Element]) -> [DiffStep<Element>] { | ||
|
|
||
| if x.count == 0 { | ||
| return zip(y, y.indices).map(DiffStep<Element>.Insert) | ||
| } | ||
|
|
||
| if y.count == 0 { | ||
| return zip(x, x.indices).map(DiffStep<Element>.Delete) | ||
| } | ||
|
|
||
| // Use dynamic programming to generate a table such that `table[i][j]` represents | ||
| // the length of the longest common substring (LCS) between `x[0..<i]` and `y[0..<j]` | ||
| let xLen = x.count, yLen = y.count | ||
| var table = [[Int]](count: xLen + 1, repeatedValue: [Int](count: yLen + 1, repeatedValue: 0)) | ||
| for i in 1...xLen { | ||
| for j in 1...yLen { | ||
| if x[i - 1] == y[j - 1] { | ||
| table[i][j] = table[i - 1][j - 1] + 1 | ||
| } else { | ||
| table[i][j] = max(table[i - 1][j], table[i][j - 1]) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Backtrack to find out the diff | ||
| var backtrack: [DiffStep<Element>] = [] | ||
| for var i = xLen, j = yLen; i > 0 || j > 0; { | ||
| if i == 0 { | ||
| j-- | ||
| backtrack.append(.Insert(element: y[j], index: j)) | ||
| } else if j == 0 { | ||
| i-- | ||
| backtrack.append(.Delete(element: x[i], index: i)) | ||
| } else if table[i][j] == table[i][j - 1] { | ||
| j-- | ||
| backtrack.append(.Insert(element: y[j], index: j)) | ||
| } else if table[i][j] == table[i - 1][j] { | ||
| i-- | ||
| backtrack.append(.Delete(element: x[i], index: i)) | ||
| } else { | ||
| i-- | ||
| j-- | ||
| } | ||
| } | ||
|
|
||
| // Reverse the result | ||
| return backtrack.reverse() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| // | ||
| // DiffTests.swift | ||
| // Bond | ||
| // | ||
| // Created by Dapeng Gao on 20/10/15. | ||
| // Copyright © 2015 Bond. All rights reserved. | ||
| // | ||
|
|
||
| // This test case is taken from https://github.com/jflinter/Dwifft | ||
|
|
||
| import XCTest | ||
| @testable import ReactiveKit | ||
|
|
||
| class DiffTests: XCTestCase { | ||
|
|
||
| struct TestCase { | ||
| let array1: [Character] | ||
| let array2: [Character] | ||
|
|
||
| let expectedDiff: String | ||
|
|
||
| init(_ a: String, _ b: String, _ expectedDiff: String) { | ||
| self.array1 = Array(a.characters) | ||
| self.array2 = Array(b.characters) | ||
| self.expectedDiff = expectedDiff | ||
| } | ||
| } | ||
|
|
||
| private func encodeDiff<T>(x: [DiffStep<T>]) -> String { | ||
|
|
||
| var result = "" | ||
|
|
||
| for step in x { | ||
| switch step { | ||
| case let .Insert(e, i): result += "+\(e)@\(i)" | ||
| case let .Delete(e, i): result += "-\(e)@\(i)" | ||
| } | ||
| } | ||
| return result | ||
| } | ||
|
|
||
| func testDiff() { | ||
|
|
||
| let tests: [TestCase] = [ | ||
| TestCase("1234", "23", "-1@0-4@3"), | ||
| TestCase("0125890", "4598310", "-0@0-1@1-2@2+4@0-8@4+8@3+3@4+1@5"), | ||
| TestCase("BANANA", "KATANA", "-B@0+K@0-N@2+T@2"), | ||
| TestCase("1234", "1224533324", "+2@2+4@3+5@4+3@6+3@7+2@8"), | ||
| TestCase("thisisatest", "testing123testing", "-h@1-i@2+e@1+t@3-s@5-a@6+n@5+g@6+1@7+2@8+3@9+i@14+n@15+g@16"), | ||
| TestCase("HUMAN", "CHIMPANZEE", "+C@0-U@1+I@2+P@4+Z@7+E@8+E@9"), | ||
| ] | ||
|
|
||
| for test in tests { | ||
|
|
||
| let diff = Array.diff(test.array1, test.array2) | ||
| let stringRepresentation = encodeDiff(diff) | ||
|
|
||
| XCTAssertEqual(stringRepresentation, test.expectedDiff) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.