From 9c47ebb8fcca6c9164c9d327f0b303c1b10ee681 Mon Sep 17 00:00:00 2001
From: Patrick Ecker <patrick.ecker@gmail.com>
Date: Thu, 16 Jun 2011 18:31:59 +0200
Subject: [PATCH] added DTW to app

---
 .../src/at/mus/recognition/DTW.java                |  6 ++--
 .../GestureSensitiveControl/default.properties     |  2 +-
 .../gen/at/mus/GestureSensitiveControl/R.java      |  7 ++---
 .../GestureSensitiveControl/res/layout/main.xml    | 14 ++++-----
 .../GestureSensitiveControl/GestureActivity.java   | 36 ++++++++++++++++------
 5 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/GestureDetectionApp/GestureRecognition/src/at/mus/recognition/DTW.java b/GestureDetectionApp/GestureRecognition/src/at/mus/recognition/DTW.java
index 99c31e7..f33f861 100644
--- a/GestureDetectionApp/GestureRecognition/src/at/mus/recognition/DTW.java
+++ b/GestureDetectionApp/GestureRecognition/src/at/mus/recognition/DTW.java
@@ -51,7 +51,7 @@ public class DTW implements IRecognizer {
 
 	private List<ICoordinate> compress(List<ICoordinate> points) {
 		List<ICoordinate> compressed = new ArrayList<ICoordinate>();
-		int windowSize = 20, stepSize = 12;
+		int windowSize = 10, stepSize = 6;
 
 		for(int i = 0, l = points.size(); i+windowSize < l; i += stepSize) {
 			ICoordinate total = new Acceleration(0, 0, 0);
@@ -82,8 +82,8 @@ public class DTW implements IRecognizer {
 	private float quantizeSymm(float f) {
 		final float g = 10f;//9.8f;
 		if(f > 2*g) return 16;
-		if(f > g) return 11+Math.round(5*(f-g)/g); // 11-15
-		if(f > 0) return 1+Math.round(10*f/g); // 1-10
+		if(f > g) return 11+(int)(5*(f-g)/g); // 11-15
+		if(f > 0) return 1+(int)(10*f/g); // 1-10
 		return 0;
 	}
 }
diff --git a/GestureDetectionApp/GestureSensitiveControl/default.properties b/GestureDetectionApp/GestureSensitiveControl/default.properties
index 46769a7..66db0d1 100644
--- a/GestureDetectionApp/GestureSensitiveControl/default.properties
+++ b/GestureDetectionApp/GestureSensitiveControl/default.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-7
+target=android-10
diff --git a/GestureDetectionApp/GestureSensitiveControl/gen/at/mus/GestureSensitiveControl/R.java b/GestureDetectionApp/GestureSensitiveControl/gen/at/mus/GestureSensitiveControl/R.java
index fbd6685..176788b 100644
--- a/GestureDetectionApp/GestureSensitiveControl/gen/at/mus/GestureSensitiveControl/R.java
+++ b/GestureDetectionApp/GestureSensitiveControl/gen/at/mus/GestureSensitiveControl/R.java
@@ -21,13 +21,12 @@ public final class R {
         public static final int btnSendDevMessag1=0x7f050006;
         public static final int btnSendDevMessag2=0x7f050007;
         public static final int btnStartGesture=0x7f050008;
-        public static final int lbAcceleration=0x7f05000b;
-        public static final int lbGyroscope=0x7f05000d;
+        public static final int lbAcceleration=0x7f05000a;
+        public static final int lbGyroscope=0x7f05000c;
         public static final int lbInformation=0x7f050000;
         public static final int lbLine=0x7f050001;
-        public static final int lbOrientation=0x7f05000c;
+        public static final int lbOrientation=0x7f05000b;
         public static final int txtServerIp=0x7f050004;
-        public static final int txtSubject=0x7f05000a;
     }
     public static final class layout {
         public static final int main=0x7f030000;
diff --git a/GestureDetectionApp/GestureSensitiveControl/res/layout/main.xml b/GestureDetectionApp/GestureSensitiveControl/res/layout/main.xml
index 78d2221..9b41c5d 100644
--- a/GestureDetectionApp/GestureSensitiveControl/res/layout/main.xml
+++ b/GestureDetectionApp/GestureSensitiveControl/res/layout/main.xml
@@ -24,12 +24,12 @@
 	</LinearLayout>
 	<LinearLayout android:orientation="horizontal"
 		android:layout_width="fill_parent" android:layout_height="wrap_content">
-		<Button android:text="Dev-Message 1"
-			android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:id="@+id/btnSendDevMessag1" android:enabled="false" />
-		<Button android:text="Dev-Message 2"
-			android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:enabled="false" android:id="@+id/btnSendDevMessag2" />
+		<Button android:text="Dev-Message 1" android:layout_width="wrap_content"
+			android:layout_height="wrap_content" android:id="@+id/btnSendDevMessag1"
+			android:enabled="false" />
+		<Button android:text="Dev-Message 2" android:layout_width="wrap_content"
+			android:layout_height="wrap_content" android:enabled="false"
+			android:id="@+id/btnSendDevMessag2" />
 	</LinearLayout>
 	<Button android:text="Start Gesture" android:id="@+id/btnStartGesture"
 		android:enabled="true" android:layout_height="80dip"
@@ -38,8 +38,6 @@
 		android:enabled="true" android:layout_height="80dip"
 		android:layout_width="fill_parent" />
 
-	<EditText android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:text="Kreis" android:id="@+id/txtSubject"></EditText>
 	<TextView android:layout_width="fill_parent" android:text="Accelerometer"
 		android:layout_height="wrap_content" android:id="@+id/lbAcceleration" />
 	<TextView android:layout_width="fill_parent" android:text="Orientation"
diff --git a/GestureDetectionApp/GestureSensitiveControl/src/at/mus/GestureSensitiveControl/GestureActivity.java b/GestureDetectionApp/GestureSensitiveControl/src/at/mus/GestureSensitiveControl/GestureActivity.java
index 0721350..68ef950 100644
--- a/GestureDetectionApp/GestureSensitiveControl/src/at/mus/GestureSensitiveControl/GestureActivity.java
+++ b/GestureDetectionApp/GestureSensitiveControl/src/at/mus/GestureSensitiveControl/GestureActivity.java
@@ -24,9 +24,15 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+import at.mus.recognition.Acceleration;
+import at.mus.recognition.DTW;
+import at.mus.recognition.ICoordinate;
+import at.mus.recognition.IRecognizer;
+import at.mus.recognition.Result;
 import at.mus.recognition.Vector;
 
 public class GestureActivity extends Activity implements SensorEventListener {
+	
 	// ui elements
 	private Button btnFindServer;
 	private Button btnCloseApp;
@@ -40,7 +46,6 @@ public class GestureActivity extends Activity implements SensorEventListener {
 	private TextView lbOrientation;
 	private TextView lbGyroscope;
 	private EditText txtServerIp;
-	private EditText txtSubject;
 
 	// communication
 	private Socket clientSocket;
@@ -52,12 +57,15 @@ public class GestureActivity extends Activity implements SensorEventListener {
 	private SensorManager mSensorManager;
 	private Sensor mAccelerometer;
 	private Sensor mOrientation;
-	private Sensor mGyroscope;
+	private Sensor mLinearAcceleration;
 
 	private ArrayList<Vector> acclerationValues = new ArrayList<Vector>();
 	private static final NumberFormat codePointFormat = DecimalFormat
 			.getInstance(Locale.ENGLISH);
 
+	private IRecognizer dtw = new DTW();
+	private ArrayList<ICoordinate> data = new ArrayList<ICoordinate>();
+	
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -69,7 +77,6 @@ public class GestureActivity extends Activity implements SensorEventListener {
 		lbOrientation = (TextView) findViewById(R.id.lbOrientation);
 		lbGyroscope = (TextView) findViewById(R.id.lbGyroscope);
 		txtServerIp = (EditText) findViewById(R.id.txtServerIp);
-		txtSubject = (EditText) findViewById(R.id.txtSubject);
 		btnFindServer = (Button) findViewById(R.id.btnFindServer);
 		btnFindServer.setOnClickListener(new OnClickListener() {
 			public void onClick(View v) {
@@ -121,6 +128,7 @@ public class GestureActivity extends Activity implements SensorEventListener {
 			public void onClick(View v) {
 				startGesture();
 			}
+			
 		});
 		btnEndGesture = (Button) findViewById(R.id.btnEndGesture);
 		btnEndGesture.setOnClickListener(new OnClickListener() {
@@ -187,7 +195,7 @@ public class GestureActivity extends Activity implements SensorEventListener {
 		if (mSensorManager != null) { // maybe delete this one
 			mSensorManager.registerListener(this, mAccelerometer,
 					SensorManager.SENSOR_DELAY_NORMAL);
-			mSensorManager.registerListener(this, mGyroscope,
+			mSensorManager.registerListener(this, mLinearAcceleration,
 					SensorManager.SENSOR_DELAY_NORMAL);
 			mSensorManager.registerListener(this, mOrientation,
 					SensorManager.SENSOR_DELAY_NORMAL);
@@ -207,15 +215,17 @@ public class GestureActivity extends Activity implements SensorEventListener {
 		mAccelerometer = mSensorManager
 				.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
 		mOrientation = mSensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION);
-		mGyroscope = mSensorManager.getDefaultSensor(Sensor.TYPE_LINEAR_ACCELERATION);
+		mLinearAcceleration = mSensorManager
+				.getDefaultSensor(Sensor.TYPE_LINEAR_ACCELERATION);
 
 		// clear list
+		data.clear();
 		acclerationValues.clear();
 
 		// register listener
 		mSensorManager.registerListener(this, mAccelerometer,
 				SensorManager.SENSOR_DELAY_FASTEST);
-		mSensorManager.registerListener(this, mGyroscope,
+		mSensorManager.registerListener(this, mLinearAcceleration,
 				SensorManager.SENSOR_DELAY_FASTEST);
 		mSensorManager.registerListener(this, mOrientation,
 				SensorManager.SENSOR_DELAY_NORMAL);
@@ -225,7 +235,10 @@ public class GestureActivity extends Activity implements SensorEventListener {
 		// deregister listener
 		mSensorManager.unregisterListener(this);
 
-		this.createVectorListCode(acclerationValues);
+		Result r = dtw.recognize(data, Templates.templates, 0, 0, null);
+		lbGyroscope.setText(r.getTemplate().name);
+		
+	//	this.createVectorListCode(acclerationValues);
 	}
 
 	// will be called if accuracy changes
@@ -239,6 +252,8 @@ public class GestureActivity extends Activity implements SensorEventListener {
 			s = String.format("Acc.: X:%f Y:%f Z:%f", event.values[0],
 					event.values[1], event.values[2]);
 			lbAcceleration.setText(s);
+
+		
 		}
 		if (event.sensor.getType() == Sensor.TYPE_ORIENTATION) {
 			s = String.format("%s %n Orientation: X:%f Y:%f Z:%f", s,
@@ -250,8 +265,11 @@ public class GestureActivity extends Activity implements SensorEventListener {
 			s = String.format("LinAcc.: X:%f Y:%f Z:%f", event.values[0],
 					event.values[1], event.values[2]);
 			lbGyroscope.setText(s);
+			
+			data.add(new Acceleration(event.values[0], event.values[1],
+					event.values[2]));
+			acclerationValues.add(new Vector(event.values));
 		}
-		acclerationValues.add(new Vector(event.values));
 	}
 
 	private void createVectorListCode(List<Vector> points) {
@@ -278,7 +296,7 @@ public class GestureActivity extends Activity implements SensorEventListener {
 		emailIntent.putExtra(android.content.Intent.EXTRA_CC, new String[] {
 				"martin.enzelsberger@fh-hagenberg.at", "knittl89@gmail.com" });
 		emailIntent.putExtra(android.content.Intent.EXTRA_SUBJECT,
-				"MUS Testdata - " + txtSubject.getText().toString());
+				"MUS Testdata - Links");
 		emailIntent.putExtra(android.content.Intent.EXTRA_TEXT, sb.toString());
 		this.startActivity(Intent.createChooser(emailIntent, "Send mail..."));
 	}
-- 
2.11.4.GIT