Projects >> phenoscape-nlp >>6dd2b56c5076ad157c3a5fecf81b483adbb01a61

Chunk
Conflicting content 
		relationalqualities.put("project towards", "RO:0002220");
		relationalqualities.put("reaching", "RO:0002220");
		
<<<<<<< HEAD
		relationalqualities.put("bearer of","BFO:0000053");
		relationalqualities.put("adjacent to","RO:0002220");
		//relationalqualities.put("anterior to","BSPO:0000096");
		relationalqualities.put("anteriorly connected to","UBERON:anteriorly_connected_to");
		//relationalqualities.put("attaches to","UBERON:attaches_to");
		relationalqualities.put("extends from","PHENOSCAPE:extends_from");
		relationalqualities.put("connected to","RO:0002150");
		relationalqualities.put("decreased in magnitude relative to","PATO:decreased_in_magnitude_relative_to");
		relationalqualities.put("deep to","BSPO:0000107");
		relationalqualities.put("develops from","RO:0002202");
		relationalqualities.put("distal to","BSPO:0000097");
		relationalqualities.put("distally connected to","UBERON:distally_connected_to");
		relationalqualities.put("dorsal to","BSPO:0000098");
		relationalqualities.put("encloses","UBERON:encloses");
		relationalqualities.put("extends to","PHENOSCAPE:extends_to");
		relationalqualities.put("has cross section","PATO:has_cross_section");
		relationalqualities.put("has muscle insertion","UBERON:has_muscle_insertion");
		relationalqualities.put("has muscle origin","UBERON:has_muscle_origin");
		relationalqualities.put("has part","BFO:0000051");
		relationalqualities.put("in anterior side of","BSPO:0000123");
		relationalqualities.put("in distal side of","BSPO:0000125");
		relationalqualities.put("in lateral side of","UBERON:in_lateral_side_of");
		relationalqualities.put("in left side of","BSPO:0000120");
		relationalqualities.put("in median plane of","UBERON:in_median_plane_of");
		relationalqualities.put("in posterior side of","BSPO:0000122");
		relationalqualities.put("in proximal side of","BSPO:0000124");
		relationalqualities.put("in right side of","BSPO:0000121");
		relationalqualities.put("increased in magnitude relative to","PATO:increased_in_magnitude_relative_to");
		//relationalqualities.put("located in","OBO_REL:located_in");
		relationalqualities.put("overlaps","RO:0002131");
		relationalqualities.put("part of","BFO:0000050");
		relationalqualities.put("passes through","BSPO:passes_through");
		relationalqualities.put("posterior to","BSPO:0000099");
		relationalqualities.put("posteriorly connected to","UBERON:posteriorly_connected_to");
		relationalqualities.put("proximal to","BSPO:0000100");
		relationalqualities.put("proximally connected to","UBERON:proximally_connected_to");
		relationalqualities.put("similar in magnitude relative to","PATO:similar_in_magnitude_relative_to");
		relationalqualities.put("surrounded by","RO:0002219");
		relationalqualities.put("surrounds","RO:0002221");
		relationalqualities.put("ventral to","BSPO:0000102");
		relationalqualities.put("vicinity of","BSPO:0000103");
		relationalqualities.put("serves as attachment site for","PHENOSCAPE:serves_as_attachment_site_for");
		relationalqualities.put("inheres in","BFO:0000052");
		relationalqualities.put("not","PHENOSCAPE:complement_of");
		
=======
>>>>>>> 5240f38c83a8d4e1ac5d08383f88158b207f6feb
	}
}
Solution content 
		relationalqualities.put("project towards", "RO:0002220");
		relationalqualities.put("reaching", "RO:0002220");
		

		relationalqualities.put("bearer of","BFO:0000053");
		relationalqualities.put("adjacent to","RO:0002220");
		//relationalqualities.put("anterior to","BSPO:0000096");
		relationalqualities.put("anteriorly connected to","UBERON:anteriorly_connected_to");
		//relationalqualities.put("attaches to","UBERON:attaches_to");
		relationalqualities.put("extends from","PHENOSCAPE:extends_from");
		relationalqualities.put("connected to","RO:0002150");
		relationalqualities.put("decreased in magnitude relative to","PATO:decreased_in_magnitude_relative_to");
		relationalqualities.put("deep to","BSPO:0000107");
		relationalqualities.put("develops from","RO:0002202");
		relationalqualities.put("distal to","BSPO:0000097");
		relationalqualities.put("distally connected to","UBERON:distally_connected_to");
		relationalqualities.put("dorsal to","BSPO:0000098");
		relationalqualities.put("encloses","UBERON:encloses");
		relationalqualities.put("extends to","PHENOSCAPE:extends_to");
		relationalqualities.put("has cross section","PATO:has_cross_section");
		relationalqualities.put("has muscle insertion","UBERON:has_muscle_insertion");
		relationalqualities.put("has muscle origin","UBERON:has_muscle_origin");
		relationalqualities.put("has part","BFO:0000051");
		relationalqualities.put("in anterior side of","BSPO:0000123");
		relationalqualities.put("in distal side of","BSPO:0000125");
		relationalqualities.put("in lateral side of","UBERON:in_lateral_side_of");
		relationalqualities.put("in left side of","BSPO:0000120");
		relationalqualities.put("in median plane of","UBERON:in_median_plane_of");
		relationalqualities.put("in posterior side of","BSPO:0000122");
		relationalqualities.put("in proximal side of","BSPO:0000124");
		relationalqualities.put("in right side of","BSPO:0000121");
		relationalqualities.put("increased in magnitude relative to","PATO:increased_in_magnitude_relative_to");
		//relationalqualities.put("located in","OBO_REL:located_in");
		relationalqualities.put("overlaps","RO:0002131");
		relationalqualities.put("part of","BFO:0000050");
		relationalqualities.put("passes through","BSPO:passes_through");
		relationalqualities.put("posterior to","BSPO:0000099");
		relationalqualities.put("posteriorly connected to","UBERON:posteriorly_connected_to");
		relationalqualities.put("proximal to","BSPO:0000100");
		relationalqualities.put("proximally connected to","UBERON:proximally_connected_to");
		relationalqualities.put("similar in magnitude relative to","PATO:similar_in_magnitude_relative_to");
		relationalqualities.put("surrounded by","RO:0002219");
		relationalqualities.put("surrounds","RO:0002221");
		relationalqualities.put("ventral to","BSPO:0000102");
		relationalqualities.put("vicinity of","BSPO:0000103");
		relationalqualities.put("serves as attachment site for","PHENOSCAPE:serves_as_attachment_site_for");
		relationalqualities.put("inheres in","BFO:0000052");
		relationalqualities.put("not","PHENOSCAPE:complement_of");

	}
File
Dictionary.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
		String relation_ID=null;
		//checks if the given relation is present in the identified relationalqualities - Hariharan
		Hashtable relationlist = null;
<<<<<<< HEAD
		if(dict.relationalqualities.containsKey(relation))
=======
		if(dict.relationalqualities.contains(relation))
>>>>>>> 5240f38c83a8d4e1ac5d08383f88158b207f6feb
		{
			relationlist = new Hashtable();
			relationlist.put("id", dict.relationalqualities.get(relation));
Solution content 
		String relation_ID=null;
		//checks if the given relation is present in the identified relationalqualities - Hariharan
		Hashtable relationlist = null;
		if(dict.relationalqualities.containsKey(relation))
		{
			relationlist = new Hashtable();
			relationlist.put("id", dict.relationalqualities.get(relation));
File
RelationHandler.java
Developer's decision
Version 1
Kind of conflict
If statement