Merge lp:~amebel/relex/rules into lp:~icog/relex/relex

[Amen Belayneh]

[Amen Belayneh (amebel)]

working fine

review: Approve

=== modified file 'data/relex2logic-rules.txt'
--- data/relex2logic-rules.txt	2013-12-19 12:14:59 +0000
+++ data/relex2logic-rules.txt	2013-12-19 15:38:25 +0000
@@ -1,19 +1,19 @@
-[SVO]  {2} <SV, SVP> _subj($y, $x) & _obj($y, $z) => (SVO-rule $x (get_instance_name $x word_index sentence_index) $y (get_instance_name $y word_index sentence_index) $z (get_instance_name $z word_index sentence_index))
-
-[AMOD] {3} <> _amod($N, $A) => (amod-rule $N (get_instance_name $N word_index sentence_index) $A (get_instance_name $A word_index sentence_index))
-
-[ADVMOD] {4} <> _advmod($V, $ADV) => (advmod-rule $V (get_instance_name $V word_index sentence_index) $ADV (get_instance_name $ADV word_index sentence_index))
-
-[TENSEPOS] {5} <> tense($W, $Tense) & pos($W, verb) => (tense-rule $W (get_instance_name $W word_index sentence_index) $Tense)
-
-[DET] {6} <> _det($W, those) => (those-rule $W (get_instance_name $W word_index sentence_index) choose_var_name)
-
-[NEGFLAG] {7} <> NEGATIVE-FLAG($V, T) => (negative-rule $V (get_instance_name $V word_index sentence_index))
-
-[POSS1A] {8} <POSS1B, POSS2> _poss($N, $W) & pos($W, adj) => (possesive-rule $N (get_instance_name $N word_index sentence_index) $W (get_instance_name $W word_index sentence_index))
-
-[POSS1B] {8} <POSS1A, POSS2> _poss($N, $W) & pos($W, noun) & person-FLAG($W, T) => (possesive-rule $N (get_instance_name $N word_index sentence_index) $W (get_instance_name $W word_index sentence_index))
-
-[POSS2] {8} <POSS1A, POSS1B> _poss($N, $W) & pos($W, noun) => (possesive-rule $N (get_instance_name $V word_index sentence_index) $W (get_instance_name $W word_index sentence_index))
+[SVO]  {2} <SV, SVP> _subj($y, $x) & _obj($y, $z) => (SVO-rule $x (get-instance-name $x word_index sentence_index) $y (get-instance-name $y word_index sentence_index) $z (get-instance-name $z word_index sentence_index))
+
+[AMOD] {3} <> _amod($N, $A) => (amod-rule $N (get-instance-name $N word_index sentence_index) $A (get-instance-name $A word_index sentence_index))
+
+[ADVMOD] {4} <> _advmod($V, $ADV) => (advmod-rule $V (get-instance-name $V word_index sentence_index) $ADV (get-instance-name $ADV word_index sentence_index))
+
+[TENSEPOS] {5} <> tense($W, $Tense) & pos($W, verb) => (tense-rule $W (get-instance-name $W word_index sentence_index) $Tense)
+
+[DET] {6} <> _det($W, those) => (those-rule $W (get-instance-name $W word_index sentence_index) choose_var_name)
+
+[NEGFLAG] {7} <> NEGATIVE-FLAG($V, T) => (negative-rule $V (get-instance-name $V word_index sentence_index))
+
+[POSS1A] {8} <POSS1B, POSS2> _poss($N, $W) & pos($W, adj) => (possesive-rule $N (get-instance-name $N word_index sentence_index) $W (get-instance-name $W word_index sentence_index))
+
+[POSS1B] {8} <POSS1A, POSS2> _poss($N, $W) & pos($W, noun) & person-FLAG($W, T) => (possesive-rule $N (get-instance-name $N word_index sentence_index) $W (get-instance-name $W word_index sentence_index))
+
+[POSS2] {8} <POSS1A, POSS1B> _poss($N, $W) & pos($W, noun) => (possesive-rule $N (get-instance-name $V word_index sentence_index) $W (get-instance-name $W word_index sentence_index))
 
 [maybe] {9} <> _advmod($v1, $r_maybe) => (maybe-rule $v1 (get_instance_name $v1 word_index sentence_index) $r_maybe  )
\ No newline at end of file

=== modified file 'src/java/relex/RelationExtractor.java'
--- src/java/relex/RelationExtractor.java	2013-12-06 20:33:26 +0000
+++ src/java/relex/RelationExtractor.java	2013-12-19 15:38:25 +0000
@@ -718,7 +718,7 @@
 
 						System.out.println("\n======\n");
 						System.out.println("Relex2Logic output:");
-						System.out.println(logicView.printRelationsNew(parse));
+						System.out.println(logicView.printRelationsNew(parse).replaceAll("sentence_index", "(ParseNode " + parse.getIDString() + ")"));
 						System.out.println("\n======\n");
 					}
 

=== modified file 'src/java/relex/Server.java'
--- src/java/relex/Server.java	2013-12-10 19:43:22 +0000
+++ src/java/relex/Server.java	2013-12-19 15:38:25 +0000
@@ -29,6 +29,7 @@
 import relex.corpus.DocSplitter;
 import relex.corpus.DocSplitterFactory;
 import relex.output.SimpleView;
+import relex.output.LogicView;
 import relex.output.OpenCogScheme;
 import relex.Version;
 
@@ -57,10 +58,11 @@
 		int listen_port = 4444;
 		int max_parses = 1;
 		boolean relex_on = false;
+                boolean logic_on = false;
 		boolean link_on = false;
 		boolean anaphora_on = false;
 		boolean free_text = false;
-		boolean verbose = false;
+		boolean verbose = false;               
 		String lang = "en";
 		String host_name = null;
 		String usageString = "RelEx server (designed for OpenCog interaction).\n" +
@@ -72,6 +74,7 @@
 			" --lang lang\t Set langauge (default: en)\n" +
 			" -n number  \t Max number of parses to return (default: 1)\n" +
 			" --relex    \t Output RelEx relations (default)\n" +
+                        " --logic    \t Output of Relex2Logic scheme function calls and Relex relations" +
 			" --link     \t Output Link Grammar Linkages\n" +
 			" --anaphora \t Output anaphore references\n" +
 			" --free-text\t Don't assume one sentence per line; look for !?. to end sentence.\n" +
@@ -85,6 +88,7 @@
 		flags.add("--relex");
 		flags.add("--free-text");
 		flags.add("--verbose");
+                flags.add("--logic");
 		HashSet<String> opts = new HashSet<String>();
 		opts.add("-n");
 		opts.add("-p");
@@ -134,6 +138,11 @@
 		if (commandMap.get("--link") != null) link_on = true;
 		if (commandMap.get("--relex") != null) relex_on = true;
 		if (commandMap.get("--free-text") != null) free_text = true;
+                if (commandMap.get("--logic") != null)
+                {
+                    logic_on = true;
+                    relex_on = true;
+                }
 
 		if (commandMap.get("--verbose") != null)
 		{
@@ -167,6 +176,10 @@
 			System.err.println("Info: Link grammar output on.");
 			opencog.setShowLinkage(link_on);
 		}
+                if (logic_on)
+                {
+                    System.err.println("Info: Relex2Logic ouptut on");
+                }
 		if (relex_on)
 		{
 			System.err.println("Info: RelEx output on.");
@@ -344,8 +357,16 @@
 						}
 						opencog.setParse(parse);
 						out.println(opencog.toString());
+                                                
+                                                if (logic_on)
+                                                {
+                                                    LogicView logicView = new LogicView();
+                                                    logicView.loadRules();
+//                                                    out.println("scm");
+                                                    out.println(logicView.printRelationsNew(parse).replaceAll("sentence_index", parse.getSentence().getID()));
+                                                }
 						out.flush();
-						System.err.println("Info: sent parse " + pn + " of " + np);
+						System.err.println("Info: sent parse " + (pn + 1) + " of " + np);
 					}
 
 					// Add a special tag to tell the cog server that it's

=== modified file 'src/java/relex/logic/Criterium.java'
--- src/java/relex/logic/Criterium.java	2013-11-08 21:50:45 +0000
+++ src/java/relex/logic/Criterium.java	2013-12-19 15:38:25 +0000
@@ -43,6 +43,10 @@
 	 */
 	private HashMap<String, String> _variableValues = new HashMap<String, String>();
 	/**
+	 * Set to keep track of the UUID that criteria variables have been matched to.
+	 */
+	private HashMap<String, String> _variableValueUUIDs = new HashMap<String, String>();
+	/**
 	 * The original criterium string
 	 */
 	private String _criteriumString;
@@ -181,4 +185,36 @@
 
 		return variableValue;
 	}
+
+	/**
+	 * Sets the UUID of a variable value, once it is found in the dependency graph.
+	 * @param variableName The name of the variable that will have its value's UUID set.
+	 * @param variableValueUUID The UUID of the variable value.
+	 */
+	public void setVariableValueUUID(String variableName, String variableValueUUID)
+	{
+		if (_variableValueUUIDs.get(variableName) == null)
+		{
+			_variableValueUUIDs.put(variableName, variableValueUUID);
+		}
+		else
+		{
+			_variableValueUUIDs.put(variableName, variableValueUUID);
+		}
+	}
+
+	/**
+	 * Returns the value of a variable, used for retrieving variable values when writing the output of a rule.
+	 * @param variableName The name of the variable for which the value is to be retrieved.
+	 * @return
+	 */
+	public String getVariableValueUUID(String variableName)
+	{
+		String variableValueUUID = "";
+
+		if (_variableValueUUIDs.containsKey(variableName))
+			variableValueUUID = _variableValueUUIDs.get(variableName);
+
+		return variableValueUUID;
+	}
 }

=== modified file 'src/java/relex/logic/Rule.java'
--- src/java/relex/logic/Rule.java	2013-11-08 21:50:45 +0000
+++ src/java/relex/logic/Rule.java	2013-12-19 15:38:25 +0000
@@ -127,9 +127,13 @@
 		for (Criterium criterium : _criteria) {
 			for (String variableName : criterium.getVariables()) {
 				String variableValue = criterium.getVariableValue(variableName);
-
+                                String variableValueUUID = criterium.getVariableValueUUID(variableName);
+                                
 				schemeOutput = schemeOutput.replaceAll(
-						Pattern.quote(variableName), variableValue);
+                                Pattern.quote(variableName), variableValue);
+                                schemeOutput = schemeOutput.replaceAll(
+                                Pattern.quote("word_index"), variableValueUUID);
+                                
 			}
 		}
 

=== modified file 'src/java/relex/output/LogicProcessor.java'
--- src/java/relex/output/LogicProcessor.java	2013-12-19 12:14:59 +0000
+++ src/java/relex/output/LogicProcessor.java	2013-12-19 15:38:25 +0000
@@ -132,25 +132,42 @@
                                                                        }
                                                                         
 								String secondVariableName = ruleCriterium.getSecondVariableName();
+<<<<<<< TREE
                                                                	String secondVariableValue = foundNode.get("name").getValue();
                                                                 if (bVerboseMode)
 									System.out.println("I just recorded the value of '" + secondVariableName + "' to be '" + secondVariableValue + "'");
+=======
+								String secondVariableValue = foundNode.get("name").getValue();
+                                                                String secondVariableUUID = getNameSourceUUIDValue(foundNode);
+
+								if (bVerboseMode)
+									System.out.println("   I just recorded the value of '" + secondVariableName + "' to be '" + secondVariableValue + "'");
+>>>>>>> MERGE-SOURCE
 
 								String firstVariableName = ruleCriterium.getFirstVariableName();
+<<<<<<< TREE
                     						String firstVariableValue = getHeadNameValue(rootNode);
+=======
+								String firstVariableValue = getHeadNameValue(rootNode);
+                                                                String firstVariableUUID = getNameSourceUUIDValue(rootNode.get("head"));
+>>>>>>> MERGE-SOURCE
 
 								List<FeatureNode> suitableParents = findFeatureNodeByChildLinkName(rootNode, ruleCriterium.getCriteriumLabel(), null, null);
 
 								for (FeatureNode suitableParent : suitableParents)
 								{
 									firstVariableValue = suitableParent.get("name").getValue();
+                                                                        firstVariableUUID = suitableParent.get("nameSource").get("uuid").getValue();
+								
 								}
 
 								if (bVerboseMode)
 									System.out.println("I just recorded the value of '" + firstVariableName + "' to be '" + firstVariableValue + "'");
 
 								ruleCriterium.setVariableValue(firstVariableName, firstVariableValue);
+                                                                ruleCriterium.setVariableValueUUID(firstVariableName, firstVariableUUID);
 								ruleCriterium.setVariableValue(secondVariableName, secondVariableValue);
+                                                                ruleCriterium.setVariableValueUUID(secondVariableName, secondVariableUUID);
 							}
 						}
 						else
@@ -229,7 +246,7 @@
 
 			if (checkRuleApplicability(relexRule, rootNode, appliedRules))
 			{
-				applyRule(relexRule, schemeBuilder);
+				applyRule(relexRule, schemeBuilder);                           
 
 				appliedRules.add(relexRule.getName());
 			}
@@ -239,7 +256,7 @@
 	}
 
 	/**
-	 * Retries the value of the name feature of the head.
+	 * Returns the value of the name feature of the head.
 	 * @param rootNode The root of the dependency graph.
 	 * @return
 	 */
@@ -262,7 +279,30 @@
                 return headNameValue;
 	}
 
-
+        /**
+	 * Returns the value of the uuid feature of the nameSource Node.
+	 * @param rootNode The root of the dependency graph.
+	 * @return the uuid value
+	 */
+	private String getNameSourceUUIDValue(FeatureNode rootNode)
+	{
+		String uuidValue = "";
+
+		FeatureNode nameSourceNode = rootNode.get("nameSource");
+
+		if (nameSourceNode != null)
+		{
+			FeatureNode uuidNode = nameSourceNode.get("uuid");
+
+			if (uuidNode != null)
+			{
+				if (uuidNode.isValued())
+                                    uuidValue = uuidNode.getValue();
+			}
+		}
+		return uuidValue;
+	}
+       
 	/**
 	 * Finds a node based on it having a node within it's feature 'links' that matches childLinkName.
 	 * @param nodeToSearchThrough The FeatureNode from which to begin the search.