Add getSensorModuleType() to SKSensorData

minoskt · minoskt · commit b225355d8271 · 2015-07-29T23:29:55.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
   - Added support for Bluetooth sensor module.
   - DataInterface method getDataInString() has been renamed to getDataInCSV()
   - SKDataInterface has been renamed to SKSensorData
+  - Added getSensorModuleType() to SKSensorData
   - Added SK prefix to all source files
 
 ### 0.1.0
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKAbstractData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKAbstractData.java
@@ -21,24 +21,32 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 public abstract class SKAbstractData implements SKSensorData
 {
     @SuppressWarnings("unused")
     private static final String TAG = "SKAbstractData";
 
+    protected final SKSensorModuleType moduleType;
     protected final long timestamp;
 
-    public SKAbstractData(long timestamp) {
+    public SKAbstractData(SKSensorModuleType moduleType, long timestamp) {
+        this.moduleType = moduleType;
         this.timestamp = timestamp;
     }
 
     public String toString() {
         return this.getDataInCSV();
     }
 
+    @SuppressWarnings("unused")
+    public SKSensorModuleType getSensorModuleType() {
+        return moduleType;
+    }
+
     @SuppressWarnings("unused")
     public long getTimestamp() {
         return timestamp;
     }
-
 }
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKAccelerometerData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKAccelerometerData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKAccelerometerData extends SKAbstractData {
@@ -34,7 +36,7 @@ public class SKAccelerometerData extends SKAbstractData {
 
     public SKAccelerometerData(long timestamp, float x, float y, float z) {
 
-        super(timestamp);
+        super(SKSensorModuleType.ACCELEROMETER, timestamp);
 
         this.x = x;
         this.y = y;
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKActivityData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKActivityData.java
@@ -23,6 +23,8 @@
 
 import com.google.android.gms.location.DetectedActivity;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKActivityData extends SKAbstractData {
@@ -35,7 +37,7 @@ public class SKActivityData extends SKAbstractData {
 
     public SKActivityData(long timestamp, int activityType, int confidence) {
 
-        super(timestamp);
+        super(SKSensorModuleType.ACTIVITY, timestamp);
 
         this.activityType = activityType;
         this.confidence = confidence;
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKAmbientTemperatureData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKAmbientTemperatureData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKAmbientTemperatureData extends SKAbstractData {
@@ -32,7 +34,7 @@ public class SKAmbientTemperatureData extends SKAbstractData {
 
     public SKAmbientTemperatureData(long timestamp, float temperature) {
 
-        super(timestamp);
+        super(SKSensorModuleType.AMBIENT_TEMPERATURE, timestamp);
 
         this.temperature = temperature;
     }
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKAudioLevelData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKAudioLevelData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKAudioLevelData extends SKAbstractData {
@@ -32,7 +34,7 @@ public class SKAudioLevelData extends SKAbstractData {
 
     public SKAudioLevelData(long timestamp, int level) {
 
-        super(timestamp);
+        super(SKSensorModuleType.AUDIO_LEVEL, timestamp);
 
         this.level = level;
     }
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKBatteryData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKBatteryData.java
@@ -23,6 +23,8 @@
 
 import android.os.BatteryManager;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 import static android.os.BatteryManager.*;
@@ -42,7 +44,7 @@ public class SKBatteryData extends SKAbstractData {
 
     public SKBatteryData(long timestamp, int level, int scale, int temperature, int voltage, int plugged, int status, int health) {
 
-        super(timestamp);
+        super(SKSensorModuleType.BATTERY, timestamp);
 
         this.level = level;
         this.scale = scale;
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKBluetoothData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKBluetoothData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.ArrayList;
 import java.util.Locale;
 
@@ -33,7 +35,7 @@ public class SKBluetoothData extends SKAbstractData {
 
     public SKBluetoothData(long timestamp, ArrayList<SKBluetoothDeviceData> bluetoothDevices) {
 
-        super(timestamp);
+        super(SKSensorModuleType.BLUETOOTH, timestamp);
 
         this.mBluetoothDevices = bluetoothDevices;
     }
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKBluetoothDeviceData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKBluetoothDeviceData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKBluetoothDeviceData extends SKAbstractData {
@@ -34,7 +36,7 @@ public class SKBluetoothDeviceData extends SKAbstractData {
 
     public SKBluetoothDeviceData(long timestamp, String name, String address, int rssi) {
 
-        super(timestamp);
+        super(SKSensorModuleType.BLUETOOTH, timestamp);
 
         this.name = name;
         this.address = address;
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKGravityData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKGravityData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKGravityData extends SKAbstractData {
@@ -34,7 +36,7 @@ public class SKGravityData extends SKAbstractData {
 
     public SKGravityData(long timestamp, float x, float y, float z) {
 
-        super(timestamp);
+        super(SKSensorModuleType.GRAVITY, timestamp);
 
         this.x = x;
         this.y = y;
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKGyroscopeData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKGyroscopeData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKGyroscopeData extends SKAbstractData {
@@ -34,7 +36,7 @@ public class SKGyroscopeData extends SKAbstractData {
 
     public SKGyroscopeData(long timestamp, float x, float y, float z) {
 
-        super(timestamp);
+        super(SKSensorModuleType.GYROSCOPE, timestamp);
 
         this.x = x;
         this.y = y;
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKLightData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKLightData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKLightData extends SKAbstractData {
@@ -32,7 +34,7 @@ public class SKLightData extends SKAbstractData {
 
     public SKLightData(long timestamp, float light) {
 
-        super(timestamp);
+        super(SKSensorModuleType.LIGHT, timestamp);
 
         this.light = light;
     }
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKLinearAccelerationData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKLinearAccelerationData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKLinearAccelerationData extends SKAbstractData {
@@ -34,7 +36,7 @@ public class SKLinearAccelerationData extends SKAbstractData {
 
     public SKLinearAccelerationData(long timestamp, float x, float y, float z) {
 
-        super(timestamp);
+        super(SKSensorModuleType.LINEAR_ACCELERATION, timestamp);
 
         this.x = x;
         this.y = y;
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKLocationData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKLocationData.java
@@ -23,6 +23,8 @@
 
 import android.location.Location;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 
@@ -35,7 +37,7 @@ public class SKLocationData extends SKAbstractData {
 
     public SKLocationData(long timestamp, Location location) {
 
-        super(timestamp);
+        super(SKSensorModuleType.LOCATION, timestamp);
 
         this.location = location;
     }
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKMagnetometerData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKMagnetometerData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKMagnetometerData extends SKAbstractData {
@@ -34,7 +36,7 @@ public class SKMagnetometerData extends SKAbstractData {
 
     public SKMagnetometerData(long timestamp, float x, float y, float z) {
 
-        super(timestamp);
+        super(SKSensorModuleType.MAGNETOMETER, timestamp);
 
         this.x = x;
         this.y = y;
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKRotationData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKRotationData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKRotationData extends SKAbstractData {
@@ -36,7 +38,7 @@ public class SKRotationData extends SKAbstractData {
 
     public SKRotationData(long timestamp, float x, float y, float z, float cos, float headingAccuracy) {
 
-        super(timestamp);
+        super(SKSensorModuleType.ROTATION, timestamp);
 
         this.x = x;
         this.y = y;
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKScreenStatusData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKScreenStatusData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKScreenStatusData extends SKAbstractData {
@@ -36,7 +38,7 @@ public class SKScreenStatusData extends SKAbstractData {
 
     public SKScreenStatusData(long timestamp, int status) {
 
-        super(timestamp);
+        super(SKSensorModuleType.SCREEN_STATUS, timestamp);
 
         this.status = status;
     }
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKSensorData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKSensorData.java
@@ -21,8 +21,12 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
+@SuppressWarnings("unused")
 public interface SKSensorData {
 
+    SKSensorModuleType getSensorModuleType();
     String getDataInCSV();
 
 }
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKStepCounterData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKStepCounterData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKStepCounterData extends SKAbstractData {
@@ -32,7 +34,7 @@ public class SKStepCounterData extends SKAbstractData {
 
     public SKStepCounterData(long timestamp, float steps) {
 
-        super(timestamp);
+        super(SKSensorModuleType.STEP_COUNTER, timestamp);
 
         this.steps = steps;
     }
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKStepDetectorData.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKStepDetectorData.java
@@ -21,6 +21,8 @@
 
 package org.sensingkit.sensingkitlib.data;
 
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
 import java.util.Locale;
 
 public class SKStepDetectorData extends SKAbstractData {
@@ -30,7 +32,7 @@ public class SKStepDetectorData extends SKAbstractData {
 
     public SKStepDetectorData(long timestamp) {
 
-        super(timestamp);
+        super(SKSensorModuleType.STEP_DETECTOR, timestamp);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -21,24 +21,32 @@`
`21`	`21`
`22`	`22`	`package org.sensingkit.sensingkitlib.data;`
`23`	`23`
	`24`	`+import org.sensingkit.sensingkitlib.SKSensorModuleType;`
	`25`	`+`
`24`	`26`	`public abstract class SKAbstractData implements SKSensorData`
`25`	`27`	`{`
`26`	`28`	`@SuppressWarnings("unused")`
`27`	`29`	`private static final String TAG = "SKAbstractData";`
`28`	`30`
	`31`	`+ protected final SKSensorModuleType moduleType;`
`29`	`32`	`protected final long timestamp;`
`30`	`33`
`31`		`- public SKAbstractData(long timestamp) {`
	`34`	`+ public SKAbstractData(SKSensorModuleType moduleType, long timestamp) {`
	`35`	`+ this.moduleType = moduleType;`
`32`	`36`	`this.timestamp = timestamp;`
`33`	`37`	`}`
`34`	`38`
`35`	`39`	`public String toString() {`
`36`	`40`	`return this.getDataInCSV();`
`37`	`41`	`}`
`38`	`42`
	`43`	`+ @SuppressWarnings("unused")`
	`44`	`+ public SKSensorModuleType getSensorModuleType() {`
	`45`	`+ return moduleType;`
	`46`	`+ }`
	`47`	`+`
`39`	`48`	`@SuppressWarnings("unused")`
`40`	`49`	`public long getTimestamp() {`
`41`	`50`	`return timestamp;`
`42`	`51`	`}`
`43`		`-`
`44`	`52`	`}`