Projects information

Chunk

Conflicting content
double[] constraintRightHandSides, double objectiveFunctionValue) { <<<<<<< HEAD this.objectiveFunctionType = (objectiveFunctionType == "Max") ? objectiveFunctionTypes.MAX : objectiveFunctionTypes.MIN; ======= // TODO: Well-formed checking and exception throwing. this.objectiveFunctionType = objectiveFunctionType; >>>>>>> 4aef21d2b14d4171f254199263060b25f99e5282 this.variableNames = variableNames; this.objectiveFunctionCoefficients = objectiveFunctionCoefficients; this.constraintCoefficients = constraintCoefficients;

Conflicting content

		double[] constraintRightHandSides, 
		double objectiveFunctionValue) {
		
<<<<<<< HEAD
		this.objectiveFunctionType = (objectiveFunctionType == "Max") ? objectiveFunctionTypes.MAX : objectiveFunctionTypes.MIN;
=======
		// TODO: Well-formed checking and exception throwing.
		this.objectiveFunctionType = objectiveFunctionType;
>>>>>>> 4aef21d2b14d4171f254199263060b25f99e5282
		this.variableNames = variableNames;
		this.objectiveFunctionCoefficients = objectiveFunctionCoefficients;
		this.constraintCoefficients = constraintCoefficients;

Solution content
double[] constraintRightHandSides, double objectiveFunctionValue) { // TODO: Well-formed checking and exception throwing. this.objectiveFunctionType = (objectiveFunctionType == "Max") ? objectiveFunctionTypes.MAX : objectiveFunctionTypes.MIN; this.variableNames = variableNames; this.objectiveFunctionCoefficients = objectiveFunctionCoefficients; this.constraintCoefficients = constraintCoefficients;

Solution content

		double[] constraintRightHandSides, 
		double objectiveFunctionValue) {
		
		// TODO: Well-formed checking and exception throwing.
		this.objectiveFunctionType = (objectiveFunctionType == "Max") ? objectiveFunctionTypes.MAX : objectiveFunctionTypes.MIN;
		this.variableNames = variableNames;
		this.objectiveFunctionCoefficients = objectiveFunctionCoefficients;
		this.constraintCoefficients = constraintCoefficients;

File
LPP.java

Developer's decision
Combination

Kind of conflict
Attribute
Comment

Chunk

Conflicting content
public String toString() { <<<<<<< HEAD String output = (objectiveFunctionType == objectiveFunctionTypes.MAX) ? "Maximize" : "Minimize"; output = output + " " + displayEqLine(objectiveFunctionCoefficients, variableNames); if(objectiveFunctionValue != 0) { output = output + " + " + formatDecimals(objectiveFunctionValue); ======= String output = (objectiveFunctionType == "Max") ? "Maximize" : "Minimize"; output = output + " " + displayEqLine(objectiveFunctionCoefficients, variableNames); if(objectiveFunctionValue != 0) { output += " + " formatDecimals(objectiveFunctionValue); >>>>>>> 4aef21d2b14d4171f254199263060b25f99e5282 } output += '\n' + "subject to the constraints:" + '\n';

Conflicting content


	public String toString() {
<<<<<<< HEAD
		String output = (objectiveFunctionType == objectiveFunctionTypes.MAX) ? "Maximize" : "Minimize";

		output = output + "  " + displayEqLine(objectiveFunctionCoefficients, variableNames);
		if(objectiveFunctionValue != 0) {
			output = output + " + " + formatDecimals(objectiveFunctionValue);
=======
		String output = (objectiveFunctionType == "Max") ? "Maximize" : "Minimize";

		output = output + "  " + displayEqLine(objectiveFunctionCoefficients, variableNames);
		if(objectiveFunctionValue != 0) {
			output += " + " formatDecimals(objectiveFunctionValue);
>>>>>>> 4aef21d2b14d4171f254199263060b25f99e5282
		}

		output += '\n' + "subject to the constraints:" + '\n';

Solution content
public String toString() { String output = (objectiveFunctionType == objectiveFunctionTypes.MAX) ? "Maximize" : "Minimize"; output = output + " " + displayEqLine(objectiveFunctionCoefficients, variableNames); if(objectiveFunctionValue != 0) { output += " + " formatDecimals(objectiveFunctionValue); } output += '\n' + "subject to the constraints:" + '\n';

Solution content


	public String toString() {
		String output = (objectiveFunctionType == objectiveFunctionTypes.MAX) ? "Maximize" : "Minimize";

		output = output + "  " + displayEqLine(objectiveFunctionCoefficients, variableNames);
		if(objectiveFunctionValue != 0) {
			output += " + " formatDecimals(objectiveFunctionValue);
		}

		output += '\n' + "subject to the constraints:" + '\n';

File
LPP.java

Developer's decision
Combination

Kind of conflict
Attribute
If statement
Method invocation
Variable

Chunk

Conflicting content
double[] constraint = constraintCoefficients[j]; output += displayEqLine(constraint, variableNames); output += " " + constraintTypes[j]; <<<<<<< HEAD output += " " + formatDecimals(constraintRightHandSides[j]) ; output += + '\n' + '\n'; ======= output += " " + formatDecimals(constraintRightHandSides[j]); output += '\n' + '\n'; >>>>>>> 4aef21d2b14d4171f254199263060b25f99e5282 } return output; }

Conflicting content

			double[] constraint = constraintCoefficients[j];
			output += displayEqLine(constraint, variableNames);
			output += " " + constraintTypes[j];
<<<<<<< HEAD
			output += " "  + formatDecimals(constraintRightHandSides[j]) ;
			output += + '\n' + '\n';
=======
			output += " " + formatDecimals(constraintRightHandSides[j]);
			output += '\n' + '\n';
>>>>>>> 4aef21d2b14d4171f254199263060b25f99e5282
		}
		return output;
	}

Solution content
double[] constraint = constraintCoefficients[j]; output += displayEqLine(constraint, variableNames); output += " " + constraintTypes[j]; output += " " + formatDecimals(constraintRightHandSides[j]) ; output += + '\n' + '\n'; } return output; }

Solution content

			double[] constraint = constraintCoefficients[j];
			output += displayEqLine(constraint, variableNames);
			output += " " + constraintTypes[j];
			output += " "  + formatDecimals(constraintRightHandSides[j]) ;
			output += + '\n' + '\n';
		}
		return output;
	}

File
LPP.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
public void makeStandardForm() { //Change Signs to = by adding variables for(int i = 0; i < constraintTypes.length; i++) { <<<<<<< HEAD if(constraintTypes[i] != "=") { this.addVariableAt(i, (constraintTypes[i] == "�") ? -1 : 1); ======= if(constraintTypes[i] == "�") { this.addVariableAt(i, -1); constraintTypes[i] = "="; } if(constraintTypes[i] == "�") { this.addVariableAt(i, 1); >>>>>>> 4aef21d2b14d4171f254199263060b25f99e5282 constraintTypes[i] = "="; } }

Conflicting content

	public void makeStandardForm() {
		//Change Signs to = by adding variables
		for(int i = 0; i < constraintTypes.length; i++) {
<<<<<<< HEAD
			if(constraintTypes[i] != "=") {
				this.addVariableAt(i, (constraintTypes[i] == "�") ? -1 : 1);
=======

			if(constraintTypes[i] == "�") {
				this.addVariableAt(i, -1);
				constraintTypes[i] = "=";
			}

			if(constraintTypes[i] == "�") {
				this.addVariableAt(i, 1);
>>>>>>> 4aef21d2b14d4171f254199263060b25f99e5282
				constraintTypes[i] = "=";
			}
		}

Solution content
public void makeStandardForm() { //Change Signs to = by adding variables for(int i = 0; i < constraintTypes.length; i++) { if(constraintTypes[i] != "=") { this.addVariableAt(i, (constraintTypes[i] == "�") ? -1 : 1); constraintTypes[i] = "="; } }

Solution content

	public void makeStandardForm() {
		//Change Signs to = by adding variables
		for(int i = 0; i < constraintTypes.length; i++) {
			if(constraintTypes[i] != "=") {
				this.addVariableAt(i, (constraintTypes[i] == "�") ? -1 : 1);
				constraintTypes[i] = "=";
			}
		}

File
LPP.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content
private void makeStandardForm(ArrayList artificialVariables) { //Change Signs to = by adding variables for(int i = 0; i < constraintTypes.length; i++) { <<<<<<< HEAD if(constraintTypes[i] != "=") { addVariableAt(i, (constraintTypes[i] == "�") ? -1 : 1); ======= if(constraintTypes[i] == "�") { addVariableAt(i, -1); constraintTypes[i] = "="; artificialVariables = increaseArtificialVariableIndices(artificialVariables); } if(constraintTypes[i] == "�") { addVariableAt(i, 1); >>>>>>> 4aef21d2b14d4171f254199263060b25f99e5282 constraintTypes[i] = "="; artificialVariables = increaseArtificialVariableIndices(artificialVariables); }

Conflicting content

	private void makeStandardForm(ArrayList artificialVariables) {
		//Change Signs to = by adding variables
		for(int i = 0; i < constraintTypes.length; i++) {
<<<<<<< HEAD
			if(constraintTypes[i] != "=") {
				addVariableAt(i, (constraintTypes[i] == "�") ? -1 : 1);
=======

			if(constraintTypes[i] == "�") {
				addVariableAt(i, -1);
				constraintTypes[i] = "=";
				artificialVariables = increaseArtificialVariableIndices(artificialVariables);
			}

			if(constraintTypes[i] == "�") {
				addVariableAt(i, 1);
>>>>>>> 4aef21d2b14d4171f254199263060b25f99e5282
				constraintTypes[i] = "=";
				artificialVariables = increaseArtificialVariableIndices(artificialVariables);
			}

Solution content
private void makeStandardForm(ArrayList artificialVariables) { //Change Signs to = by adding variables for(int i = 0; i < constraintTypes.length; i++) { if(constraintTypes[i] != "=") { addVariableAt(i, (constraintTypes[i] == "�") ? -1 : 1); constraintTypes[i] = "="; artificialVariables = increaseArtificialVariableIndices(artificialVariables); }

Solution content

	private void makeStandardForm(ArrayList artificialVariables) {
		//Change Signs to = by adding variables
		for(int i = 0; i < constraintTypes.length; i++) {
			if(constraintTypes[i] != "=") {
				addVariableAt(i, (constraintTypes[i] == "�") ? -1 : 1);
				constraintTypes[i] = "=";
				artificialVariables = increaseArtificialVariableIndices(artificialVariables);
			}

File
LPP.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation

Projects >> lpp >>0ff22b168a78ec34cf43271518c0950b788f6bce