Version 6

.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -1,5 +1,6 @@
 *.class
 msi/*
+dist/*.jar
 *.lnk
 *.ini
 *.aip
@@ -8,4 +9,6 @@ msi/*
 *.txt
 *.doc
 *.docx
-*.odt
+*.odt
+dist/*
+intertext_results/*

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>interText</name>
+	<name>Intertext6</name>
 	<comment></comment>
 	<projects>
 	</projects>

.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Sat Jan 14 09:49:31 MST 2012
+#Thu Feb 23 09:52:17 MST 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

src/NGramSet/NGramSet.java

@@ -1,38 +1,35 @@
 package NGramSet;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface NGramSet {
 	public static boolean STRICT = false;
 
-	//abstract void setStrictness(boolean strictness);
-	//abstract boolean getStrictness();
+	String processWord(String word);
 
-	void addWord(String word);
 	void popFirstWord();
 
-	boolean containsAsSubSet(NGramSet o, int min);
-	boolean containsAsSubSet(NGramSet o, int min, boolean strictSearch);
+	int consume(HashMap<String, List<NGramSet>> map);
 
-	int getCountOfWord(String key);
-	public List<String> getWordList();
-	int size();
+	void setDocument(List<String> words);
 
-	String toString();
-	String leftToString();
-
-	void addRightMatch(NGramSet n);
-	List<? extends NGramSet> getRightMatches();
+	int getCountOfWord(String key);
+//	public List<String> getWordList();
+	public List<String> getModifiedWordList();
 
-	int getSide();
+	public int getMinSize();
+	public int getMaxSize();
 
-	public void setSide(int side);
+	int size();
 
-	int hashCode();
+	String toString();
 
-	/*void setDocument1(List<String> words);
-	void setDocument2(List<String> words);
+	boolean hasMatches();
+	boolean isStopWord(String word);
 
-	void resetCount();
-	void setMaxSize(int size);*/
+	List<String> getDocument();
+
+	int getPosition();
+//	int hashCode();
 }