rm indent classifier; subsumed by align

Author: parrt

java/src/org/antlr/codebuff/Formatter.java

@@ -19,7 +19,6 @@
 import static org.antlr.codebuff.CollectFeatures.CAT_INDENT;
 import static org.antlr.codebuff.CollectFeatures.CAT_NO_ALIGNMENT;
 import static org.antlr.codebuff.CollectFeatures.FEATURES_ALIGN;
-import static org.antlr.codebuff.CollectFeatures.FEATURES_INDENT;
 import static org.antlr.codebuff.CollectFeatures.FEATURES_INJECT_NL;
 import static org.antlr.codebuff.CollectFeatures.FEATURES_INJECT_WS;
 import static org.antlr.codebuff.CollectFeatures.INDEX_FIRST_ON_LINE;
@@ -49,7 +48,6 @@ public class Formatter {
 
 	protected CodekNNClassifier newlineClassifier;
 	protected CodekNNClassifier wsClassifier;
-	protected CodekNNClassifier indentClassifier;
 	protected CodekNNClassifier alignClassifier;
 	protected int k;
 
@@ -71,7 +69,6 @@ public Formatter(Corpus corpus, InputDocument doc, int tabSize) {
 		Tool.wipeLineAndPositionInfo(tokens);
 		newlineClassifier = new CodekNNClassifier(corpus, FEATURES_INJECT_NL);
 		wsClassifier = new CodekNNClassifier(corpus, FEATURES_INJECT_WS);
-		indentClassifier = new CodekNNClassifier(corpus, FEATURES_INDENT);
 		alignClassifier = new CodekNNClassifier(corpus, FEATURES_ALIGN);
 //		k = (int)Math.sqrt(corpus.X.size());
 		k = 11;
@@ -300,13 +297,10 @@ public TokenPositionAnalysis getTokenAnalysis(int[] features, int indexIntoRealT
 		String alignAnalysis =alignPredictionString+"\n"+
 			alignClassifier.getPredictionAnalysis(doc, k, features, corpus.align,
 			                                      MAX_CONTEXT_DIFF_THRESHOLD);
-		String indentAnalysis =indentPredictionString+"\n"+
-			indentClassifier.getPredictionAnalysis(doc, k, features, corpus.indent,
-			                                       MAX_CONTEXT_DIFF_THRESHOLD);
 		String wsAnalysis =wsPredictionString+"\n"+
 			wsClassifier.getPredictionAnalysis(doc, k, features, corpus.injectWS,
 			                                   MAX_CONTEXT_DIFF_THRESHOLD);
-		return new TokenPositionAnalysis(newlineAnalysis, alignAnalysis, indentAnalysis, wsAnalysis);
+		return new TokenPositionAnalysis(newlineAnalysis, alignAnalysis, wsAnalysis);
 	}
 
 	/** Do not join two words like "finaldouble" or numbers like "3double",

java/src/org/antlr/codebuff/TokenPositionAnalysis.java

@@ -5,15 +5,13 @@ public class TokenPositionAnalysis {
 	public int charIndexStop; // stop index (inclusive)
 	public String newline = "n/a";
 	public String ws = "n/a";
-	public String indent = "n/a";
 	public String align = "n/a";
 
 	public TokenPositionAnalysis() {
 	}
 
-	public TokenPositionAnalysis(String newline, String align, String indent, String ws) {
+	public TokenPositionAnalysis(String newline, String align, String ws) {
 		this.align = align;
-		this.indent = indent;
 		this.newline = newline;
 		this.ws = ws;
 	}

java/src/org/antlr/codebuff/gui/GUIController.java

@@ -116,7 +116,7 @@ public void caretUpdate(CaretEvent e) {
 				}
 				scope.injectNLConsole.setText(analysis!=null ? analysis.newline : "");
 				scope.alignConsole.setText(analysis!=null ? analysis.align : "");
-				scope.indentConsole.setText(analysis!=null ? analysis.indent : "");
+				scope.indentConsole.setText("not used");
 				scope.injectWSConsole.setText(analysis!=null ? analysis.ws : "");
 				scope.injectNLConsole.setCaretPosition(0);
 				scope.alignConsole.setCaretPosition(0);

java/src/org/antlr/codebuff/kNNClassifier.java

@@ -103,7 +103,6 @@ public String getPredictionAnalysis(InputDocument doc, int k, int[] unknown, Lis
 		HashBag<Integer> votes = getVotesBag(kNN, k, unknown, Y);
 
 		StringBuilder buf = new StringBuilder();
-		InputDocument firstDoc = corpus.documents.get(0); // pick any doc to get parser
 		buf.append(CollectFeatures.featureNameHeader(FEATURES));
 		buf.append(CollectFeatures._toString(FEATURES, doc, unknown)+"->"+votes);
 		buf.append("\n");