Index: trunk/autoquest-plugin-guitar/src/main/java/de/ugoe/cs/autoquest/plugin/alignment/DifferenceSubstitutionMatrix.java
===================================================================
--- trunk/autoquest-plugin-guitar/src/main/java/de/ugoe/cs/autoquest/plugin/alignment/DifferenceSubstitutionMatrix.java	(revision 1308)
+++ trunk/autoquest-plugin-guitar/src/main/java/de/ugoe/cs/autoquest/plugin/alignment/DifferenceSubstitutionMatrix.java	(revision 1308)
@@ -0,0 +1,44 @@
+/**
+ * 
+ */
+package de.ugoe.cs.autoquest.plugin.alignment;
+
+/**
+ * @author Ralph Krimmel
+ *
+ */
+public class DifferenceSubstitutionMatrix implements SubstitutionMatrix {
+
+	private int[] input1;
+	private int[] input2;
+	private int maxValue;
+	
+	public DifferenceSubstitutionMatrix(int[] input1,int[] input2) {
+		this.input1 = input1;
+		this.input2 = input2;
+		this.maxValue = getMaxValue();
+	}
+	
+	/* (non-Javadoc)
+	 * @see de.ugoe.cs.autoquest.plugin.alignment.SubstitutionMatrix#getDistance(int, int)
+	 */
+	public int getDistance(int pos1, int pos2) {
+		return maxValue - (input1[pos1] - input2[pos2]);
+	}
+	
+	private int getMaxValue() {
+		int max = input1[0];
+		for (int i=0; i < input1.length; i++) {
+			if(input1[i] > max) {
+				max = input1[i];
+			}
+		}
+		for (int j=0; j < input2.length; j++) {
+			if(input2[j] > max) {
+				max = input2[j];
+			}
+		}
+		return max;
+	}
+
+}
Index: trunk/autoquest-plugin-guitar/src/main/java/de/ugoe/cs/autoquest/plugin/alignment/SmithWaterman.java
===================================================================
--- trunk/autoquest-plugin-guitar/src/main/java/de/ugoe/cs/autoquest/plugin/alignment/SmithWaterman.java	(revision 1308)
+++ trunk/autoquest-plugin-guitar/src/main/java/de/ugoe/cs/autoquest/plugin/alignment/SmithWaterman.java	(revision 1308)
@@ -0,0 +1,331 @@
+package de.ugoe.cs.autoquest.plugin.alignment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SmithWaterman implements Alignment{
+	
+	
+	
+	/**
+	 * The first input
+	 */
+	private int[] input1;
+
+	/**
+	 * The second input String
+	 */
+	private int[] input2;
+
+	/**
+	 * The lengths of the input
+	 */
+	private int length1, length2;
+
+	/**
+	 * The score matrix. The true scores should be divided by the normalization
+	 * factor.
+	 */
+	private double[][] score;
+
+	/**
+	 * Score threshold
+	 */
+	private int scoreThreshold;;
+	
+	/**
+	 * The similarity function constants.
+	 */
+	static final int MATCH_SCORE = 10;
+	static final int MISMATCH_SCORE = -8;
+	static final int INDEL_SCORE = -9;
+
+	/**
+	 * Constants of directions. Multiple directions are stored by bits. The zero
+	 * direction is the starting point.
+	 */
+	static final int DR_LEFT = 1; // 0001
+	static final int DR_UP = 2; // 0010
+	static final int DR_DIAG = 4; // 0100
+	static final int DR_ZERO = 8; // 1000
+
+	/**
+	 * The directions pointing to the cells that give the maximum score at the
+	 * current cell. The first index is the column index. The second index is
+	 * the row index.
+	 */
+	private int[][] prevCells;
+
+	/**
+	 * Substitution matrix to calculate scores
+	 */
+	private SubstitutionMatrix submat;
+
+	public SmithWaterman(int[] input1, int[] input2,
+			SubstitutionMatrix submat) {
+		this.input1 = input1;
+		this.input2 = input2;
+		length1 = input1.length;
+		length2 = input2.length;
+		this.submat = submat;
+
+		scoreThreshold = 20;
+		score = new double[length1 + 1][length2 + 1];
+		prevCells = new int[length1 + 1][length2 + 1];
+
+		buildMatrix();
+	}
+
+	/**
+	 * Compute the similarity score of substitution The position of the first
+	 * character is 1. A position of 0 represents a gap.
+	 * 
+	 * @param i
+	 *            Position of the character in str1
+	 * @param j
+	 *            Position of the character in str2
+	 * @return Cost of substitution of the character in str1 by the one in str2
+	 */
+	private double similarity(int i, int j) {
+		if (i == 0 || j == 0) {
+			// it's a gap (indel)
+			return INDEL_SCORE;
+		}
+		//System.out.println("Diag letters: " + input1[i-1] + " " + input2[j-1]);
+		//return (input1[i - 1] == input2[j - 1]) ? MATCH_SCORE : MISMATCH_SCORE;
+		return submat.getDistance(i-1, j-1);
+	}
+
+	/**
+	 * Build the score matrix using dynamic programming. Note: The indel scores
+	 * must be negative. Otherwise, the part handling the first row and column
+	 * has to be modified.
+	 */
+	private void buildMatrix() {
+		if (INDEL_SCORE >= 0) {
+			throw new Error("Indel score must be negative");
+		}
+
+		int i; // length of prefix substring of str1
+		int j; // length of prefix substring of str2
+
+		// base case
+		score[0][0] = 0;
+		prevCells[0][0] = DR_ZERO; // starting point
+
+		// the first row
+		for (i = 1; i <= length1; i++) {
+			score[i][0] = 0;
+			prevCells[i][0] = DR_ZERO;
+		}
+
+		// the first column
+		for (j = 1; j <= length2; j++) {
+			score[0][j] = 0;
+			prevCells[0][j] = DR_ZERO;
+		}
+
+		// the rest of the matrix
+		for (i = 1; i <= length1; i++) {
+			for (j = 1; j <= length2; j++) {
+				double diagScore = score[i - 1][j - 1] + similarity(i, j);
+				double upScore = score[i][j - 1] + similarity(0, j);
+				double leftScore = score[i - 1][j] + similarity(i, 0);
+
+				score[i][j] = Math.max(diagScore,
+						Math.max(upScore, Math.max(leftScore, 0)));
+				//System.out.println("Diag: " + diagScore);
+				//System.out.println("Up: " + upScore);
+				//System.out.println("Left: " + leftScore);
+				//System.out.println();
+				prevCells[i][j] = 0;
+
+				// find the directions that give the maximum scores.
+				// the bitwise OR operator is used to record multiple
+				// directions.
+				if (diagScore == score[i][j]) {
+					prevCells[i][j] |= DR_DIAG;
+				}
+				if (leftScore == score[i][j]) {
+					prevCells[i][j] |= DR_LEFT;
+				}
+				if (upScore == score[i][j]) {
+					prevCells[i][j] |= DR_UP;
+				}
+				if (0 == score[i][j]) {
+					prevCells[i][j] |= DR_ZERO;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the maximum value in the score matrix.
+	 */
+	private double getMaxScore() {
+		double maxScore = 0;
+
+		// skip the first row and column
+		for (int i = 1; i <= length1; i++) {
+			for (int j = 1; j <= length2; j++) {
+				if (score[i][j] > maxScore) {
+					maxScore = score[i][j];
+				}
+			}
+		}
+
+		return maxScore;
+	}
+
+	/**
+	 * Get the alignment score between the two input strings.
+	 */
+	public double getAlignmentScore() {
+		return getMaxScore();
+	}
+
+	/**
+	 * TODO: Iterative Version!!! Output the local alignments ending in the (i,
+	 * j) cell. aligned1 and aligned2 are suffixes of final aligned strings
+	 * found in backtracking before calling this function. Note: the strings are
+	 * replicated at each recursive call. Use buffers or stacks to improve
+	 * efficiency.
+	 */
+	private void printAlignments(int i, int j, String aligned1, String aligned2) {
+		// we've reached the starting point, so print the alignments
+
+		if ((prevCells[i][j] & DR_ZERO) > 0) {
+			System.out.println(aligned1);
+			System.out.println(aligned2);
+			System.out.println("");
+
+			// Note: we could check other directions for longer alignments
+			// with the same score. we don't do it here.
+			return;
+		}
+
+		// find out which directions to backtrack
+		if ((prevCells[i][j] & DR_LEFT) > 0) {
+			printAlignments(i - 1, j, input1[i - 1] + aligned1, "_" + aligned2);
+		}
+		if ((prevCells[i][j] & DR_UP) > 0) {
+			printAlignments(i, j - 1, "_" + aligned1, input2[j - 1] + aligned2);
+		}
+		if ((prevCells[i][j] & DR_DIAG) > 0) {
+			printAlignments(i - 1, j - 1, input1[i - 1] + aligned1,
+					input2[j - 1] + aligned2);
+		}
+	}
+
+	/**
+	 * given the bottom right corner point trace back the top left conrner. at
+	 * entry: i, j hold bottom right (end of Aligment coords) at return: hold
+	 * top left (start of Alignment coords)
+	 */
+	private int[] traceback(int i, int j) {
+
+		// find out which directions to backtrack
+		while (true) {
+			if ((prevCells[i][j] & DR_LEFT) > 0) {
+				if (score[i - 1][j] > 0)
+					i--;
+				else
+					break;
+			}
+			if ((prevCells[i][j] & DR_UP) > 0) {
+				// return traceback(i, j-1);
+				if (score[i][j - 1] > 0)
+					j--;
+				else
+					break;
+			}
+			if ((prevCells[i][j] & DR_DIAG) > 0) {
+				// return traceback(i-1, j-1);
+				if (score[i - 1][j - 1] > 0) {
+					i--;
+					j--;
+				} else
+					break;
+			}
+		}
+		int[] m = { i, j };
+		return m;
+	}
+
+	/**
+	 * Output the local alignments with the maximum score.
+	 */
+	public void printAlignments() {
+		// find the cell with the maximum score
+		double maxScore = getMaxScore();
+
+		/*
+		 * for (int i = 0; i < matches.length; i++) {
+		 * System.out.println("Match #" + i + ":" + matches.get(i)); }
+		 */
+
+		// skip the first row and column
+		for (int i = 1; i <= length1; i++) {
+			for (int j = 1; j <= length2; j++) {
+				if (score[i][j] == maxScore) {
+					printAlignments(i, j, "", "");
+				}
+			}
+		}
+		// Note: empty alignments are not printed.
+	}
+
+	/**
+	 * print the dynmaic programming matrix
+	 */
+	public void printDPMatrix() {
+		System.out.print("   ");
+		for (int j = 1; j <= length2; j++)
+			System.out.print("   " + input2[j - 1]);
+		System.out.println();
+		for (int i = 0; i <= length1; i++) {
+			if (i > 0)
+				System.out.print(input1[i - 1] + " ");
+			else
+				System.out.print("  ");
+			for (int j = 0; j <= length2; j++) {
+				System.out.print(score[i][j] + " ");
+			}
+			System.out.println();
+		}
+	}
+
+	/**
+	 * Return a set of Matches identified in Dynamic programming matrix. A match
+	 * is a pair of subsequences whose score is higher than the preset
+	 * scoreThreshold
+	 **/
+	public List<Match> getMatches() {
+		ArrayList<Match> matchList = new ArrayList();
+		int fA = 0, fB = 0;
+		// skip the first row and column, find the next maxScore after
+		// prevmaxScore
+		for (int i = 1; i <= length1; i++) {
+			for (int j = 1; j <= length2; j++) {
+				if (score[i][j] > scoreThreshold
+						&& score[i][j] > score[i - 1][j - 1]
+						&& score[i][j] > score[i - 1][j]
+						&& score[i][j] > score[i][j - 1]) {
+					if (i == length1 || j == length2
+							|| score[i][j] > score[i + 1][j + 1]) {
+						// should be lesser than prev maxScore
+						fA = i;
+						fB = j;
+						int[] f = traceback(fA, fB); // sets the x, y to
+														// startAlignment
+														// coordinates
+						System.out.println(f[0] + " " + i + " " + f[1] + " " + j + " " + score[i][j]);
+						//TODO Add matches to matchList
+					}
+				}
+			}
+		}
+		return matchList; 
+	}
+
+}
Index: trunk/autoquest-plugin-guitar/src/main/java/de/ugoe/cs/autoquest/plugin/alignment/SubstitutionMatrix.java
===================================================================
--- trunk/autoquest-plugin-guitar/src/main/java/de/ugoe/cs/autoquest/plugin/alignment/SubstitutionMatrix.java	(revision 1307)
+++ trunk/autoquest-plugin-guitar/src/main/java/de/ugoe/cs/autoquest/plugin/alignment/SubstitutionMatrix.java	(revision 1308)
@@ -1,8 +1,10 @@
 package de.ugoe.cs.autoquest.plugin.alignment;
 
-public class SubstitutionMatrix {
+public interface SubstitutionMatrix {
 
-	public int getDistance(int event1, int event2) {
-		return 0;
-	}
+
+	
+	public int getDistance(int pos1, int pos2);
+
+	
 }
