Commit 26f9eb00 authored by Sebastian Vollbrecht's avatar Sebastian Vollbrecht
Browse files

Merge branch 'master' into 3-refactor-feasibleminiiproperty

parents 41146d31 e89fbf89

src/main/java/graphgen/datastructures/Pair.java

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import java.util.Objects; 


/**

 * A basic class for arranging objects in pairs. Every pairing is immutable once created. To create a pair, use the

 * static {@link Pair#makePair(Object, Object)} constructor.

 * static {@link Pair#of(Object, Object)} constructor.

 *

 * @param <T1> the type of the first element

 * @param <T2> the type of the second element
@@ -54,7 +54,7 @@ public class Pair<T1, T2> { 
	 * @return a (first, second) pair

	 * @throws NullPointerException if an element is null

	 */

	public static <X, Y> Pair<X, Y> makePair(X first, Y second) {

	public static <X, Y> Pair<X, Y> of(X first, Y second) {

		return new Pair<>(first, second);

	}

src/main/java/graphgen/generator/GraphGenerator.java

+4 −4
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ public final class GraphGenerator { 
								optimalCandidatesFound = true;

							}



							possibleCandidates.add(Pair.makePair(src, delay));

							possibleCandidates.add(Pair.of(src, delay));



							if (verbose) {

								out.println("optimal.");
@@ -431,7 +431,7 @@ public final class GraphGenerator { 
							}



							if (!optimalCandidatesFound) {

								possibleCandidates.add(Pair.makePair(src, delay));

								possibleCandidates.add(Pair.of(src, delay));

							}

						}

					}
@@ -514,7 +514,7 @@ public final class GraphGenerator { 
							optimalCandidatesFound = true;

						}



						possibleCandidates.add(Pair.makePair(dst, delay));

						possibleCandidates.add(Pair.of(dst, delay));



						if (verbose) {

							out.println("optimal.");
@@ -525,7 +525,7 @@ public final class GraphGenerator { 
						}



						if (!optimalCandidatesFound) {

							possibleCandidates.add(Pair.makePair(dst, delay));

							possibleCandidates.add(Pair.of(dst, delay));

						}

					}

				}

src/main/java/graphgen/generator/components/edges/computers/DepthValueComputer.java

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class DepthValueComputer extends ValueComputer { 
		this.depthsAndValueComputers = new ArrayList<>();

		this.useASAPDepths = useASAPDepths;



		valueComputersByDepth.forEach((d, c) -> depthsAndValueComputers.add(Pair.makePair(d, c)));

		valueComputersByDepth.forEach((d, c) -> depthsAndValueComputers.add(Pair.of(d, c)));

		depthsAndValueComputers.sort(Comparator.comparing(p -> p.first));



	}

src/main/java/graphgen/generator/components/edges/includers/DepthEdgeIncluder.java

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class DepthEdgeIncluder extends EdgeIncluder { 
		this.depthsAndEdgeIncluders = new ArrayList<>();

		this.useASAPDepths = useASAPDepths;



		edgeIncludersByDepth.forEach((d, c) -> depthsAndEdgeIncluders.add(Pair.makePair(d, c)));

		edgeIncludersByDepth.forEach((d, c) -> depthsAndEdgeIncluders.add(Pair.of(d, c)));

		depthsAndEdgeIncluders.sort(Comparator.comparing(p -> p.first));



	}

src/main/java/graphgen/generator/components/nodes/DepthNodeCreator.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class DepthNodeCreator extends NodeCreator { 


		this.depthsAndNodeCreators = new ArrayList<>();



		nodeCreatorsByDepth.forEach((d, c) -> depthsAndNodeCreators.add(Pair.makePair(d, c)));

		nodeCreatorsByDepth.forEach((d, c) -> depthsAndNodeCreators.add(Pair.of(d, c)));

		depthsAndNodeCreators.sort(Comparator.comparing(p -> p.first));



	}