Modify a minor issue on AWAREFetchSizeAdjuster

Author: tetujin

AWAREFramework.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'AWAREFramework'
-  s.version          = '1.14.13'
+  s.version          = '1.14.14'
   s.summary          = 'AWARE: An Open-source Context Instrumentation Framework'
 
 # This description is used to generate tags and improve search results.

AWAREFramework/Classes/Core/Storage/SQLite/SQLiteSeparatedStorage.h

@@ -7,6 +7,7 @@
 
 #import "AWAREStorage.h"
 #import "BaseCoreDataHandler.h"
+#import "AWAREFetchSizeAdjuster.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -18,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 //typedef void (^InsertCallBack)(NSDictionary <NSString *, id> * _Nonnull dataDict,
 //                                     NSManagedObjectContext * _Nonnull childContext,
 //                                     NSString * _Nonnull entity );
+@property AWAREFetchSizeAdjuster * fetchSizeAdjuster;
 
 - (instancetype _Nonnull )initWithStudy:(AWAREStudy * _Nullable) study
                              sensorName:(NSString * _Nonnull) name

AWAREFramework/Classes/Core/Storage/SQLite/SQLiteSeparatedStorage.m

@@ -29,9 +29,10 @@ @implementation SQLiteSeparatedStorage{
     BaseCoreDataHandler * coreDataHandler;
     // SyncExecutor * executor;
     id<AWARESyncExecutorDelegate> executorDelegate;
-    AWAREFetchSizeAdjuster * fetchSizeAdjuster;
 }
 
+@synthesize fetchSizeAdjuster;
+
 - (instancetype)initWithStudy:(AWAREStudy *)study sensorName:(NSString *)name{
     NSLog(@"[NOTE] Please use -initWithStudy:sensorName:objectModelName:indexModelName:dbHandler:");
     BaseCoreDataHandler * handler = [[BaseCoreDataHandler alloc] init];
@@ -286,6 +287,7 @@ - (void) syncTask {
             NSDate  * s = [NSDate new];
             NSArray * indexes = [private executeFetchRequest:fetchRequest error:&error];
             if (self.isDebug) NSLog(@"[%@][%@] FETCH SPEED: (%ld) New SQLite ---> %f", self.sensorName, self, indexes.count, [[NSDate new] timeIntervalSinceDate:s] );
+            if (self.isDebug) NSLog(@"[%@] FetchSize: %ld", self.sensorName, self->fetchSizeAdjuster.fetchSize );
 
             NSMutableArray * results = [@[] mutableCopy];
             if (indexes!=nil && indexes.count>0) {

AWAREFramework/Classes/Core/Storage/Tools/AWAREFetchSizeAdjuster.h

@@ -15,6 +15,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (readonly) NSInteger fetchSize;
 @property BOOL debug;
 
+- (void) setMaxFetchSize:(NSInteger) maxFetchSize;
+
 - (instancetype) initWithSensorName:(NSString *)sensorName;
 - (void) success;
 - (void) failure;

AWAREFramework/Classes/Core/Storage/Tools/AWAREFetchSizeAdjuster.m

@@ -10,6 +10,7 @@
 @implementation AWAREFetchSizeAdjuster{
     NSString * sensor;
     NSString * key;
+    NSNumber * _maxFetchSize;
 }
 
 @synthesize totalSuccess;
@@ -33,6 +34,8 @@ -(instancetype)initWithSensorName:(NSString *)sensorName{
     return self;
 }
 
+
+
 - (void)success{
     totalSuccess = totalSuccess + 1;
     if(self.debug) NSLog(@"[AWAREFetchSizeAdjuster] SUCCESS : %ld", totalSuccess);
@@ -41,6 +44,16 @@ - (void)success{
 
     if(self.debug) NSLog(@"[AWAREFetchSizeAdjuster] THRESHOLD TO INCREASE FETCH SIZE : %f", threshold);
     if (totalSuccess >= threshold) {
+        
+        if (_maxFetchSize != NULL) {
+            if(self.debug) NSLog(@"[AWAREFetchSizeAdjuster] MAX_FETCH_SIZE: %@, FETCH_SIZE: %ld", _maxFetchSize, (long)fetchSize);
+            if (_maxFetchSize.integerValue <= fetchSize) {
+                fetchSize = _maxFetchSize.integerValue;
+                [self updateFetchSize:fetchSize];
+                return;
+            }
+        }
+        
         totalSuccess = 0;
         fetchSize = fetchSize + 1;
         if(self.debug) NSLog(@"[AWAREFetchSizeAdjuster] Fetch Size INCREASE : %ld", (long)fetchSize);
@@ -71,4 +84,14 @@ - (void) updateFetchSize:(NSInteger)fetchSize{
     [defaults synchronize];
 }
 
+
+- (void) setMaxFetchSize:(NSInteger) maxFetchSize {
+    if (maxFetchSize <= fetchSize) {
+        fetchSize = maxFetchSize;
+        [self updateFetchSize:fetchSize];
+        _maxFetchSize = [[NSNumber alloc] initWithInteger:maxFetchSize];
+    }
+}
+
+
 @end

Example/AWARE-SensingApp/AppDelegate.swift

@@ -23,42 +23,76 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after applicatio
         // setup AWARECore
+        
         let core = AWARECore.shared()
         core.requestPermissionForBackgroundSensing { (status) in
             core.requestPermissionForPushNotification(completion: nil)
             core.activate()
 
+            print(cleanOldDataTypeDaily)
+            AWAREStudy.shared().setCleanOldDataType(cleanOldDataTypeDaily)
+            AWAREStudy.shared().setDebug(true)
+            
+            AWAREStudy.shared().setStudyURL("https://yahoo-earable.an.r.appspot.com/index.php/webservice/index/1/hlkrKP13AB")
+            
+            print(AWAREStudy.shared().getCleanOldDataType())
+            
+            let study = AWAREStudy.shared()
             // init sensors
-            let accelerometer = Accelerometer()
-//            let gyroscope     = Gyroscope()
-//            let battery       = Battery()
-//            let screen        = Screen()
-//            let call          = Calls()
-//            let ambientNoise  = AmbientNoise()
-//            let activity      = IOSActivityRecognition()
-//            let step          = Pedometer()
-//            let bluetooth     = Bluetooth()
-//            let cal           = Calendar()
-//            let healthKit     = AWAREHealthKit()
-            let weather = OpenWeather()
-            self.sensorManager.add(weather)
-            weather.setSensorEventHandler { sensor, data in
-                if let d = data {
-                    print(d)
-                }
-            }
+            let accelerometer = Accelerometer(awareStudy: study)
+            accelerometer.setSensingIntervalWithHz(100)
+            accelerometer.setSavingIntervalWithSecond(5)
+            (accelerometer.storage as! SQLiteSeparatedStorage).fetchSizeAdjuster.setMaxFetchSize(2);
+            accelerometer.storage?.setDebug(true)
+            
+            let gyroscope     = Gyroscope(awareStudy: study)
+            gyroscope.setSensingIntervalWithHz(100)
+            gyroscope.setSavingIntervalWithSecond(5)
+            (gyroscope.storage as! SQLiteSeparatedStorage).fetchSizeAdjuster.setMaxFetchSize(3);
+             
+
+            let rotation     = Rotation(awareStudy: study)
+            rotation.setSensingIntervalWithHz(100)
+            rotation.setSavingIntervalWithSecond(5)
+            (rotation.storage as! SQLiteSeparatedStorage).fetchSizeAdjuster.setMaxFetchSize(3);
+            
+            let lAccelerometer     = LinearAccelerometer(awareStudy: study)
+            lAccelerometer.setSensingIntervalWithHz(100)
+            lAccelerometer.setSavingIntervalWithSecond(5)
+            (lAccelerometer.storage as! SQLiteSeparatedStorage).fetchSizeAdjuster.setMaxFetchSize(3);
+            
+            let mag = Magnetometer(awareStudy: study)
+            mag.setSensingIntervalWithHz(100)
+            mag.setSavingIntervalWithSecond(5)
+            (mag.storage as! SQLiteSeparatedStorage).fetchSizeAdjuster.setMaxFetchSize(3);
+            
+            let headphone = HeadphoneMotion(awareStudy: study)
+            headphone.setSensingIntervalWithHz(100)
+            headphone.setSavingIntervalWithSecond(5)
+            (headphone.storage as! SQLiteSeparatedStorage).fetchSizeAdjuster.setMaxFetchSize(3);
+            
+            //            let battery       = Battery()
+            //            let screen        = Screen()
+            //            let call          = Calls()
+            //            let ambientNoise  = AmbientNoise()
+            //            let activity      = IOSActivityRecognition()
+            //            let step          = Pedometer()
+            //            let bluetooth     = Bluetooth()
+            //            let cal           = Calendar()
+            //            let healthKit     = AWAREHealthKit()
 
             // add the sensors into AWARESensorManager
-            self.sensorManager.add(accelerometer)
-//            self.sensorManager.add([accelerometer, gyroscope, battery, screen, call, ambientNoise, activity, step, bluetooth, cal, healthKit])
+            self.sensorManager.add([accelerometer,gyroscope,rotation,lAccelerometer,mag,headphone])
+//            self.sensorManager.add(accelerometer)
+            //            self.sensorManager.add([accelerometer, gyroscope, battery, screen, call, ambientNoise, activity, step, bluetooth, cal, healthKit])
             self.sensorManager.startAllSensors()
-
+            
             // setup ESMs
             // generate ESMItem
             let pam = ESMItem(asPAMESMWithTrigger: "pam")
             pam.setTitle("How do you feeling now?")
             pam.setInstructions("Please select an image.")
-
+            
             // generate ESMSchedule
             let esm = ESMSchedule()
             esm.scheduleId = "schedule_1"
@@ -68,11 +102,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             esm.expirationThreshold = 60
             esm.addESM(pam)
             esm.notificationTitle = "Tap to answer the question."
-
+            
             // add the ESMSchedules into ESMScheduleManager
             let esmManager = ESMScheduleManager.shared()
             esmManager.deleteAllSchedules(withNotification: true)
             esmManager.add(esm, withNotification: true)
+            
         }
 
         // monitoring battery consumption

Example/AWARE-SensingApp/ViewController.swift

@@ -29,6 +29,8 @@ class ViewController: UIViewController {
 
     override func viewDidAppear(_ animated: Bool) {
 
+        AWARESensorManager.shared().syncAllSensorsForcefully()
+        
         checkESMSchedules()
 
         Timer.scheduledTimer(withTimeInterval: 1, repeats: false) { (timer) in

Example/Podfile.lock

@@ -1,18 +1,18 @@
 PODS:
-  - AWAREFramework (1.14.9):
-    - AWAREFramework/Core (= 1.14.9)
-  - AWAREFramework/Bluetooth (1.14.9):
+  - AWAREFramework (1.14.14):
+    - AWAREFramework/Core (= 1.14.14)
+  - AWAREFramework/Bluetooth (1.14.14):
     - AWAREFramework/Core
-  - AWAREFramework/Calendar (1.14.9):
+  - AWAREFramework/Calendar (1.14.14):
     - AWAREFramework/Core
-  - AWAREFramework/Contact (1.14.9):
+  - AWAREFramework/Contact (1.14.14):
     - AWAREFramework/Core
-  - AWAREFramework/Core (1.14.9)
-  - AWAREFramework/HealthKit (1.14.9):
+  - AWAREFramework/Core (1.14.14)
+  - AWAREFramework/HealthKit (1.14.14):
     - AWAREFramework/Core
-  - AWAREFramework/Microphone (1.14.9):
+  - AWAREFramework/Microphone (1.14.14):
     - AWAREFramework/Core
-  - AWAREFramework/MotionActivity (1.14.9):
+  - AWAREFramework/MotionActivity (1.14.14):
     - AWAREFramework/Core
 
 DEPENDENCIES:
@@ -29,8 +29,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  AWAREFramework: 782dc3162417afc67f313a8b3bf298b46654acf1
+  AWAREFramework: a4a008d93c81832975ff9a00cbcd132fe9ff0c78
 
 PODFILE CHECKSUM: b61851acdb08152e0f516a94053544d7f18c88bf
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.16.1