Projects information

Chunk

Conflicting content
private final int numSixes = 18; private final int numOthers = 7; private int trialCount = 0; <<<<<<< HEAD //private int category = 0; //0 for category 1, 1 for cat 2 //all time units in milliseconds private final int MIN_TIME = 50; //minimum picture-showing time private final int MAX_TIME = 300; //maximum picture-showing time private final int MASK_TIME = 500; //mask-showing time private final int SECOND_PIC_TIME = 300; private final int THREAD_SLEEP_TIME = 50000; //if they're looking at it for 50 seconds, well... private Random generator = new Random(); ======= //all time units in milliseconds //private final int MIN_TIME = 50; //minimum picture-showing time //private final int MAX_TIME = 300; //maximum picture-showing time //private ArrayList possibleTimes = new ArrayList(); private ArrayList> picQueue = new ArrayList>(); private final int FIXATION_TIME = 500; private final int FIRST_TIME = 500; private final int SECOND_TIME = 1000; private final int MASK_TIME = 1000; //mask-showing time >>>>>>> 700d80ed0551ee2697afed11813f149c374dfbb4 //data on blocks, for posting public int currPicLength;

Conflicting content

	private final int numSixes = 18;
	private final int numOthers = 7;
	private int trialCount = 0;
<<<<<<< HEAD
	//private int category = 0; //0 for category 1, 1 for cat 2
	//all time units in milliseconds
	private final int MIN_TIME = 50; //minimum picture-showing time
	private final int MAX_TIME = 300; //maximum picture-showing time
	private final int MASK_TIME = 500; //mask-showing time
	private final int SECOND_PIC_TIME = 300;
	private final int THREAD_SLEEP_TIME = 50000; //if they're looking at it for 50 seconds, well...
	private Random generator = new Random();
=======
	//all time units in milliseconds
	//private final int MIN_TIME = 50; //minimum picture-showing time
	//private final int MAX_TIME = 300; //maximum picture-showing time
	//private ArrayList possibleTimes = new ArrayList();
	private ArrayList> picQueue = new ArrayList>();
	private final int FIXATION_TIME = 500;
	private final int FIRST_TIME = 500;
	private final int SECOND_TIME = 1000;
	private final int MASK_TIME = 1000; //mask-showing time
>>>>>>> 700d80ed0551ee2697afed11813f149c374dfbb4
	
	//data on blocks, for posting
	public int currPicLength;

Solution content
private final int numSixes = 18; private final int numOthers = 7; private int trialCount = 0; //private final int MIN_TIME = 50; //minimum picture-showing time //private final int MAX_TIME = 300; //maximum picture-showing time //private ArrayList possibleTimes = new ArrayList(); private ArrayList> picQueue = new ArrayList>(); private final int FIXATION_TIME = 500; private final int FIRST_TIME = 500; private final int SECOND_TIME = 1000; private final int MASK_TIME = 1000; //mask-showing time //data on blocks, for posting public int currPicLength;

Solution content

	private final int numSixes = 18;
	private final int numOthers = 7;
	private int trialCount = 0;
	//private final int MIN_TIME = 50; //minimum picture-showing time
	//private final int MAX_TIME = 300; //maximum picture-showing time
	//private ArrayList possibleTimes = new ArrayList();
	private ArrayList> picQueue = new ArrayList>();
	private final int FIXATION_TIME = 500;
	private final int FIRST_TIME = 500;
	private final int SECOND_TIME = 1000;
	private final int MASK_TIME = 1000; //mask-showing time
	
	//data on blocks, for posting
	public int currPicLength;

File
ChoiceScreenActivity.java

Developer's decision
Combination

Kind of conflict
Attribute
Comment
Method invocation

Chunk

Conflicting content
private long currEndTime2; private long currMaskBeginTime; private long currMaskEndTime; <<<<<<< HEAD private long currPicClickTime; ======= private long currPicClickTime = 0; >>>>>>> 700d80ed0551ee2697afed11813f149c374dfbb4 private long currClickTime; //no current block number, no currChoice: that's in GlobalVar

Conflicting content

	private long currEndTime2;
	private long currMaskBeginTime;
	private long currMaskEndTime;
<<<<<<< HEAD
	private long currPicClickTime;
=======
	private long currPicClickTime = 0;
>>>>>>> 700d80ed0551ee2697afed11813f149c374dfbb4
	private long currClickTime;
	//no current block number, no currChoice: that's in GlobalVar

Solution content
private long currEndTime2; private long currMaskBeginTime; private long currMaskEndTime; private long currPicClickTime = 0; private long currClickTime; //no current block number, no currChoice: that's in GlobalVar

Solution content

	private long currEndTime2;
	private long currMaskBeginTime;
	private long currMaskEndTime;
	private long currPicClickTime = 0;
	private long currClickTime;
	//no current block number, no currChoice: that's in GlobalVar

File
ChoiceScreenActivity.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content
private PostTrialTask uploadTask = new PostTrialTask(); //views <<<<<<< HEAD ImageView pic, mask, pic2; Button choice1, choice2, picButton; ======= ImageView pic, mask, pic2, fixation; Button choice1, choice2; >>>>>>> 700d80ed0551ee2697afed11813f149c374dfbb4 @Override public void onCreate(Bundle savedInstanceState){ super.onCreate(savedInstanceState);

Conflicting content

	private PostTrialTask uploadTask = new PostTrialTask();

	//views
<<<<<<< HEAD
	ImageView pic, mask, pic2;
	Button choice1, choice2, picButton;
=======
	ImageView pic, mask, pic2, fixation;
	Button choice1, choice2;
>>>>>>> 700d80ed0551ee2697afed11813f149c374dfbb4
	@Override
	public void onCreate(Bundle savedInstanceState){
		super.onCreate(savedInstanceState);

Solution content
private PostTrialTask uploadTask = new PostTrialTask(); //views ImageView pic, mask, pic2, fixation; Button choice1, choice2; @Override public void onCreate(Bundle savedInstanceState){ super.onCreate(savedInstanceState);

Solution content

	private PostTrialTask uploadTask = new PostTrialTask();

	//views
	ImageView pic, mask, pic2, fixation;
	Button choice1, choice2;
	@Override
	public void onCreate(Bundle savedInstanceState){
		super.onCreate(savedInstanceState);

File
ChoiceScreenActivity.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content
} mHandler.post(cycleVis); try { <<<<<<< HEAD Thread.sleep(SECOND_PIC_TIME); ======= currPicLength = SECOND_TIME; Thread.sleep(currPicLength); >>>>>>> 700d80ed0551ee2697afed11813f149c374dfbb4 } catch (InterruptedException e){ e.printStackTrace(); }

Conflicting content

				}
				mHandler.post(cycleVis);
				try {
<<<<<<< HEAD
					Thread.sleep(SECOND_PIC_TIME);
=======
					currPicLength = SECOND_TIME;
					Thread.sleep(currPicLength);
>>>>>>> 700d80ed0551ee2697afed11813f149c374dfbb4
				} catch (InterruptedException e){
					e.printStackTrace();
				}

Solution content
} mHandler.post(cycleVis); try { Thread.sleep(SECOND_TIME); } catch (InterruptedException e){ e.printStackTrace(); }

File
ChoiceScreenActivity.java

Developer's decision
Manual

Kind of conflict
Attribute
Method invocation

Chunk

Conflicting content
*/ private void cycleVisibility(){ switch(visState){ <<<<<<< HEAD case 0: mask.setVisibility(ImageView.INVISIBLE); pic.setVisibility(ImageView.VISIBLE); picButton.setVisibility(ImageView.VISIBLE); ======= case 0: fixation.setVisibility(ImageView.VISIBLE); GlobalVar.getInstance().clearMemory(); >>>>>>> 700d80ed0551ee2697afed11813f149c374dfbb4 choice1.setVisibility(ImageView.INVISIBLE); choice2.setVisibility(ImageView.INVISIBLE); break;

Conflicting content

	 */
	private void cycleVisibility(){
		switch(visState){
<<<<<<< HEAD
		case 0: 
			mask.setVisibility(ImageView.INVISIBLE);
			pic.setVisibility(ImageView.VISIBLE);
			picButton.setVisibility(ImageView.VISIBLE);
=======
		case 0:
			fixation.setVisibility(ImageView.VISIBLE);
			GlobalVar.getInstance().clearMemory();
>>>>>>> 700d80ed0551ee2697afed11813f149c374dfbb4
			choice1.setVisibility(ImageView.INVISIBLE);
			choice2.setVisibility(ImageView.INVISIBLE);
			break;

Solution content
*/ private void cycleVisibility(){ switch(visState){ case 0: fixation.setVisibility(ImageView.VISIBLE); GlobalVar.getInstance().clearMemory(); choice1.setVisibility(ImageView.INVISIBLE); choice2.setVisibility(ImageView.INVISIBLE); break;

Solution content

	 */
	private void cycleVisibility(){
		switch(visState){
		case 0:
			fixation.setVisibility(ImageView.VISIBLE);
			GlobalVar.getInstance().clearMemory();
			choice1.setVisibility(ImageView.INVISIBLE);
			choice2.setVisibility(ImageView.INVISIBLE);
			break;

File
ChoiceScreenActivity.java

Developer's decision
Version 2

Kind of conflict
Case statement
Method invocation

Projects >> PictureChoice >>17d4c3f72d2ff853e534b3d5586b1272d480471c