trill_on_swish/commit

added property_value query

authorrzese
Mon Aug 1 14:15:13 2016 +0200
committerrzese
Mon Aug 1 14:15:13 2016 +0200
commitf3ab0c481115417a1e991038f64d457b03ea56d1
tree0ff6a9344d804c8d60a7e04155ca418ffa88521b
parentcbfed62b0bcacf477106f802e83b20b3faa5782c
Diff style: patch stat
diff --git a/Makefile b/Makefile
index bc648fe..519a7c1 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,8 @@ FONTFILES=glyphicons-halflings-regular.ttf \
 FONTS=$(addprefix $(FONTDIR)/, $(FONTFILES))
 CLIENTFILES=swish-ask.sh README.md sin-table.html
 CLIENTS=$(addprefix client/, $(CLIENTFILES))
-EXAMPLESFILES=biopaxLevel3.pl BRCA.pl DBPedia.pl examples.swinb \
-              peoplePets.pl vicodi.pl commander.pl johnEmployee.pl index.json
+EXAMPLESFILES=trill/biopaxLevel3.pl trill/BRCA.pl trill/DBPedia.pl trill/examples_trill.swinb \
+              trill/peoplePets.pl trill/vicodi.pl trill/commander.pl trill/johnEmployee.pl index.json
 EXAMPLES=$(addprefix examples/, $(EXAMPLESFILES))
 PROFILESFILES=00-Empty.pl 00-Empty.swinb 10-Empty-TRILL.pl 10-Empty-TRILL.swinb \
               20-Non-Probabilistic-TRILL.pl 20-Non-Probabilistic-TRILL.swinb \
diff --git a/lib/trill_on_swish/template_hint.pl b/lib/trill_on_swish/template_hint.pl
index 8a53388..4beb94a 100644
--- a/lib/trill_on_swish/template_hint.pl
+++ b/lib/trill_on_swish/template_hint.pl
@@ -339,42 +339,52 @@ rendering_template([ /*json{displayText:  "use_rendering(+Renderer).",
 			  varTemplates: json{'Renderer': Template}}*/
 		     json{displayText:  "prob_instanceOf(+Class, +Individual, -Prob).",
  			  type:         "directive",
-			  template:     "prob_instanceOf(${Class},${Individual},${Prob}).",
+			  template:     "prob_instanceOf(${Class},${Individual},Prob).",
+ 			  varTemplates: json{'Renderer': Template}},
+			  
+		     json{displayText:  "prob_property_value(+Property, +Individual1, +Individual2, -Prob).",
+ 			  type:         "directive",
+			  template:     "prob_property_value(${Class},${Individual1},${Individual2},Prob).",
  			  varTemplates: json{'Renderer': Template}},
 			  
 		     json{displayText:  "prob_sub_class(+Class1, +Class2, -Prob).",
  			  type:         "directive",
-			  template:     "prob_sub_class(${Class1},${Class2},${Prob}).",
+			  template:     "prob_sub_class(${Class1},${Class2},Prob).",
 			  varTemplates: json{'Renderer': Template}},
 
 		     json{displayText:  "prob_unsat(+ClassExpression, -Prob).",
 			  type:         "directive",
-			  template:     "prob_unsat(${ClassExpression},${Prob}).",
+			  template:     "prob_unsat(${ClassExpression},Prob).",
 			  varTemplates: json{'Renderer': Template}},
 		 
 		     json{displayText:  "prob_inconsistent_theory(-Prob).",
 			  type:         "directive",
-			  template:     "prob_inconsistent_theory(${Prob}).",
+			  template:     "prob_inconsistent_theory(Prob).",
 			  varTemplates: json{'Renderer': Template}},
 		
 		     json{displayText:  "instanceOf(+Class, +Individual, -Expl).",
  			  type:         "directive",
-			  template:     "instanceOf(${Class},${Individual},${Expl}).",
+			  template:     "instanceOf(${Class},${Individual},Expl).",
+ 			  varTemplates: json{'Renderer': Template}},
+			  
+		     json{displayText:  "property_value(+Property, +Individual1, +Individual2, -Expl).",
+ 			  type:         "directive",
+			  template:     "property_value(${Class},${Individual1},${Individual2},Expl).",
  			  varTemplates: json{'Renderer': Template}},
 			  
 		     json{displayText:  "sub_class(+Class1, +Class2, -Expl).",
  			  type:         "directive",
-			  template:     "sub_class(${Class1},${Class2},${Expl}).",
+			  template:     "sub_class(${Class1},${Class2},Expl).",
 			  varTemplates: json{'Renderer': Template}},
 
 		     json{displayText:  "unsat(+ClassExpression, -Expl).",
 			  type:         "directive",
-			  template:     "unsat(${ClassExpression},${Expl}).",
+			  template:     "unsat(${ClassExpression},Expl).",
 			  varTemplates: json{'Renderer': Template}},
 			  
 		     json{displayText:  "inconsistent_theory(-Expl).",
 			  type:         "directive",
-			  template:     "inconsistent_theory(${Expl}).",
+			  template:     "inconsistent_theory(Expl).",
 			  varTemplates: json{'Renderer': Template}},
 		     
 		     json{displayText:  "instanceOf(+Class, +Individual).",
@@ -382,6 +392,11 @@ rendering_template([ /*json{displayText:  "use_rendering(+Renderer).",
 			  template:     "instanceOf(${Class},${Individual}).",
  			  varTemplates: json{'Renderer': Template}},
 			  
+		     json{displayText:  "property_value(+Property, +Individual1, +Individual2).",
+ 			  type:         "directive",
+			  template:     "property_value(${Class},${Individual1},${Individual2}).",
+ 			  varTemplates: json{'Renderer': Template}},
+			  
 		     json{displayText:  "sub_class(+Class1, +Class2).",
  			  type:         "directive",
 			  template:     "sub_class(${Class1},${Class2}).",
diff --git a/src b/src
index 42af397..0052064 160000
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 42af39754318fad03256ca2ef297f4247bf45b39
+Subproject commit 005206422e9dfd1f962d1bc1e68343da8d6de355