Projects information

Chunk

Conflicting content
public AssignOperation(List> inputs, Img output, RealFunction func) { <<<<<<< HEAD imageCount = inputs.size() + 1; Img[] images = new Img[imageCount]; images[0] = output; for (int i = 1; i <= inputs.size(); i++) images[i] = inputs.get(i-1); ======= imageCount = inputs.size()+1; Img[] images = new Img[imageCount]; images[0] = output; for (int i = 1; i < imageCount; i++) { images[i] = inputs.get(i-1); } >>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1 iterator = new MultiImageIterator(images);

Conflicting content

	
	public AssignOperation(List> inputs, Img output, RealFunction func)
	{
<<<<<<< HEAD
		imageCount = inputs.size() + 1;

		Img[] images = new Img[imageCount];
		images[0] = output;
		for (int i = 1; i <= inputs.size(); i++)
			images[i] = inputs.get(i-1);
=======
		imageCount = inputs.size()+1;

		Img[] images = new Img[imageCount];
		images[0] = output;
		for (int i = 1; i < imageCount; i++) {
			images[i] = inputs.get(i-1);
		}
>>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1
		
		iterator = new MultiImageIterator(images);

Solution content
public AssignOperation(List> inputs, Img output, RealFunction func) { imageCount = inputs.size() + 1; Img[] images = new Img[imageCount]; images[0] = output; for (int i = 1; i <= inputs.size(); i++) images[i] = inputs.get(i-1); iterator = new MultiImageIterator(images);

Solution content

	
	public AssignOperation(List> inputs, Img output, RealFunction func)
	{
		imageCount = inputs.size() + 1;

		Img[] images = new Img[imageCount];
		images[0] = output;
		for (int i = 1; i <= inputs.size(); i++)
			images[i] = inputs.get(i-1);
		
		iterator = new MultiImageIterator(images);

File
AssignOperation.java

Developer's decision
Version 1

Kind of conflict
Array access
Attribute
For statement
Method invocation
Variable

Chunk

Conflicting content
import static org.junit.Assert.assertEquals; import java.util.ArrayList; <<<<<<< HEAD ======= import java.util.List; >>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1 import net.imglib2.RandomAccess; import net.imglib2.ops.condition.PixelOnBorder;

Conflicting content

import static org.junit.Assert.assertEquals;

import java.util.ArrayList;
<<<<<<< HEAD
=======
import java.util.List;
>>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1

import net.imglib2.RandomAccess;
import net.imglib2.ops.condition.PixelOnBorder;

Solution content
import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; import net.imglib2.RandomAccess; import net.imglib2.ops.condition.PixelOnBorder;

File
Rev2FunctionalIdeasTest.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content
UnaryOperatorFunction function = new UnaryOperatorFunction(op); <<<<<<< HEAD ArrayList> inputs = new ArrayList>(); inputs.add(image0); AssignOperation operation = new AssignOperation(inputs, image0, function); ======= AssignOperation operation = new AssignOperation(makeList(image0), image0, function); >>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1 operation.execute(); assertImgValsEqual(new int[]{1,4,9,16,25,36,49,64,81}, image0);

Conflicting content

		
		
		UnaryOperatorFunction function = new UnaryOperatorFunction(op);
		
<<<<<<< HEAD
		ArrayList> inputs = new ArrayList>();
		inputs.add(image0);
		
		AssignOperation operation =
			new AssignOperation(inputs, image0, function);
		
=======
		AssignOperation operation = new AssignOperation(makeList(image0), image0, function);

>>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1
		operation.execute();
		assertImgValsEqual(new int[]{1,4,9,16,25,36,49,64,81}, image0);

Solution content
UnaryOperatorFunction function = new UnaryOperatorFunction(op); AssignOperation operation = new AssignOperation(makeList(image0), image0, function); operation.execute(); assertImgValsEqual(new int[]{1,4,9,16,25,36,49,64,81}, image0);

Solution content

		
		UnaryOperatorFunction function = new UnaryOperatorFunction(op);
		
		AssignOperation operation = new AssignOperation(makeList(image0), image0, function);

		operation.execute();
		
		assertImgValsEqual(new int[]{1,4,9,16,25,36,49,64,81}, image0);

File
Rev2FunctionalIdeasTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
UnaryOperatorFunction function = new UnaryOperatorFunction(op); <<<<<<< HEAD ArrayList> inputs = new ArrayList>(); inputs.add(image0); AssignOperation operation = new AssignOperation(inputs, image0, function); ======= AssignOperation operation = new AssignOperation(makeList(image0), image0, function); >>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1 operation.setInputCondition(0, new ValueGreaterThan(4));

Conflicting content

		
		UnaryOperatorFunction function = new UnaryOperatorFunction(op);

<<<<<<< HEAD
		ArrayList> inputs = new ArrayList>();
		inputs.add(image0);

		AssignOperation operation = new AssignOperation(inputs, image0, function);
=======
		AssignOperation operation = new AssignOperation(makeList(image0), image0, function);
>>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1

		operation.setInputCondition(0, new ValueGreaterThan(4));

Solution content
UnaryOperatorFunction function = new UnaryOperatorFunction(op); AssignOperation operation = new AssignOperation(makeList(image0), image0, function); operation.setInputCondition(0, new ValueGreaterThan(4));

Solution content

		
		UnaryOperatorFunction function = new UnaryOperatorFunction(op);

		AssignOperation operation = new AssignOperation(makeList(image0), image0, function);

		operation.setInputCondition(0, new ValueGreaterThan(4));

File
Rev2FunctionalIdeasTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
UnaryOperatorFunction function = new UnaryOperatorFunction(op); <<<<<<< HEAD ArrayList> inputs = new ArrayList>(); inputs.add(image0); AssignOperation operation = new AssignOperation(inputs, image0, function); ======= AssignOperation operation = new AssignOperation(makeList(image0), image0, function); >>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1 operation.setOutputCondition(new ValueLessThan(7));

Conflicting content

		
		UnaryOperatorFunction function = new UnaryOperatorFunction(op);

<<<<<<< HEAD
		ArrayList> inputs = new ArrayList>();
		inputs.add(image0);

		AssignOperation operation = new AssignOperation(inputs, image0, function);
=======
		AssignOperation operation = new AssignOperation(makeList(image0), image0, function);
>>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1

		operation.setOutputCondition(new ValueLessThan(7));

Solution content
UnaryOperatorFunction function = new UnaryOperatorFunction(op); AssignOperation operation = new AssignOperation(makeList(image0), image0, function); operation.setOutputCondition(new ValueLessThan(7));

File
Rev2FunctionalIdeasTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
UnaryOperatorFunction function = new UnaryOperatorFunction(op); <<<<<<< HEAD ArrayList> inputs = new ArrayList>(); inputs.add(image0); AssignOperation operation = new AssignOperation(inputs, image1, function); ======= AssignOperation operation = new AssignOperation(makeList(image0), image1, function); >>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1 operation.execute();

Conflicting content

		
		UnaryOperatorFunction function = new UnaryOperatorFunction(op);

<<<<<<< HEAD
		ArrayList> inputs = new ArrayList>();
		inputs.add(image0);

		AssignOperation operation = new AssignOperation(inputs, image1, function);
=======
		AssignOperation operation = new AssignOperation(makeList(image0), image1, function);
>>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1

		operation.execute();

Solution content
UnaryOperatorFunction function = new UnaryOperatorFunction(op); AssignOperation operation = new AssignOperation(makeList(image0), image1, function); operation.execute();

File
Rev2FunctionalIdeasTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
AvgFunction function = new AvgFunction(); <<<<<<< HEAD ArrayList> inputs = new ArrayList>(); inputs.add(image0); inputs.add(image1); AssignOperation operation = new AssignOperation(inputs, image2, function); ======= AssignOperation operation = new AssignOperation(makeList(image0, image1), image2, function); >>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1 operation.execute();

Conflicting content

		
		AvgFunction function = new AvgFunction();

<<<<<<< HEAD
		ArrayList> inputs = new ArrayList>();
		inputs.add(image0);
		inputs.add(image1);

		AssignOperation operation = new AssignOperation(inputs, image2, function);
=======
		AssignOperation operation = new AssignOperation(makeList(image0, image1), image2, function);
>>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1

		operation.execute();

Solution content
AvgFunction function = new AvgFunction(); AssignOperation operation = new AssignOperation(makeList(image0, image1), image2, function); operation.execute();

File
Rev2FunctionalIdeasTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
AvgFunction function = new AvgFunction(); <<<<<<< HEAD ArrayList> inputs = new ArrayList>(); inputs.add(image0); inputs.add(image1); AssignOperation operation = new AssignOperation(inputs, image2, function); ======= AssignOperation operation = new AssignOperation(makeList(image0, image1), image2, function); >>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1 operation.setInputCondition(0, new ValueLessThan(8)); operation.setInputRegion(0, new long[]{0,1}, new long[]{2,2});

Conflicting content

		
		AvgFunction function = new AvgFunction();

<<<<<<< HEAD
		ArrayList> inputs = new ArrayList>();
		inputs.add(image0);
		inputs.add(image1);

		AssignOperation operation = new AssignOperation(inputs, image2, function);
=======
		AssignOperation operation = new AssignOperation(makeList(image0, image1), image2, function);
>>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1

		operation.setInputCondition(0, new ValueLessThan(8));
		operation.setInputRegion(0, new long[]{0,1}, new long[]{2,2});

Solution content
AvgFunction function = new AvgFunction(); AssignOperation operation = new AssignOperation(makeList(image0, image1), image2, function); operation.setInputCondition(0, new ValueLessThan(8)); operation.setInputRegion(0, new long[]{0,1}, new long[]{2,2});

Solution content

		
		AvgFunction function = new AvgFunction();

		AssignOperation operation = new AssignOperation(makeList(image0, image1), image2, function);

		operation.setInputCondition(0, new ValueLessThan(8));
		operation.setInputRegion(0, new long[]{0,1}, new long[]{2,2});

File
Rev2FunctionalIdeasTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
AvgFunction function = new AvgFunction(); <<<<<<< HEAD ArrayList> inputs = new ArrayList>(); inputs.add(image0); inputs.add(image0); AssignOperation operation = new AssignOperation(inputs, image1, function); ======= AssignOperation operation = new AssignOperation(makeList(image0, image0), image1, function); >>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1 operation.setInputRegion(0, new long[]{0,0}, new long[]{3,1});

Conflicting content

		AvgFunction function = new AvgFunction();

<<<<<<< HEAD
		ArrayList> inputs = new ArrayList>();
		inputs.add(image0);
		inputs.add(image0);

		AssignOperation operation = new AssignOperation(inputs, image1, function);
=======
		AssignOperation operation = new AssignOperation(makeList(image0, image0), image1, function);
>>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1

		operation.setInputRegion(0, new long[]{0,0}, new long[]{3,1});

Solution content
AvgFunction function = new AvgFunction(); AssignOperation operation = new AssignOperation(makeList(image0, image0), image1, function); operation.setInputRegion(0, new long[]{0,0}, new long[]{3,1});

File
Rev2FunctionalIdeasTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

<<<<<<< HEAD
		
		ConstFunction function = new ConstFunction(1);
		ArrayList> inputs = new ArrayList>();
		inputs.add(image0);

		AssignOperation operation = new AssignOperation(inputs, image1, function);
=======
		AssignOperation operation = new AssignOperation(makeList(image0), image1, function);
>>>>>>> cbc1ef8cce94e709eca1230901b1bdd59214fef1
		
		PixelOnBorder condition = new PixelOnBorder(image0, 255);

Solution content
ConstFunction function = new ConstFunction(1); AssignOperation operation = new AssignOperation(makeList(image0), image1, function); PixelOnBorder condition = new PixelOnBorder(image0, 255);

File
Rev2FunctionalIdeasTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation
Variable

Projects >> imglib2 >>49bbdab92906d921f65de3a1d163303f4522f69e