package com.example.wearablesensorbase.detector;

import java.util.HashMap;

import com.example.wearablesensorbase.data.SensorMeasurement;
import com.example.wearablesensorbase.data.SensorMeasurementSeries;

public class Detector {

	private HashMap<String, SensorMeasurementSeries> data;
	
	public Detector(HashMap<String, SensorMeasurementSeries> data) {
		this.data = data;
	}
	
	
	
	public void newMeasurement(String sensor, int index) {
		
//		SensorMeasurement m = data.get(sensor).get(index);
//		SensorMeasurement m2 = data.get(sensor).getLast();
//		m.acceleration.x;
//		m.acceleration.y;
//		m.acceleration.z;
//		m.orientation.x;
//		m.orientation.y;
//		m.orientation.z;
//		m.loudness;
		
		
	}
	
	
	
}

@@ -70,16 +70,81 @@
 shMap;%0A%0A
+import com.example.wearablesensorbase.callibration.Callibration;%0A
 import c
@@ -352,26 +352,89 @@
 a;%0A%09
-%0A%09public Detector(
+private Callibration callibration;%0A%09%0A%09public Detector(Callibration callibration, 
 Hash
@@ -478,16 +478,52 @@
 data) %7B%0A
+%09%09this.callibration = callibration;%0A
 %09%09this.d

Add callibration to Detector