more naming fixes!

RandomForestManager.cpp

@@ -120,14 +120,14 @@ bool randomForestLoadModel(RandomForestManager *r, const char* pathToModelFile)
 /**
  * Maximum spacing between accelerometer readings, in seconds
  */
-float randomForestGetDesiredSpacing(RandomForestManager *r) {
+float randomForestGetDesiredSamplingInterval(RandomForestManager *r) {
     return 1. / r->samplingRateHz;
 }
 
 /**
  * Minimum length of continuous readings, in seconds
  */
-float randomForestGetDesiredDuration(RandomForestManager *r) {
+float randomForestGetDesiredReadingDuration(RandomForestManager *r) {
     // Desired duration is the difference between the time of the first
     // and the time of the last
     return (r->sampleCount - 1) / r->samplingRateHz;

RandomForestManager.h

@@ -7,7 +7,7 @@
 //
 
 #define RANDOM_FOREST_VECTOR_SIZE (13)
-#define RANDOM_FOREST_SAMPLING_RATE_HZ 20f
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -25,8 +25,8 @@ extern "C" {
     RandomForestManager *createRandomForestManagerFromFile(const char* pathToJson);
     bool randomForestLoadModel(RandomForestManager *r, const char* pathToModelFile);
 
-    float randomForestGetDesiredDuration(RandomForestManager *r);
-    float randomForestGetDesiredSpacing(RandomForestManager *r);
+    float randomForestGetDesiredReadingDuration(RandomForestManager *r);
+    float randomForestGetDesiredSamplingInterval(RandomForestManager *r);
     const char* randomForestGetModelUniqueIdentifier(RandomForestManager *r);
 
     bool randomForestManagerCanPredict(RandomForestManager *r);

RandomForestManager.swift

@@ -12,6 +12,17 @@ class RandomForestManager {
     var _ptr: COpaquePointer!
     var classLables: [Int32]!
     var classCount = 0
+    var desiredSampleInterval: NSTimeInterval {
+        get {
+            return Double(randomForestGetDesiredSamplingInterval(_ptr))
+        }
+    }
+
+    var desiredReadingDuration: NSTimeInterval {
+        get {
+            return Double(randomForestGetDesiredReadingDuration(_ptr))
+        }
+    }
 
     struct Static {
         static var onceToken : dispatch_once_t = 0
@@ -31,16 +42,22 @@ class RandomForestManager {
         }
     }
 
-    func startup() {
+    init () {
         guard let configFilePath = NSBundle(forClass: self.dynamicType).pathForResource("config.json", ofType: nil) else {
             return
         }
 
         let cConfigFilepath = configFilePath.cStringUsingEncoding(NSUTF8StringEncoding)
 
         _ptr = createRandomForestManagerFromFile(UnsafeMutablePointer(cConfigFilepath!))
-
-        var modelUIDCString = randomForestGetModelUniqueIdentifier(_ptr)
+    }
+
+    deinit {
+        deleteRandomForestManager(_ptr)
+    }
+
+    func startup() {
+        let modelUIDCString = randomForestGetModelUniqueIdentifier(_ptr)
 
         guard let modelUID = String.fromCString(UnsafePointer(modelUIDCString)) else {
             return
@@ -61,10 +78,6 @@ class RandomForestManager {
         self.classLables = [Int32](count:self.classCount, repeatedValue:0)
         randomForestGetClassLabels(_ptr, UnsafeMutablePointer(self.classLables), Int32(self.classCount))
     }
-
-    deinit {
-        deleteRandomForestManager(_ptr)
-    }
 
     private func accelerometerReadings(forSensorData sensorData:NSOrderedSet)->[AccelerometerReading] {
         var readings: [AccelerometerReading] = []

json/jsoncpp.cpp

@@ -73,7 +73,7 @@ license you like.
 
 
 
-#include "json/json.h"
+#include "json.h"
 
 #ifndef JSON_IS_AMALGAMATION
 #error "Compile with -I PATH_TO_JSON_DIRECTORY"