Projects >> treemachine >>6ef11ff85356940cf163b94efa3896b9738a4621

Chunk
Conflicting content
			origRels.add(rel);
		}
		
<<<<<<< HEAD:src/main/java/opentree/synthesis/ranking/RelationshipRanker.java
		/*		
		System.out.println("\n*** Relationships BEFORE ranking: ***");
		for (int i = 0; i < rankedRels.size(); i++) {
			System.out.println("Relationship: " + rankedRels.get(i).toString() + "; Source: " + rankedRels.get(i).getProperty("source"));
=======
		
		
		if (rankedRels.size() == 0) {
		//	System.out.println("\n\t*** Whoops?!? No relationships to deal with! ***");
		} else {
			
		//	System.out.println("\n*** Relationships BEFORE ranking: ***");
		//	for (int i = 0; i < rankedRels.size(); i++) {
		//		System.out.println("Relationship: " + rankedRels.get(i).toString() + "; Source: " + rankedRels.get(i).getProperty("source"));
		//	}
		//	System.out.print("\n");
			
			for (int i = criteria.size() - 1; i >= 0; i--) {
				// iterate through criteria in reverse order and sort the relationships in that order
				criteria.get(i).sort(rankedRels); // TEST THIS
			}
			
		//	System.out.println("*** Relationships AFTER ranking: ***");
		//	for (int i = 0; i < rankedRels.size(); i++) {
		//		System.out.println("Relationship: " + rankedRels.get(i).toString() + "; Source: " + rankedRels.get(i).getProperty("source"));
		//	}
		//	System.out.print("\n");
			
		//	if (!origRels.equals(rankedRels)) {
		//		System.out.println("\n\t*** RANKING DIFFERS! ***\n");
		//	}
>>>>>>> c93a327b309c1ee75376c0cb419df4c537467fc2:src/main/java/opentree/synthesis/RelationshipRanker.java
		}
		System.out.print("\n"); */
		
Solution content
		
		}
			origRels.add(rel);
		}
		
		
		
		if (rankedRels.size() == 0) {
		//	System.out.println("\n\t*** Whoops?!? No relationships to deal with! ***");
		} else {
			
		//	System.out.println("\n*** Relationships BEFORE ranking: ***");
		//	for (int i = 0; i < rankedRels.size(); i++) {
		//		System.out.println("Relationship: " + rankedRels.get(i).toString() + "; Source: " + rankedRels.get(i).getProperty("source"));
		//	}
		//	System.out.print("\n");
			
			for (int i = criteria.size() - 1; i >= 0; i--) {
				// iterate through criteria in reverse order and sort the relationships in that order
				criteria.get(i).sort(rankedRels); // TEST THIS
			}
			
		//	System.out.println("*** Relationships AFTER ranking: ***");
		//	for (int i = 0; i < rankedRels.size(); i++) {
		//		System.out.println("Relationship: " + rankedRels.get(i).toString() + "; Source: " + rankedRels.get(i).getProperty("source"));
		//	}
		//	System.out.print("\n");
			
		//	if (!origRels.equals(rankedRels)) {
		//		System.out.println("\n\t*** RANKING DIFFERS! ***\n");
		//	}
File
RelationshipRanker.java
Developer's decision
Version 2
Kind of conflict
Comment
For statement
If statement