Projects >> SPARQL2NL >>e17966c3c7bab12196119f4401828c1e28916710

Chunk
Conflicting content 
	 */
	public static void main(String[] args) {
		System.out.println(new SPARQL2NL().getNaturalLanguageRepresentations(
<<<<<<< HEAD
				"PREFIX rdfs:  PREFIX rdf:  SELECT ?x WHERE { ?x   . }")
=======
				"SELECT ?var0 WHERE { ?var0   . }")
>>>>>>> 51eb50c2a468191bdf5c788156a53ce754bfc754
		);
	}
Solution content 
	 */
	public static void main(String[] args) {
		System.out.println(new SPARQL2NL().getNaturalLanguageRepresentations(
<<<<<<< HEAD
				"PREFIX rdfs:  PREFIX rdf:  SELECT ?x WHERE { ?x   . }")
=======
				"SELECT ?var0 WHERE { ?var0   . }")
>>>>>>> 51eb50c2a468191bdf5c788156a53ce754bfc754
		);
	}
File
SPARQL2NL.java
Developer's decision
Manual
Kind of conflict
Other
Chunk
Conflicting content 
		
		for ( Slot slot : this.template.getSlots() ) {
			
<<<<<<< HEAD
			String uri = templateToQueryVariables.get("?" + slot.getAnchor());
			if ( !uri.startsWith("?") ) {
				
				String words = StringUtils.join(slot.getWords(), " ");
				String replacement = this.labels.get(uri);
				
				System.out.println("URI: " + uri);
				System.out.println("Slot-Words: " + words);
				System.out.println("Replacement: " + replacement);
				
				this.question = this.question.replace(words, !replacement.equals("N/A") ? replacement : words + "_" + replacement);
			}
=======
			String uri = templateToQueryVariables.get("?" + slot.getAnchor());if(uri.startsWith("?"))continue;
			String words = StringUtils.join(slot.getWords(), " ");
			String replacement = this.labels.get(uri);
			
			this.question = this.question.replace(words, !replacement.equals("N/A") ? replacement : words + "_" + replacement);
>>>>>>> 51eb50c2a468191bdf5c788156a53ce754bfc754
		}
		return this.question;
	}
Solution content 
		
		for ( Slot slot : this.template.getSlots() ) {
			
			String uri = templateToQueryVariables.get("?" + slot.getAnchor());
			if ( !uri.startsWith("?") ) {
				
				String words = StringUtils.join(slot.getWords(), " ");
				String replacement = this.labels.get(uri);
				
				System.out.println("URI: " + uri);
				System.out.println("Slot-Words: " + words);
				System.out.println("Replacement: " + replacement);
				
				this.question = this.question.replace(words, !replacement.equals("N/A") ? replacement : words + "_" + replacement);
			}
		}
		return this.question;
	}
File
NaturalLanguageGenerator.java
Developer's decision
Version 1
Kind of conflict
Attribute
If statement
Method invocation
Variable