Projects >> Mario-AI-Competition-2009 >>3b6a211505bbc4928c919ef81be496bc81b07d10

Chunk
Conflicting content
	private static final int maxSteps = 500;
>>>>>>> 84e3c59e4d0dd1768ebeb396953600128712c84d
{
	private PriorityQueue pq, pq2;
	private static final int maxBreadth = 256;
<<<<<<< HEAD
	private static final int maxSteps = 5500;
	private boolean won = false;
	private int DrawIndex = 0;

	MarioState ms = null, ms_prev = null;
	WorldState ws = null;
	float pred_x, pred_y;
=======
	public BestFirstAgent() {
		super("BestFirstAgent");
Solution content
{
	private PriorityQueue pq, pq2;
	private static final int maxBreadth = 256;
	private static final int maxSteps = 5500;

	public BestFirstAgent() {
		super("BestFirstAgent");
File
BestFirstAgent.java
Developer's decision
Combination
Kind of conflict
Attribute