Projects >> alg-vis >>92fea506e9ce23a6ae66e1e1146c757274221b19

Chunk
Conflicting content 
			SkipListPanel.class, GBPanel.class, SplayPanel.class,
			HeapPanel.class, DaryHeapPanel.class, LeftHeapPanel.class,
			SkewHeapPanel.class, BinHeapPanel.class, LazyBinHeapPanel.class,
<<<<<<< HEAD
			FibHeapPanel.class, UnionFindPanel.class, TriePanel.class, PairHeapPanel.class, 
			IntervalPanel.class};
=======
			FibHeapPanel.class, UnionFindPanel.class, TriePanel.class,
			SuffixTreePanel.class };
>>>>>>> a2bbb2f671972cf61f65973f31fd011d6c6ea378


	public static final int N = PANEL.length;
Solution content 
			SkipListPanel.class, GBPanel.class, SplayPanel.class,
			HeapPanel.class, DaryHeapPanel.class, LeftHeapPanel.class,
			SkewHeapPanel.class, PairHeapPanel.class, BinHeapPanel.class,
			LazyBinHeapPanel.class, FibHeapPanel.class, UnionFindPanel.class,
			IntervalPanel.class, TriePanel.class, SuffixTreePanel.class };

	public static final int N = PANEL.length;
File
DataStructures.java
Developer's decision
Manual
Kind of conflict
Other
Chunk
Conflicting content 
		case 20:
			return new TriePanel(S);
		case 21:
<<<<<<< HEAD
			return new PairHeapPanel(S);
		case 22:
			return new IntervalPanel(S);
=======
			return new SuffixTreePanel(S);
>>>>>>> a2bbb2f671972cf61f65973f31fd011d6c6ea378
		}
		if (!check_range(i))
			return null;
Solution content 
		case 20:
			return new UnionFindPanel(S);
		case 21:
			return new IntervalPanel(S);
		case 22:
			return new TriePanel(S);
		case 23:
			return new SuffixTreePanel(S);
		}
		if (!check_range(i))
			return null;
File
DataStructures.java
Developer's decision
Manual
Kind of conflict
Case statement
Method invocation
Return statement
Chunk
Conflicting content 
	public Dimension getMinimumSize() {
		return new Dimension(300, 150);
	}
<<<<<<< HEAD:src/algvis/gui/Buttons.java
	
	/**
	 * if D.scenario is enabled, all algorithm is done, so we must go at start
	 * (in scenario) of algorithm to watch it
	 */
	protected void startLastAlg() {
		D.scenario.previous(false, false);
		D.scenario.next(M.pause, true);
		D.scenario.traverser.join();
		D.setStats();
		M.C.update();
		update();
	}
=======
>>>>>>> a2bbb2f671972cf61f65973f31fd011d6c6ea378:src/algvis/core/Buttons.java

	private class SetStatsCommand implements Command {
		private final String oldStats, newStats;
Solution content 
	public Dimension getMinimumSize() {
		return new Dimension(300, 150);
	}
	
	/**
	 * if D.scenario is enabled, all algorithm is done, so we must go at start
	 * (in scenario) of algorithm to watch it
	 */
	protected void startLastAlg() {
		D.scenario.previous(false, false);
		D.scenario.next(M.pause, true);
		D.scenario.traverser.join();
		D.setStats();
		M.C.update();
		update();
	}

	private class SetStatsCommand implements Command {
		private final String oldStats, newStats;
File
Buttons.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration