Projects >> AbFab3D >>14948ce8ae13f12d5a8d0e3e6f5567a7c2031bfd

Chunk
Conflicting content 
	// options are:
	// 		0: ArrayBlock, a block where voxels are represented as an array of bytes
	// 		1: RLEBlock, a block where voxels are stored via run-length encoding
<<<<<<< HEAD
	public enum BlockType {Array, RLE};
	public BlockType GRID_BLOCK_TYPE;
=======
    public enum BlockType {Array, RLE}
    public BlockType GRID_BLOCK_TYPE;
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
	
	// dimensions of the 1D containers
	public final int BLOCKS_PER_GRID;
Solution content 
	// options are:
	// 		0: ArrayBlock, a block where voxels are represented as an array of bytes
	// 		1: RLEBlock, a block where voxels are stored via run-length encoding
	public enum BlockType {Array, RLE};
	public BlockType GRID_BLOCK_TYPE;
	
	// dimensions of the 1D containers
	public final int BLOCKS_PER_GRID;
File
BlockArrayGrid.java
Developer's decision
Version 1
Kind of conflict
Attribute
Enum declaration
Chunk
Conflicting content 
	 * Test blockIndex
	 */
	public void testBlockIndex() {
<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(16, 16, 16, 1.0, 1.0, new int[] {3,3,3}, BlockArrayGrid.BlockType.Array);
=======
		BlockArrayGrid grid = new BlockArrayGrid(16, 16, 16, 1.0, 1.0, new int[] {3,3,3},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		
		assertEquals("block order ", 3, grid.BLOCK_TWOS_ORDER[0]);
		assertEquals("grid order ", 1, grid.GRID_TWOS_ORDER[0]);
Solution content 
	 * Test blockIndex
	 */
	public void testBlockIndex() {
		BlockArrayGrid grid = new BlockArrayGrid(16, 16, 16, 1.0, 1.0, new int[] {3,3,3}, BlockArrayGrid.BlockType.Array);
		
		assertEquals("block order ", 3, grid.BLOCK_TWOS_ORDER[0]);
		assertEquals("grid order ", 1, grid.GRID_TWOS_ORDER[0]);
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	 * Test grid set and get
	 */
	public void testSetGet() {
<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(4096,4096,4096,1.0,1.0,new int[] {4,4,4}, BlockArrayGrid.BlockType.Array);
=======
		BlockArrayGrid grid = new BlockArrayGrid(4096,4096,4096,1.0,1.0,new int[] {4,4,4},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		
		byte[][][] data = {{ {0,1,2},
							 {3,4,5},
Solution content 
	 * Test grid set and get
	 */
	public void testSetGet() {
		BlockArrayGrid grid = new BlockArrayGrid(4096,4096,4096,1.0,1.0,new int[] {4,4,4}, BlockArrayGrid.BlockType.Array);
		
		byte[][][] data = {{ {0,1,2},
							 {3,4,5},
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	 * Test copy constructor.
	 */
	public void testBlockArrayGridCopyConstructor() {
<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(10, 9, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		BlockArrayGrid grid = new BlockArrayGrid(10, 9, 8, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		
		assertEquals("State should be ", Grid.OUTSIDE, grid.getState(0, 0, 0));
		assertEquals("State should be ", Grid.OUTSIDE, grid.getState(0, 0, 1));
Solution content 
	 * Test copy constructor.
	 */
	public void testBlockArrayGridCopyConstructor() {
		BlockArrayGrid grid = new BlockArrayGrid(10, 9, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		
		assertEquals("State should be ", Grid.OUTSIDE, grid.getState(0, 0, 0));
		assertEquals("State should be ", Grid.OUTSIDE, grid.getState(0, 0, 1));
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	 * Test creating an empty grid.
	 */
	public void testCreateEmpty() {
<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(100, 101, 102, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		BlockArrayGrid grid = new BlockArrayGrid(100, 101, 102, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
			
		assertEquals("block width in voxels ", 4, ((BlockArrayGrid)grid).BLOCK_WIDTH_IN_VOXELS[0]);
		assertEquals("grid width in blocks ", 32, ((BlockArrayGrid)grid).GRID_WIDTH_IN_BLOCKS[0]);
Solution content 
	 * Test creating an empty grid.
	 */
	public void testCreateEmpty() {
		BlockArrayGrid grid = new BlockArrayGrid(100, 101, 102, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
			
		assertEquals("block width in voxels ", 4, ((BlockArrayGrid)grid).BLOCK_WIDTH_IN_VOXELS[0]);
		assertEquals("grid width in blocks ", 32, ((BlockArrayGrid)grid).GRID_WIDTH_IN_BLOCKS[0]);
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	 * Test set/get all data points.
	 */
	public void testSetGetByVoxelCoords() {
<<<<<<< HEAD
		Grid grid = new BlockArrayGrid(8, 8, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(8, 8, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(8, 8, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(16,8,8,0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(16, 16, 16, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(100, 91, 85, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		Grid grid = new BlockArrayGrid(8, 8, 8, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(8, 8, 8, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(8, 8, 8, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(16,8,8,0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(16, 16, 16, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(100, 91, 85, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		setGetAllVoxelCoords(grid);
	}
Solution content 
	 * Test set/get all data points.
	 */
	public void testSetGetByVoxelCoords() {
		Grid grid = new BlockArrayGrid(8, 8, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(8, 8, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(8, 8, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(16,8,8,0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(16, 16, 16, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);

		grid = new BlockArrayGrid(100, 91, 85, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelCoords(grid);
	}
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	 * Test set/get all data points.
	 */
	public void testSetGetByWorldCoords() {
<<<<<<< HEAD
		Grid grid = new BlockArrayGrid(8, 8, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelByWorldCoords(grid);

		grid = new BlockArrayGrid(3,2,2,0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelByWorldCoords(grid);

		grid = new BlockArrayGrid(11, 11, 11, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelByWorldCoords(grid);

		grid = new BlockArrayGrid(100, 91, 85, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		Grid grid = new BlockArrayGrid(8, 8, 8, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
		setGetAllVoxelByWorldCoords(grid);

		grid = new BlockArrayGrid(3,2,2,0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
		setGetAllVoxelByWorldCoords(grid);

		grid = new BlockArrayGrid(11, 11, 11, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
		setGetAllVoxelByWorldCoords(grid);

		grid = new BlockArrayGrid(100, 91, 85, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		setGetAllVoxelByWorldCoords(grid);
	}
Solution content 
	 * Test set/get all data points.
	 */
	public void testSetGetByWorldCoords() {
		Grid grid = new BlockArrayGrid(8, 8, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelByWorldCoords(grid);

		grid = new BlockArrayGrid(3,2,2,0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelByWorldCoords(grid);

		grid = new BlockArrayGrid(11, 11, 11, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelByWorldCoords(grid);

		grid = new BlockArrayGrid(100, 91, 85, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		setGetAllVoxelByWorldCoords(grid);
	}
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	 * Test getState by voxels.
	 */
	public void testGetStateByVoxel() {
<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(10, 9, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		BlockArrayGrid grid = new BlockArrayGrid(10, 9, 8, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
			
		grid.setData(0, 0, 0, Grid.OUTSIDE, (byte)2);
		grid.setData(9, 8, 7, Grid.EXTERIOR, (byte)1);
Solution content 
	 * Test getState by voxels.
	 */
	public void testGetStateByVoxel() {
		BlockArrayGrid grid = new BlockArrayGrid(10, 9, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
			
		grid.setData(0, 0, 0, Grid.OUTSIDE, (byte)2);
		grid.setData(9, 8, 7, Grid.EXTERIOR, (byte)1);
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	 * Test getState by world coordinates.
	 */
	public void testGetStateByCoord() {
<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(1.0, 0.4, 0.5, 0.05, 0.01, new int[] {0,0,0}, BlockArrayGrid.BlockType.Array);
=======
		BlockArrayGrid grid = new BlockArrayGrid(1.0, 0.4, 0.5, 0.05, 0.01, new int[] {0,0,0},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
	
		// make sure the grid is the expected size
		int xVoxels = grid.getWidth();
Solution content 
	 */
	 * Test getState by world coordinates.
	public void testGetStateByCoord() {
		BlockArrayGrid grid = new BlockArrayGrid(1.0, 0.4, 0.5, 0.05, 0.01, new int[] {0,0,0}, BlockArrayGrid.BlockType.Array);
	
		// make sure the grid is the expected size
		int xVoxels = grid.getWidth();
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		// should expect width=3, height=6, depth=4
		// set data for a mid-voxel and test the bounds
<<<<<<< HEAD
		grid = new BlockArrayGrid(0.12, 0.11, 0.16, 0.05, 0.02, new int[] {0,0,0}, BlockArrayGrid.BlockType.Array);
=======
		grid = new BlockArrayGrid(0.12, 0.11, 0.16, 0.05, 0.02, new int[] {0,0,0},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		grid.setData(0.06, 0.07, 0.08, Grid.INTERIOR, (byte)2);
		assertEquals("State should be ", Grid.INTERIOR, grid.getState(0.05, 0.07, 0.075));
		assertEquals("State should be ", Grid.INTERIOR, grid.getState(0.0999, 0.06, 0.05));
Solution content 
		// should expect width=3, height=6, depth=4
		// set data for a mid-voxel and test the bounds
		grid = new BlockArrayGrid(0.12, 0.11, 0.16, 0.05, 0.02, new int[] {0,0,0}, BlockArrayGrid.BlockType.Array);
		grid.setData(0.06, 0.07, 0.08, Grid.INTERIOR, (byte)2);
		assertEquals("State should be ", Grid.INTERIOR, grid.getState(0.05, 0.07, 0.075));
		assertEquals("State should be ", Grid.INTERIOR, grid.getState(0.0999, 0.06, 0.05));
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		int[] row = {0, 3, 5};
		byte[] state = {Grid.INTERIOR, Grid.EXTERIOR, Grid.INTERIOR};

<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.05, 0.02, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.05, 0.02, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab

		width = grid.getWidth();
		height = grid.getHeight();
Solution content 
		int[] row = {0, 3, 5};
		byte[] state = {Grid.INTERIOR, Grid.EXTERIOR, Grid.INTERIOR};

		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.05, 0.02, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);

		width = grid.getWidth();
		height = grid.getHeight();
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		int[] stateDepth = {10, 6, 1};
		byte[] states = {Grid.EXTERIOR, Grid.INTERIOR, Grid.OUTSIDE};

<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.05, 0.02, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.05, 0.02, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab

		width = grid.getWidth();
		height = grid.getHeight();
Solution content 
		int[] stateDepth = {10, 6, 1};
		byte[] states = {Grid.EXTERIOR, Grid.INTERIOR, Grid.OUTSIDE};

		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.05, 0.02, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);

		width = grid.getWidth();
		height = grid.getHeight();
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		int depth = 10;
		int mat = 1;

<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		HashSet vcSetExt = new HashSet();
		HashSet vcSetInt = new HashSet();
Solution content 
		int depth = 10;
		int mat = 1;

		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		HashSet vcSetExt = new HashSet();
		HashSet vcSetInt = new HashSet();
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
				{width-1, height-1, depth-1}
		};

<<<<<<< HEAD
		grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		vcSetExt = new HashSet();

		for (int i=0; i
Solution content 
				{width-1, height-1, depth-1}
		};

		grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		vcSetExt = new HashSet();

		for (int i=0; i
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		int depth = 10;
		int mat = 1;

<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		HashSet vcSetExt = new HashSet();
		HashSet vcSetInt = new HashSet();
Solution content 
		int depth = 10;
		int mat = 1;

		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		HashSet vcSetExt = new HashSet();
		HashSet vcSetInt = new HashSet();
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
				{width-1, height-1, depth-1}
		};

<<<<<<< HEAD
		grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		vcSetExt = new HashSet();

		for (int i=0; i
Solution content 
				{width-1, height-1, depth-1}
		};

		grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		vcSetExt = new HashSet();

		for (int i=0; i
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		double voxelWidth = 0.02;
		double sliceHeight = 0.01;

<<<<<<< HEAD
		Grid grid = new BlockArrayGrid(xWorldCoord, yWorldCoord, zWorldCoord, voxelWidth, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		Grid grid = new BlockArrayGrid(xWorldCoord, yWorldCoord, zWorldCoord, voxelWidth, sliceHeight, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab

		double xcoord = 0.55;
		double ycoord = 0.0202;
Solution content 
		double voxelWidth = 0.02;
		double sliceHeight = 0.01;

		Grid grid = new BlockArrayGrid(xWorldCoord, yWorldCoord, zWorldCoord, voxelWidth, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);

		double xcoord = 0.55;
		double ycoord = 0.0202;
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		double voxelWidth = 0.02;
		double sliceHeight = 0.01;

<<<<<<< HEAD
		Grid grid = new BlockArrayGrid(xVoxels, yVoxels, zVoxels, voxelWidth, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		Grid grid = new BlockArrayGrid(xVoxels, yVoxels, zVoxels, voxelWidth, sliceHeight, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab

		int xcoord = 27;
		int ycoord = 2;
Solution content 
		double voxelWidth = 0.02;
		double sliceHeight = 0.01;

		Grid grid = new BlockArrayGrid(xVoxels, yVoxels, zVoxels, voxelWidth, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);

		int xcoord = 27;
		int ycoord = 2;
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		double voxelWidth = 0.02;
		double sliceHeight = 0.01;
<<<<<<< HEAD
		Grid grid = new BlockArrayGrid(xVoxels, yVoxels, zVoxels, voxelWidth, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		Grid grid = new BlockArrayGrid(xVoxels, yVoxels, zVoxels, voxelWidth, sliceHeight, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab

		xVoxels = grid.getWidth();
		yVoxels = grid.getHeight();
Solution content 
		double voxelWidth = 0.02;
		double sliceHeight = 0.01;

		Grid grid = new BlockArrayGrid(xVoxels, yVoxels, zVoxels, voxelWidth, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);

		xVoxels = grid.getWidth();
		yVoxels = grid.getHeight();
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		double sliceHeight = 0.0015;

		// voxel coordinates
<<<<<<< HEAD
		Grid grid = new BlockArrayGrid(50, 25, 70, 0.05, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		assertEquals("Slice height is not " + sliceHeight, sliceHeight, grid.getSliceHeight());

		// world coordinates
		grid = new BlockArrayGrid(0.12, 0.11, 0.12, 0.05, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		Grid grid = new BlockArrayGrid(50, 25, 70, 0.05, sliceHeight, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
		assertEquals("Slice height is not " + sliceHeight, sliceHeight, grid.getSliceHeight());

		// world coordinates
		grid = new BlockArrayGrid(0.12, 0.11, 0.12, 0.05, sliceHeight, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		assertEquals("Slice height is not" + sliceHeight, sliceHeight, grid.getSliceHeight());
	}
Solution content 
		double sliceHeight = 0.0015;

		// voxel coordinates
		Grid grid = new BlockArrayGrid(50, 25, 70, 0.05, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		assertEquals("Slice height is not " + sliceHeight, sliceHeight, grid.getSliceHeight());

		// world coordinates
		grid = new BlockArrayGrid(0.12, 0.11, 0.12, 0.05, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		assertEquals("Slice height is not" + sliceHeight, sliceHeight, grid.getSliceHeight());
	}
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
		double voxelSize = 0.025;

		// voxel coordinates
<<<<<<< HEAD
		Grid grid = new BlockArrayGrid(50, 25, 70, voxelSize, 0.01, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		assertEquals("Voxel size is not " + voxelSize, voxelSize, grid.getVoxelSize());

		// world coordinates
		grid = new BlockArrayGrid(0.12, 0.11, 0.12, voxelSize, 0.01, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		Grid grid = new BlockArrayGrid(50, 25, 70, voxelSize, 0.01, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
		assertEquals("Voxel size is not " + voxelSize, voxelSize, grid.getVoxelSize());

		// world coordinates
		grid = new BlockArrayGrid(0.12, 0.11, 0.12, voxelSize, 0.01, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		assertEquals("Voxel size is not " + voxelSize, voxelSize, grid.getVoxelSize());
	}
Solution content 
		double voxelSize = 0.025;

		// voxel coordinates
		Grid grid = new BlockArrayGrid(50, 25, 70, voxelSize, 0.01, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		assertEquals("Voxel size is not " + voxelSize, voxelSize, grid.getVoxelSize());

		// world coordinates
		grid = new BlockArrayGrid(0.12, 0.11, 0.12, voxelSize, 0.01, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
		assertEquals("Voxel size is not " + voxelSize, voxelSize, grid.getVoxelSize());
	}
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
	public void testSetState() {
	int size = 10;
	
<<<<<<< HEAD
	BlockArrayGrid grid = new BlockArrayGrid(size, size, size, 0.001, 0.001, new int[] {0,0,0}, BlockArrayGrid.BlockType.Array);
=======
	BlockArrayGrid grid = new BlockArrayGrid(size, size, size, 0.001, 0.001, new int[] {0,0,0},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		
		grid.setData(0, 0, 0, Grid.INTERIOR, 1);
		grid.setData(9, 9, 9, Grid.EXTERIOR, 2);
Solution content 
	public void testSetState() {
	int size = 10;
	
	BlockArrayGrid grid = new BlockArrayGrid(size, size, size, 0.001, 0.001, new int[] {0,0,0}, BlockArrayGrid.BlockType.Array);
		
		grid.setData(0, 0, 0, Grid.INTERIOR, 1);
		grid.setData(9, 9, 9, Grid.EXTERIOR, 2);
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		double voxelSize = 0.002;
		double sliceHeight = 0.001;
		
<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(size, size, size, voxelSize, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
=======
		BlockArrayGrid grid = new BlockArrayGrid(size, size, size, voxelSize, sliceHeight, new int[] {2,2,2},BlockArrayGrid.BlockType.Array);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
			
		grid.setData(0, 0, 0, Grid.INTERIOR, 1);
		grid.setData(9, 9, 9, Grid.EXTERIOR, 2);
Solution content 
		double voxelSize = 0.002;
		double sliceHeight = 0.001;
		
		BlockArrayGrid grid = new BlockArrayGrid(size, size, size, voxelSize, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.Array);
			
		grid.setData(0, 0, 0, Grid.INTERIOR, 1);
		grid.setData(9, 9, 9, Grid.EXTERIOR, 2);
File
TestBlockArrayGrid_ArrayBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	 * Test grid set and get
	 */
	public void testSetGet() {
<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(4096,4096,4096,1.0,1.0,new int[] {4,4,4}, BlockArrayGrid.BlockType.RLE);
=======
		BlockArrayGrid grid = new BlockArrayGrid(4096,4096,4096,1.0,1.0,new int[] {4,4,4},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		
		byte[][][] data = {{ {0,1,2},
							 {3,4,5},
Solution content 
	 * Test grid set and get
	 */
	public void testSetGet() {
		BlockArrayGrid grid = new BlockArrayGrid(4096,4096,4096,1.0,1.0,new int[] {4,4,4}, BlockArrayGrid.BlockType.RLE);
		
		byte[][][] data = {{ {0,1,2},
							 {3,4,5},
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	 * Test copy constructor.
	 */
	public void testBlockArrayGridCopyConstructor() {
<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(10, 9, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		BlockArrayGrid grid = new BlockArrayGrid(10, 9, 8, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		
		assertEquals("State should be ", Grid.OUTSIDE, grid.getState(0, 0, 0));
		assertEquals("State should be ", Grid.OUTSIDE, grid.getState(0, 0, 1));
Solution content 
		assertEquals("State should be ", Grid.OUTSIDE, grid.getState(0, 0, 1));
	 * Test copy constructor.
	 */
	public void testBlockArrayGridCopyConstructor() {
		BlockArrayGrid grid = new BlockArrayGrid(10, 9, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
		
		assertEquals("State should be ", Grid.OUTSIDE, grid.getState(0, 0, 0));
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	 * Test creating an empty grid.
	 */
	public void testCreateEmpty() {
<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(100, 101, 102, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		BlockArrayGrid grid = new BlockArrayGrid(100, 101, 102, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
			
		assertEquals("block width in voxels ", 4, ((BlockArrayGrid)grid).BLOCK_WIDTH_IN_VOXELS[0]);
		assertEquals("grid width in blocks ", 32, ((BlockArrayGrid)grid).GRID_WIDTH_IN_BLOCKS[0]);
Solution content 
	 * Test creating an empty grid.
	 */
	public void testCreateEmpty() {
		BlockArrayGrid grid = new BlockArrayGrid(100, 101, 102, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
			
		assertEquals("block width in voxels ", 4, ((BlockArrayGrid)grid).BLOCK_WIDTH_IN_VOXELS[0]);
		assertEquals("grid width in blocks ", 32, ((BlockArrayGrid)grid).GRID_WIDTH_IN_BLOCKS[0]);
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	 * Test getState by voxels.
	 */
	public void testGetStateByVoxel() {
<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(10, 9, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		BlockArrayGrid grid = new BlockArrayGrid(10, 9, 8, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
			
		grid.setData(0, 0, 0, Grid.OUTSIDE, (byte)2);
		grid.setData(9, 8, 7, Grid.EXTERIOR, (byte)1);
Solution content 
	 * Test getState by voxels.
	 */
	public void testGetStateByVoxel() {
		BlockArrayGrid grid = new BlockArrayGrid(10, 9, 8, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
			
		grid.setData(0, 0, 0, Grid.OUTSIDE, (byte)2);
		grid.setData(9, 8, 7, Grid.EXTERIOR, (byte)1);
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	 * Test getState by world coordinates.
	 */
	public void testGetStateByCoord() {
<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(1.0, 0.4, 0.5, 0.05, 0.01, new int[] {0,0,0}, BlockArrayGrid.BlockType.RLE);
=======
		BlockArrayGrid grid = new BlockArrayGrid(1.0, 0.4, 0.5, 0.05, 0.01, new int[] {0,0,0},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
	
		// make sure the grid is the expected size
		int xVoxels = grid.getWidth();
Solution content 
	 * Test getState by world coordinates.
	 */
	public void testGetStateByCoord() {
		BlockArrayGrid grid = new BlockArrayGrid(1.0, 0.4, 0.5, 0.05, 0.01, new int[] {0,0,0}, BlockArrayGrid.BlockType.RLE);
	
		// make sure the grid is the expected size
		int xVoxels = grid.getWidth();
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		int[] row = {0, 3, 5};
		byte[] state = {Grid.INTERIOR, Grid.EXTERIOR, Grid.INTERIOR};

<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.05, 0.02, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.05, 0.02, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab

		width = grid.getWidth();
		height = grid.getHeight();
Solution content 
		int[] row = {0, 3, 5};
		byte[] state = {Grid.INTERIOR, Grid.EXTERIOR, Grid.INTERIOR};

		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.05, 0.02, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);

		width = grid.getWidth();
		height = grid.getHeight();
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		int[] stateDepth = {10, 6, 1};
		byte[] states = {Grid.EXTERIOR, Grid.INTERIOR, Grid.OUTSIDE};

<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.05, 0.02, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.05, 0.02, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab

		width = grid.getWidth();
		height = grid.getHeight();
Solution content 
		int[] stateDepth = {10, 6, 1};
		byte[] states = {Grid.EXTERIOR, Grid.INTERIOR, Grid.OUTSIDE};

		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.05, 0.02, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);

		width = grid.getWidth();
		height = grid.getHeight();
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		int depth = 10;
		int mat = 1;

<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		HashSet vcSetExt = new HashSet();
		HashSet vcSetInt = new HashSet();
Solution content 
		int depth = 10;
		int mat = 1;

		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
		HashSet vcSetExt = new HashSet();
		HashSet vcSetInt = new HashSet();
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
				{width-1, height-1, depth-1}
		};

<<<<<<< HEAD
		grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		vcSetExt = new HashSet();

		for (int i=0; i
Solution content 
				{width-1, height-1, depth-1}
		};

		grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
		vcSetExt = new HashSet();

		for (int i=0; i
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		int depth = 10;
		int mat = 1;

<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		HashSet vcSetExt = new HashSet();
		HashSet vcSetInt = new HashSet();
Solution content 
		int depth = 10;
		int mat = 1;

		BlockArrayGrid grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
		HashSet vcSetExt = new HashSet();
		HashSet vcSetInt = new HashSet();
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
				{width-1, height-1, depth-1}
		};

<<<<<<< HEAD
		grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		vcSetExt = new HashSet();

		for (int i=0; i
Solution content 
				{width-1, height-1, depth-1}
		};

		grid = new BlockArrayGrid(width, height, depth, 0.001, 0.001, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
		vcSetExt = new HashSet();

		for (int i=0; i
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		double voxelWidth = 0.02;
		double sliceHeight = 0.01;

<<<<<<< HEAD
		Grid grid = new BlockArrayGrid(xWorldCoord, yWorldCoord, zWorldCoord, voxelWidth, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		Grid grid = new BlockArrayGrid(xWorldCoord, yWorldCoord, zWorldCoord, voxelWidth, sliceHeight, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab

		double xcoord = 0.55;
		double ycoord = 0.0202;
Solution content 
		double voxelWidth = 0.02;
		double sliceHeight = 0.01;

		Grid grid = new BlockArrayGrid(xWorldCoord, yWorldCoord, zWorldCoord, voxelWidth, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);

		double xcoord = 0.55;
		double ycoord = 0.0202;
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		double voxelWidth = 0.02;
		double sliceHeight = 0.01;

<<<<<<< HEAD
		Grid grid = new BlockArrayGrid(xVoxels, yVoxels, zVoxels, voxelWidth, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		Grid grid = new BlockArrayGrid(xVoxels, yVoxels, zVoxels, voxelWidth, sliceHeight, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab

		int xcoord = 27;
		int ycoord = 2;
Solution content 
		double voxelWidth = 0.02;
		double sliceHeight = 0.01;

		Grid grid = new BlockArrayGrid(xVoxels, yVoxels, zVoxels, voxelWidth, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);

		int xcoord = 27;
		int ycoord = 2;
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		double voxelWidth = 0.02;
		double sliceHeight = 0.01;

<<<<<<< HEAD
		Grid grid = new BlockArrayGrid(xVoxels, yVoxels, zVoxels, voxelWidth, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		Grid grid = new BlockArrayGrid(xVoxels, yVoxels, zVoxels, voxelWidth, sliceHeight, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab

		xVoxels = grid.getWidth();
		yVoxels = grid.getHeight();
Solution content 
		double voxelWidth = 0.02;
		double sliceHeight = 0.01;

		Grid grid = new BlockArrayGrid(xVoxels, yVoxels, zVoxels, voxelWidth, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);

		xVoxels = grid.getWidth();
		yVoxels = grid.getHeight();
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		double sliceHeight = 0.0015;

		// voxel coordinates
<<<<<<< HEAD
		Grid grid = new BlockArrayGrid(50, 25, 70, 0.05, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
		assertEquals("Slice height is not " + sliceHeight, sliceHeight, grid.getSliceHeight());

		// world coordinates
		grid = new BlockArrayGrid(0.12, 0.11, 0.12, 0.05, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		Grid grid = new BlockArrayGrid(50, 25, 70, 0.05, sliceHeight, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
		assertEquals("Slice height is not " + sliceHeight, sliceHeight, grid.getSliceHeight());

		// world coordinates
		grid = new BlockArrayGrid(0.12, 0.11, 0.12, 0.05, sliceHeight, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		assertEquals("Slice height is not" + sliceHeight, sliceHeight, grid.getSliceHeight());
	}
Solution content 
		double sliceHeight = 0.0015;

		// voxel coordinates
		Grid grid = new BlockArrayGrid(50, 25, 70, 0.05, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
		assertEquals("Slice height is not " + sliceHeight, sliceHeight, grid.getSliceHeight());

		// world coordinates
		grid = new BlockArrayGrid(0.12, 0.11, 0.12, 0.05, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
		assertEquals("Slice height is not" + sliceHeight, sliceHeight, grid.getSliceHeight());
	}
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
		double voxelSize = 0.025;

		// voxel coordinates
<<<<<<< HEAD
		Grid grid = new BlockArrayGrid(50, 25, 70, voxelSize, 0.01, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
		assertEquals("Voxel size is not " + voxelSize, voxelSize, grid.getVoxelSize());

		// world coordinates
		grid = new BlockArrayGrid(0.12, 0.11, 0.12, voxelSize, 0.01, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		Grid grid = new BlockArrayGrid(50, 25, 70, voxelSize, 0.01, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
		assertEquals("Voxel size is not " + voxelSize, voxelSize, grid.getVoxelSize());

		// world coordinates
		grid = new BlockArrayGrid(0.12, 0.11, 0.12, voxelSize, 0.01, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		assertEquals("Voxel size is not " + voxelSize, voxelSize, grid.getVoxelSize());
	}
Solution content 
		double voxelSize = 0.025;

		// voxel coordinates
		Grid grid = new BlockArrayGrid(50, 25, 70, voxelSize, 0.01, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
		assertEquals("Voxel size is not " + voxelSize, voxelSize, grid.getVoxelSize());

		// world coordinates
		grid = new BlockArrayGrid(0.12, 0.11, 0.12, voxelSize, 0.01, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
		assertEquals("Voxel size is not " + voxelSize, voxelSize, grid.getVoxelSize());
	}
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
	public void testSetState() {
	int size = 10;
	
<<<<<<< HEAD
	BlockArrayGrid grid = new BlockArrayGrid(size, size, size, 0.001, 0.001, new int[] {0,0,0}, BlockArrayGrid.BlockType.RLE);
=======
	BlockArrayGrid grid = new BlockArrayGrid(size, size, size, 0.001, 0.001, new int[] {0,0,0},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
		
		grid.setData(0, 0, 0, Grid.INTERIOR, 1);
		grid.setData(9, 9, 9, Grid.EXTERIOR, 2);
Solution content 
	public void testSetState() {
	int size = 10;
	
	BlockArrayGrid grid = new BlockArrayGrid(size, size, size, 0.001, 0.001, new int[] {0,0,0}, BlockArrayGrid.BlockType.RLE);
		
		grid.setData(0, 0, 0, Grid.INTERIOR, 1);
		grid.setData(9, 9, 9, Grid.EXTERIOR, 2);
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		double voxelSize = 0.002;
		double sliceHeight = 0.001;
		
<<<<<<< HEAD
		BlockArrayGrid grid = new BlockArrayGrid(size, size, size, voxelSize, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
=======
		BlockArrayGrid grid = new BlockArrayGrid(size, size, size, voxelSize, sliceHeight, new int[] {2,2,2},BlockArrayGrid.BlockType.RLE);
>>>>>>> caebad698220c3f5a62e18803b55cc2adbfd19ab
			
		grid.setData(0, 0, 0, Grid.INTERIOR, 1);
		grid.setData(9, 9, 9, Grid.EXTERIOR, 2);
Solution content 
		double voxelSize = 0.002;
		double sliceHeight = 0.001;
		
		BlockArrayGrid grid = new BlockArrayGrid(size, size, size, voxelSize, sliceHeight, new int[] {2,2,2}, BlockArrayGrid.BlockType.RLE);
			
		grid.setData(0, 0, 0, Grid.INTERIOR, 1);
		grid.setData(9, 9, 9, Grid.EXTERIOR, 2);
File
TestBlockArrayGrid_RLEBlock.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable