Projects >> Large-Margin-Structured-Perceptron >>c308439dfa01ae3f19db3602b6e5a7d2325b814e

Chunk
Conflicting content
		int eq = line.indexOf('=');
		int end = line.indexOf(']');
		String[] labels = line.substring(eq + 1, end).split(",");
<<<<<<< HEAD
		
		//the first feature label ("id") is not stored
		featureLabels = new String[labels.length-1];
		for (int i = 1; i < labels.length; ++i)
			featureLabels[i-1] = labels[i].trim();
=======
		featureLabels = new String[labels.length];
		for (int i = 1; i < labels.length - 1; ++i)
			featureLabels[i - 1] = labels[i].trim();
>>>>>>> 8abac6c6ccc43818636436110e0fbee87f359936

		// Multi-valued features indexes.
		Set multiValuedFeaturesIndexes = new TreeSet();
Solution content
		int eq = line.indexOf('=');
		int end = line.indexOf(']');
		String[] labels = line.substring(eq + 1, end).split(",");

		featureLabels = new String[labels.length];
		for (int i = 1; i < labels.length - 1; ++i)
			featureLabels[i - 1] = labels[i].trim();

		// Multi-valued features indexes.
		Set multiValuedFeaturesIndexes = new TreeSet();
File
DPColumnDataset.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
For statement
Method invocation