Projects >> howyourdaywas >>46ba79c43962002e0b64bf6beb222fbfa2aa9d50

Chunk
Conflicting content 
<<<<<<< HEAD

=======
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;

import processing.core.PApplet;
import edu.umich.eecs498f11.howyourdaywas.DataPoint;
import edu.umich.eecs498f11.howyourdaywas.DataPointComparator;
import edu.umich.eecs498f11.howyourdaywas.DataSource;
import edu.umich.eecs498f11.howyourdaywas.FacebookSource;
import edu.umich.eecs498f11.howyourdaywas.TwitterSource;
>>>>>>> 751e153775b12f1b852b82eec7f3dcba28e31a54

public class HowYourDayWasSketch extends PApplet {
Solution content 
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.List;

import processing.core.PApplet;

import com.aliasi.classify.Classification;
import com.aliasi.classify.Classified;
import com.aliasi.classify.DynamicLMClassifier;
import com.aliasi.lm.NGramProcessLM;
import com.aliasi.util.Files;

import edu.umich.eecs498f11.howyourdaywas.DataPoint;
import edu.umich.eecs498f11.howyourdaywas.DataPointComparator;
import edu.umich.eecs498f11.howyourdaywas.DataSource;
import edu.umich.eecs498f11.howyourdaywas.FacebookSource;
import edu.umich.eecs498f11.howyourdaywas.TwitterSource;

public class HowYourDayWasSketch extends PApplet {
File
HowYourDayWasSketch.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
		// Example Twitter usage:
		final DataSource twitter = new TwitterSource();
		final DataSource facebook = new FacebookSource();
<<<<<<< HEAD
		final List tweets = twitter.getData();
		final List statuses = facebook.getData();
		
		for (final String tweet : tweets) {
			System.out.println(eval(tweet) + ": " + tweet);
		}
		for(final String status : statuses) {
			System.out.println(eval(status) + ": " + status);
		}
=======
		final List tweets = twitter.getData();
		final List statuses = facebook.getData();
		final List collection = facebook.getData();
		collection.addAll(tweets);
		DataPointComparator c = new DataPointComparator();
		Collections.sort(collection, c);
		
		for(final DataPoint message : collection) {
			System.out.println(message.text);
		}
		
>>>>>>> 751e153775b12f1b852b82eec7f3dcba28e31a54
	}

	public void draw() {
Solution content 
		// Example Twitter usage:
		final DataSource twitter = new TwitterSource();
		final DataSource facebook = new FacebookSource();

		final List tweets = twitter.getData();
		final List statuses = facebook.getData();
		final List collection = facebook.getData();
		collection.addAll(tweets);
		DataPointComparator c = new DataPointComparator();
		Collections.sort(collection, c);
		
		for(final DataPoint message : collection) {
			System.out.println(message.text);
		}
		
	}

	public void draw() {
File
HowYourDayWasSketch.java
Developer's decision
Version 2
Kind of conflict
For statement
Method invocation
Variable