-
-
Notifications
You must be signed in to change notification settings - Fork 6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
added DataApproximator+N extension #2848
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| // | ||
| // DataApproximator+N.swift | ||
| // Charts | ||
| // | ||
| // Created by M Ivaniushchenko on 9/6/17. | ||
| // Licensed under Apache License 2.0 | ||
| // | ||
| // https://github.com/danielgindi/Charts | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| extension CGPoint { | ||
| fileprivate func distanceToLine(from linePoint1: CGPoint, to linePoint2: CGPoint) -> CGFloat { | ||
| let dx = linePoint2.x - linePoint1.x | ||
| let dy = linePoint2.y - linePoint1.y | ||
|
|
||
| let dividend = fabs(dy * self.x - dx * self.y - linePoint1.x * linePoint2.y + linePoint2.x * linePoint1.y) | ||
| let divisor = sqrt(dx * dx + dy * dy) | ||
|
|
||
| return dividend / divisor | ||
| } | ||
| } | ||
|
|
||
| private struct LineAlt { | ||
| let start: Int | ||
| let end: Int | ||
|
|
||
| var distance: CGFloat = 0 | ||
| var index: Int = 0 | ||
|
|
||
| init(start: Int, end: Int, points: [CGPoint]) { | ||
| self.start = start | ||
| self.end = end | ||
|
|
||
| let startPoint = points[start] | ||
| let endPoint = points[end] | ||
|
|
||
| guard (end > start + 1) else { | ||
| return | ||
| } | ||
|
|
||
| for i in start + 1 ..< end { | ||
| let currentPoint = points[i] | ||
|
|
||
| let distance = currentPoint.distanceToLine(from: startPoint, to: endPoint) | ||
|
|
||
| if distance > self.distance { | ||
| self.index = i | ||
| self.distance = distance | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension LineAlt: Comparable { | ||
| static func ==(lhs: LineAlt, rhs: LineAlt) -> Bool { | ||
| return (lhs.start == rhs.start) && (lhs.end == rhs.end) && (lhs.index == rhs.index) | ||
| } | ||
|
|
||
| static func <(lhs: LineAlt, rhs: LineAlt) -> Bool { | ||
| return lhs.distance < rhs.distance | ||
| } | ||
| } | ||
|
|
||
|
|
||
| extension DataApproximator { | ||
| /// uses the douglas peuker algorithm to reduce the given arraylist of entries to given number of points | ||
| /// More algorithm details here - http://psimpl.sourceforge.net/douglas-peucker.html | ||
| @objc open class func reduceWithDouglasPeukerN(_ points: [CGPoint], resultCount: Int) -> [CGPoint] | ||
| { | ||
| // if a shape has 2 or less points it cannot be reduced | ||
| if resultCount <= 2 || resultCount >= points.count | ||
| { | ||
| return points | ||
| } | ||
| var keep = [Bool](repeating: false, count: points.count) | ||
|
|
||
| // first and last always stay | ||
| keep[0] = true | ||
| keep[points.count - 1] = true | ||
| var currentStoredPoints = 2 | ||
|
|
||
| var queue = [LineAlt]() | ||
| let line = LineAlt(start: 0, end: points.count - 1, points: points) | ||
| queue.append(line) | ||
|
|
||
| repeat { | ||
| let line = queue.popLast()! | ||
|
|
||
| // store the key | ||
| keep[line.index] = true | ||
|
|
||
| // check point count tolerance | ||
| currentStoredPoints += 1 | ||
|
|
||
| if (currentStoredPoints == resultCount) { | ||
| break; | ||
| } | ||
|
|
||
| // split the polyline at the key and recurse | ||
| let left = LineAlt(start: line.start, end: line.index, points: points) | ||
| if (left.index > 0) { | ||
| self.insertLine(left, into: &queue) | ||
| } | ||
|
|
||
| let right = LineAlt(start: line.index, end: line.end, points: points) | ||
| if (right.index > 0) { | ||
| self.insertLine(right, into: &queue) | ||
| } | ||
|
|
||
| } while !queue.isEmpty | ||
|
|
||
| // create a new array with series, only take the kept ones | ||
| let reducedEntries = points.enumerated().flatMap { (index: Int, point: CGPoint) -> CGPoint? in | ||
| return keep[index] ? point : nil | ||
| } | ||
|
|
||
| return reducedEntries | ||
| } | ||
|
|
||
| // Keeps array sorted | ||
| private static func insertLine(_ line: LineAlt, into array: inout [LineAlt]) { | ||
| let insertionIndex = self.insertionIndex(for: line, into: &array) | ||
| array.insert(line, at: insertionIndex) | ||
| } | ||
|
|
||
| private static func insertionIndex(for line: LineAlt, into array: inout [LineAlt]) -> Int { | ||
| var indices = array.indices | ||
|
|
||
| while !indices.isEmpty { | ||
| let midIndex = indices.lowerBound.advanced(by: indices.count / 2) | ||
| let midLine = array[midIndex] | ||
|
|
||
| if midLine == line { | ||
| return midIndex | ||
| } | ||
| else if (line < midLine) { | ||
| // perform search in left half | ||
| indices = indices.lowerBound..<midIndex | ||
| } | ||
| else { | ||
| // perform search in right half | ||
| indices = (midIndex + 1)..<indices.upperBound | ||
| } | ||
| } | ||
|
|
||
| return indices.lowerBound | ||
| } | ||
| } | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The algorithm shouldn't be overridden.
@objc public static func reduceWithDouglasPeukerN(_ points: [CGPoint], resultCount: Int) -> [CGPoint]There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree, but in current code there is
@objc open class func reduceWithDouglasPeuker(_ points: [CGPoint], tolerance: CGFloat) -> [CGPoint]There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That should be changed too. This is fine then. I will change to static in a separate PR.