diff --git a/HCKalmanFilter Sample/HCKalmanFilter Sample.xcodeproj/project.pbxproj b/HCKalmanFilter Sample/HCKalmanFilter Sample.xcodeproj/project.pbxproj
index 6ebb116..e790e22 100644
--- a/HCKalmanFilter Sample/HCKalmanFilter Sample.xcodeproj/project.pbxproj
+++ b/HCKalmanFilter Sample/HCKalmanFilter Sample.xcodeproj/project.pbxproj
@@ -405,7 +405,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.hypercubesoft.HCKalmanFilter;
PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
+ SWIFT_VERSION = 4.2;
};
name = Debug;
};
@@ -420,7 +420,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.hypercubesoft.HCKalmanFilter;
PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
+ SWIFT_VERSION = 4.2;
};
name = Release;
};
diff --git a/HCKalmanFilter Sample/HCKalmanFilter Sample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/HCKalmanFilter Sample/HCKalmanFilter Sample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/HCKalmanFilter Sample/HCKalmanFilter Sample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+
+
+
+
+ IDEDidComputeMac32BitWarning
+
+
+
diff --git a/HCKalmanFilter Sample/HCKalmanFilter Sample.xcodeproj/xcuserdata/gerhardbos.xcuserdatad/xcschemes/xcschememanagement.plist b/HCKalmanFilter Sample/HCKalmanFilter Sample.xcodeproj/xcuserdata/gerhardbos.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..03a9019
--- /dev/null
+++ b/HCKalmanFilter Sample/HCKalmanFilter Sample.xcodeproj/xcuserdata/gerhardbos.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+
+
+
+
+ SchemeUserState
+
+ HCKalmanFilter Sample.xcscheme_^#shared#^_
+
+ orderHint
+ 0
+
+
+
+
diff --git a/HCKalmanFilter Sample/HCKalmanFilter Sample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/HCKalmanFilter Sample/HCKalmanFilter Sample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/HCKalmanFilter Sample/HCKalmanFilter Sample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+
+
+
+
+ IDEDidComputeMac32BitWarning
+
+
+
diff --git a/HCKalmanFilter Sample/HCKalmanFilter Sample.xcworkspace/xcuserdata/gerhardbos.xcuserdatad/UserInterfaceState.xcuserstate b/HCKalmanFilter Sample/HCKalmanFilter Sample.xcworkspace/xcuserdata/gerhardbos.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..8cb585e
Binary files /dev/null and b/HCKalmanFilter Sample/HCKalmanFilter Sample.xcworkspace/xcuserdata/gerhardbos.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/HCKalmanFilter Sample/HCKalmanFilter Sample/Assets.xcassets/AppIcon.appiconset/Contents.json b/HCKalmanFilter Sample/HCKalmanFilter Sample/Assets.xcassets/AppIcon.appiconset/Contents.json
index 36fc834..2a33078 100644
--- a/HCKalmanFilter Sample/HCKalmanFilter Sample/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/HCKalmanFilter Sample/HCKalmanFilter Sample/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -144,6 +144,11 @@
"filename" : "Icon-App-83.5x83.5@2x.png",
"scale" : "2x"
},
+ {
+ "idiom" : "ios-marketing",
+ "size" : "1024x1024",
+ "scale" : "1x"
+ },
{
"size" : "60x60",
"idiom" : "car",
@@ -190,6 +195,20 @@
"role" : "appLauncher",
"subtype" : "38mm"
},
+ {
+ "size" : "44x44",
+ "idiom" : "watch",
+ "scale" : "2x",
+ "role" : "appLauncher",
+ "subtype" : "40mm"
+ },
+ {
+ "size" : "50x50",
+ "idiom" : "watch",
+ "scale" : "2x",
+ "role" : "appLauncher",
+ "subtype" : "44mm"
+ },
{
"size" : "86x86",
"idiom" : "watch",
@@ -203,6 +222,18 @@
"scale" : "2x",
"role" : "quickLook",
"subtype" : "42mm"
+ },
+ {
+ "size" : "108x108",
+ "idiom" : "watch",
+ "scale" : "2x",
+ "role" : "quickLook",
+ "subtype" : "44mm"
+ },
+ {
+ "idiom" : "watch-marketing",
+ "size" : "1024x1024",
+ "scale" : "1x"
}
],
"info" : {
diff --git a/HCKalmanFilter.podspec b/HCKalmanFilter.podspec
index 017765f..d8326e7 100644
--- a/HCKalmanFilter.podspec
+++ b/HCKalmanFilter.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
s.platform = :ios
s.name = "HCKalmanFilter"
-s.version = "1.2.2"
+s.version = "1.2.3"
s.summary = "HCKalmanFilter is Swift implementation of Kalman filter algorithm intended to solve problem with GPS tracking"
s.description = <<-DESC
@@ -17,6 +17,6 @@ s.source = { :git => "https://github.com/Hypercubesoft/HCKalmanFilter.
s.ios.deployment_target = "9.0"
s.source_files = "HCKalmanFilter/*"
-s.dependency 'Surge', '~> 2.0.0'
+s.dependency 'Surge', '~> 2.3.0'
end
\ No newline at end of file
diff --git a/HCKalmanFilter/HCKalmanAlgorithm.swift b/HCKalmanFilter/HCKalmanAlgorithm.swift
index 77b7007..e23c522 100644
--- a/HCKalmanFilter/HCKalmanAlgorithm.swift
+++ b/HCKalmanFilter/HCKalmanAlgorithm.swift
@@ -241,8 +241,8 @@ open class HCKalmanAlgorithm
let lon = xk1.matrix[2,0]
let altitude = xk1.matrix[4,0]
- let kalmanCLLocation = CLLocation(coordinate: CLLocationCoordinate2D(latitude: lat,longitude: lon), altitude: altitude, horizontalAccuracy: self.previousLocation.horizontalAccuracy, verticalAccuracy: self.previousLocation.verticalAccuracy, timestamp: previousMeasureTime)
-
+ let kalmanCLLocation = CLLocation(coordinate: CLLocationCoordinate2D(latitude: lat,longitude: lon), altitude: altitude, horizontalAccuracy: self.previousLocation.horizontalAccuracy, verticalAccuracy: self.previousLocation.verticalAccuracy, course:self.previousLocation.course, speed:self.previousLocation.speed, timestamp: previousMeasureTime)
+
return kalmanCLLocation
}
}
diff --git a/HCKalmanFilter/HCMatrixObject.swift b/HCKalmanFilter/HCMatrixObject.swift
index d99d301..70159ef 100644
--- a/HCKalmanFilter/HCMatrixObject.swift
+++ b/HCKalmanFilter/HCMatrixObject.swift
@@ -173,7 +173,7 @@ class HCMatrixObject
{
let result = HCMatrixObject(rows: left.rows, columns: left.columns)
- result.matrix = Surge.add(left.matrix, y: right.matrix)
+ result.matrix = Surge.add(left.matrix, right.matrix)
return result
}
@@ -214,7 +214,7 @@ class HCMatrixObject
/// - returns: result HCMatrixObject object of multiplication operation
static func *(left:HCMatrixObject, right:HCMatrixObject) -> HCMatrixObject?
{
- let resultMatrix = Surge.mul(left.matrix, y: right.matrix)
+ let resultMatrix = Surge.mul(left.matrix, right.matrix)
let result = HCMatrixObject(rows: resultMatrix.rows,columns: resultMatrix.columns)
result.matrix = resultMatrix
@@ -222,4 +222,3 @@ class HCMatrixObject
return result
}
}
-