v1.5.1:

- Fixed inconsistencies in GeoQuery experiments.
- Release GeoQuery experiments with unification-based GENLEX. NOTE: these experiments don't re-create the results of Kwiatkowski et al. 2010/2011 as the implementation of GENLEX is different.
- Move version info outside of README and build.xml.

ChangeLog.md

@@ -1,3 +1,8 @@
+# v1.5.1
+- Fixed inconsistencies in GeoQuery experiments.
+- Release GeoQuery experiments with unification-based GENLEX. NOTE: these experiments don't re-create the results of Kwiatkowski et al. 2010/2011 as the implementation of GENLEX is different. 
+- Move version info outside of README and build.xml.
+
 # v1.5
 - Better support for closed and open ontologies
 	- Add option to allow using an ontology or not

README.html

@@ -157,7 +157,7 @@
   <div id="wrapper">
       <div style="float: right"><img src="http://yoavartzi.com/img/uw.png" height="120px" alt="UW logo" /></div>
 
-<h1 id="uwspfv1.5-theuniversityofwashingtonsemanticparsingframeworkv1.5"><a href="http://yoavartzi.com/spf"><em><strong>UW SPF v1.5</strong></em></a> - The University of Washington Semantic Parsing Framework v1.5</h1>
+<h1 id="uwspf-theuniversityofwashingtonsemanticparsingframework"><a href="http://yoavartzi.com/spf"><em><strong>UW SPF</strong></em></a> - The University of Washington Semantic Parsing Framework</h1>
 
 
 <ul style="display: block;" id="mkreplaced-toc" class="max-6"><li class="notmissing"><ul><li class="notmissing"><a href="#authors" class="wiki-link">Authors</a></li><li class="notmissing"><a href="#attribution" class="wiki-link">Attribution</a><ul><li class="notmissing"><a href="#validation-basedlearningjointinferenceandcoarse-to-finelexicalgeneration" class="wiki-link">Validation-based learning, joint inference and coarse-to-fine lexical generation</a></li><li class="notmissing"><a href="#loss-sensitivelearning" class="wiki-link">Loss-sensitive learning</a></li><li class="notmissing"><a href="#unification-basedgenlex" class="wiki-link">Unification-based GENLEX</a></li><li class="notmissing"><a href="#factoredlexicons" class="wiki-link">Factored lexicons</a></li><li class="notmissing"><a href="#template-basedgenlex" class="wiki-link">Template-based GENLEX</a></li></ul></li><li class="notmissing"><a href="#documentation" class="wiki-link">Documentation</a><ul><li class="notmissing"><a href="#building" class="wiki-link">Building</a></li><li class="notmissing"><a href="#runningexampleexperiments" class="wiki-link">Running example experiments</a></li><li class="notmissing"><a href="#workingwiththecode" class="wiki-link">Working with the Code</a></li><li class="notmissing"><a href="#gettingtoknowthecode" class="wiki-link">Getting to Know the Code</a></li><li class="notmissing"><a href="#logginginspf" class="wiki-link">Logging in SPF</a></li><li class="notmissing"><a href="#explat" class="wiki-link">ExPlat</a><ul><li class="notmissing"><a href="#globalparameters" class="wiki-link">Global Parameters</a></li><li class="notmissing"><a href="#resources" class="wiki-link">Resources</a></li><li class="notmissing"><a href="#jobs" class="wiki-link">Jobs</a></li></ul></li><li class="notmissing"><a href="#workingwithlogicalexpressions" class="wiki-link">Working with Logical Expressions</a></li><li class="notmissing"><a href="#combinatorycategorialgrammarsccgsinspf" class="wiki-link">Combinatory Categorial Grammars (CCGs) in SPF</a><ul><li class="notmissing"><a href="#basicoperationsoncategories" class="wiki-link">Basic Operations on Categories</a></li></ul></li><li class="notmissing"><a href="#troubleshooting" class="wiki-link">Troubleshooting</a></li></ul></li><li class="notmissing"><a href="#publicationsandprojectsusingspf" class="wiki-link">Publications and Projects Using SPF</a></li><li class="notmissing"><a href="#acknowledgements" class="wiki-link">Acknowledgements</a></li><li class="notmissing"><a href="#license" class="wiki-link">License</a></li></ul></li></ul>
@@ -342,4 +342,4 @@ <h2 id="license">License</h2>
 <!-- ##END MARKED WRAPPER## -->
     </div>
 </body>
-</html>
+</html>

README.md

@@ -5,7 +5,7 @@ Web: http://yoavartzi.com
 
 <div style="float: right"><img src="http://yoavartzi.com/img/uw.png" height="120px" alt="UW logo" /></div>
 
-# [_**UW SPF v1.5**_](http://yoavartzi.com/spf) - The University of Washington Semantic Parsing Framework v1.5 
+# [_**UW SPF**_](http://yoavartzi.com/spf) - The University of Washington Semantic Parsing Framework 
 
 [TOC]
 

VERSION

@@ -0,0 +1 @@
+1.5.1

build.properties

@@ -35,3 +35,4 @@ src.genlex.ccg.template = genlex.ccg.template/src
 src.genlex.ccg.unification = genlex.ccg.unification/src
 src.geoquery=geoquery/src
 mainclass=edu.uw.cs.lil.tiny.geoquery.GeoMain
+version=1.5.1

build.xml

@@ -4,7 +4,6 @@
     </description>
 	<!-- set global properties for this build -->
 	<property file="build.properties" />
-	<property name="version" value="1.5" />
 	<property name="build" location="build" />
 	<property name="build.src" location="build.src" />
 	<property name="dist" location="dist" />

geoquery/experiments/data/fold0.ccg

@@ -1,11 +1,11 @@
 how large is the largest city in alaska
-(size:<lo,i> (argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (loc:<lo,<lo,t>> $0 alaska:s))) (lambda $0:e (size:<lo,i> $0))))
+(size:<lo,i> (argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (loc:<lo,<lo,t>> $0 alaska:s))) (lambda $1:e (size:<lo,i> $1))))
 
 what is the largest city in wisconsin
-(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (loc:<lo,<lo,t>> $0 wisconsin:s))) (lambda $0:e (size:<lo,i> $0)))
+(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (loc:<lo,<lo,t>> $0 wisconsin:s))) (lambda $1:e (size:<lo,i> $1)))
 
 what are the highest points of states surrounding mississippi
-(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (place:<p,t> $0) (exists:<<e,t>,t> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (next_to:<lo,<lo,t>> $1 mississippi:s) (loc:<lo,<lo,t>> $0 $1)))))) (lambda $0:e (elevation:<lo,i> $0)))
+(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (place:<p,t> $0) (exists:<<e,t>,t> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (next_to:<lo,<lo,t>> $1 mississippi:s) (loc:<lo,<lo,t>> $0 $1)))))) (lambda $2:e (elevation:<lo,i> $2)))
 
 which states border hawaii
 (lambda $0:e (and:<t*,t> (state:<s,t> $0) (next_to:<lo,<lo,t>> $0 hawaii:s)))
@@ -32,7 +32,7 @@ how many cities are in louisiana
 (count:<<e,t>,i> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (loc:<lo,<lo,t>> $0 louisiana:s))))
 
 what is the largest state in the us
-(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (state:<s,t> $0) (loc:<lo,<lo,t>> $0 usa:co))) (lambda $0:e (size:<lo,i> $0)))
+(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (state:<s,t> $0) (loc:<lo,<lo,t>> $0 usa:co))) (lambda $1:e (size:<lo,i> $1)))
 
 how many rivers are in new york
 (count:<<e,t>,i> (lambda $0:e (and:<t*,t> (river:<r,t> $0) (loc:<lo,<lo,t>> $0 new_york:s))))
@@ -47,10 +47,10 @@ which states border iowa
 (lambda $0:e (and:<t*,t> (state:<s,t> $0) (next_to:<lo,<lo,t>> $0 iowa:s)))
 
 what is the shortest river in nebraska
-(argmin:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (river:<r,t> $0) (loc:<lo,<lo,t>> $0 nebraska:s))) (lambda $0:e (len:<r,i> $0)))
+(argmin:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (river:<r,t> $0) (loc:<lo,<lo,t>> $0 nebraska:s))) (lambda $1:e (len:<r,i> $1)))
 
 what state has the least population density
-(argmin:<<e,t>,<<e,i>,e>> (lambda $0:e (state:<s,t> $0)) (lambda $0:e (density:<lo,i> $0)))
+(argmin:<<e,t>,<<e,i>,e>> (lambda $0:e (state:<s,t> $0)) (lambda $1:e (density:<lo,i> $1)))
 
 how many states does the missouri river run through
 (count:<<e,t>,i> (lambda $0:e (and:<t*,t> (state:<s,t> $0) (loc:<lo,<lo,t>> missouri_river:r $0))))
@@ -59,7 +59,7 @@ what states border states that border states that border states that border texa
 (lambda $0:e (and:<t*,t> (state:<s,t> $0) (exists:<<e,t>,t> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (next_to:<lo,<lo,t>> $0 $1) (exists:<<e,t>,t> (lambda $2:e (and:<t*,t> (state:<s,t> $2) (next_to:<lo,<lo,t>> $1 $2) (exists:<<e,t>,t> (lambda $3:e (and:<t*,t> (state:<s,t> $3) (next_to:<lo,<lo,t>> $3 texas:s) (next_to:<lo,<lo,t>> $2 $3))))))))))))
 
 what state borders the least states
-(argmin:<<e,t>,<<e,i>,e>> (lambda $0:e (state:<s,t> $0)) (lambda $0:e (count:<<e,t>,i> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (next_to:<lo,<lo,t>> $0 $1))))))
+(argmin:<<e,t>,<<e,i>,e>> (lambda $0:e (state:<s,t> $0)) (lambda $1:e (count:<<e,t>,i> (lambda $2:e (and:<t*,t> (state:<s,t> $2) (next_to:<lo,<lo,t>> $1 $2))))))
 
 what is the area of seattle
 (area:<lo,i> seattle_wa:c)
@@ -74,16 +74,16 @@ what are the major cities in rhode island
 (lambda $0:e (and:<t*,t> (major:<lo,t> $0) (city:<c,t> $0) (loc:<lo,<lo,t>> $0 rhode_island:s)))
 
 what is the biggest city in wyoming
-(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (loc:<lo,<lo,t>> $0 wyoming:s))) (lambda $0:e (size:<lo,i> $0)))
+(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (loc:<lo,<lo,t>> $0 wyoming:s))) (lambda $1:e (size:<lo,i> $1)))
 
 what are the populations of the states through which the mississippi river run
-(lambda $0:i (exists:<<e,t>,t> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (loc:<lo,<lo,t>> mississippi_river:r $1) (population:<lo,<i,t>> $1 $0)))))
+(lambda $0:e (exists:<<e,t>,t> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (loc:<lo,<lo,t>> mississippi_river:r $1) (population:<lo,<i,t>> $1 $0)))))
 
 what is the density of texas
 (density:<lo,i> texas:s)
 
 what is the population density of the state with the smallest area
-(density:<lo,i> (argmin:<<e,t>,<<e,i>,e>> (lambda $0:e (state:<s,t> $0)) (lambda $0:e (area:<lo,i> $0))))
+(density:<lo,i> (argmin:<<e,t>,<<e,i>,e>> (lambda $0:e (state:<s,t> $0)) (lambda $1:e (area:<lo,i> $1))))
 
 what rivers flow through missouri
 (lambda $0:e (and:<t*,t> (river:<r,t> $0) (loc:<lo,<lo,t>> $0 missouri:s)))
@@ -95,28 +95,28 @@ what states border arkansas
 (lambda $0:e (and:<t*,t> (state:<s,t> $0) (next_to:<lo,<lo,t>> $0 arkansas:s)))
 
 which state contains most rivers
-(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (state:<s,t> $0)) (lambda $0:e (count:<<e,t>,i> (lambda $1:e (and:<t*,t> (river:<r,t> $1) (loc:<lo,<lo,t>> $1 $0))))))
+(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (state:<s,t> $0)) (lambda $1:e (count:<<e,t>,i> (lambda $2:e (and:<t*,t> (river:<r,t> $2) (loc:<lo,<lo,t>> $2 $1))))))
 
 what is the largest city in michigan
-(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (loc:<lo,<lo,t>> $0 michigan:s))) (lambda $0:e (size:<lo,i> $0)))
+(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (loc:<lo,<lo,t>> $0 michigan:s))) (lambda $1:e (size:<lo,i> $1)))
 
 how many states border the mississippi river
 (count:<<e,t>,i> (lambda $0:e (and:<t*,t> (state:<s,t> $0) (next_to:<lo,<lo,t>> $0 mississippi_river:r))))
 
 what is the smallest city in the largest state
-(argmin:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (loc:<lo,<lo,t>> $0 (argmax:<<e,t>,<<e,i>,e>> (lambda $1:e (state:<s,t> $1)) (lambda $1:e (size:<lo,i> $1)))))) (lambda $0:e (size:<lo,i> $0)))
+(argmin:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (loc:<lo,<lo,t>> $0 (argmax:<<e,t>,<<e,i>,e>> (lambda $1:e (state:<s,t> $1)) (lambda $2:e (size:<lo,i> $2)))))) (lambda $3:e (size:<lo,i> $3)))
 
 what is the most populated state bordering oklahoma
-(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (state:<s,t> $0) (next_to:<lo,<lo,t>> $0 oklahoma:s))) (lambda $0:e (population:<lo,i> $0)))
+(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (state:<s,t> $0) (next_to:<lo,<lo,t>> $0 oklahoma:s))) (lambda $1:e (population:<lo,i> $1)))
 
 what is the area of maine
 (area:<lo,i> maine:s)
 
 what are the major cities in the smallest state in the us
-(lambda $0:e (and:<t*,t> (major:<lo,t> $0) (city:<c,t> $0) (loc:<lo,<lo,t>> $0 (argmin:<<e,t>,<<e,i>,e>> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (loc:<lo,<lo,t>> $1 usa:co))) (lambda $1:e (size:<lo,i> $1))))))
+(lambda $0:e (and:<t*,t> (major:<lo,t> $0) (city:<c,t> $0) (loc:<lo,<lo,t>> $0 (argmin:<<e,t>,<<e,i>,e>> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (loc:<lo,<lo,t>> $1 usa:co))) (lambda $2:e (size:<lo,i> $2))))))
 
 what city has the largest population
-(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (city:<c,t> $0)) (lambda $0:e (population:<lo,i> $0)))
+(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (city:<c,t> $0)) (lambda $1:e (population:<lo,i> $1)))
 
 what is the population of minnesota
 (population:<lo,i> minnesota:s)
@@ -134,10 +134,10 @@ what rivers run through the states that border the state with the capital atlant
 (lambda $0:e (and:<t*,t> (river:<r,t> $0) (exists:<<e,t>,t> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (loc:<lo,<lo,t>> $0 $1) (next_to:<lo,<lo,t>> $1 (the:<<e,t>,e> (lambda $2:e (and:<t*,t> (state:<s,t> $2) (capital2:<s,<c,t>> $2 atlanta_ga:c))))))))))
 
 what is the length of the longest river in the usa
-(len:<r,i> (argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (river:<r,t> $0) (loc:<lo,<lo,t>> $0 usa:co))) (lambda $0:e (len:<r,i> $0))))
+(len:<r,i> (argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (river:<r,t> $0) (loc:<lo,<lo,t>> $0 usa:co))) (lambda $1:e (len:<r,i> $1))))
 
 what is the largest city in a state that borders texas
-(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (exists:<<e,t>,t> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (next_to:<lo,<lo,t>> $1 texas:s) (loc:<lo,<lo,t>> $0 $1)))))) (lambda $0:e (size:<lo,i> $0)))
+(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (exists:<<e,t>,t> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (next_to:<lo,<lo,t>> $1 texas:s) (loc:<lo,<lo,t>> $0 $1)))))) (lambda $2:e (size:<lo,i> $2)))
 
 what rivers are in utah
 (lambda $0:e (and:<t*,t> (river:<r,t> $0) (loc:<lo,<lo,t>> $0 utah:s)))
@@ -146,7 +146,7 @@ how many rivers are there in us
 (count:<<e,t>,i> (lambda $0:e (and:<t*,t> (river:<r,t> $0) (loc:<lo,<lo,t>> $0 usa:co))))
 
 what is the area of the largest state
-(area:<lo,i> (argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (state:<s,t> $0)) (lambda $0:e (size:<lo,i> $0))))
+(area:<lo,i> (argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (state:<s,t> $0)) (lambda $1:e (size:<lo,i> $1))))
 
 how many rivers in washington
 (count:<<e,t>,i> (lambda $0:e (and:<t*,t> (river:<r,t> $0) (loc:<lo,<lo,t>> $0 washington:s))))
@@ -155,7 +155,7 @@ what are the major cities in texas
 (lambda $0:e (and:<t*,t> (major:<lo,t> $0) (city:<c,t> $0) (loc:<lo,<lo,t>> $0 texas:s)))
 
 what is the largest city in states that border california
-(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (exists:<<e,t>,t> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (next_to:<lo,<lo,t>> $1 california:s) (loc:<lo,<lo,t>> $0 $1)))))) (lambda $0:e (size:<lo,i> $0)))
+(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (and:<t*,t> (city:<c,t> $0) (exists:<<e,t>,t> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (next_to:<lo,<lo,t>> $1 california:s) (loc:<lo,<lo,t>> $0 $1)))))) (lambda $2:e (size:<lo,i> $2)))
 
 how many states does missouri border
 (count:<<e,t>,i> (lambda $0:e (and:<t*,t> (state:<s,t> $0) (next_to:<lo,<lo,t>> missouri:s $0))))
@@ -170,10 +170,10 @@ how many rivers are in missouri
 (count:<<e,t>,i> (lambda $0:e (and:<t*,t> (river:<r,t> $0) (loc:<lo,<lo,t>> $0 missouri:s))))
 
 which state borders most states
-(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (state:<s,t> $0)) (lambda $0:e (count:<<e,t>,i> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (next_to:<lo,<lo,t>> $0 $1))))))
+(argmax:<<e,t>,<<e,i>,e>> (lambda $0:e (state:<s,t> $0)) (lambda $1:e (count:<<e,t>,i> (lambda $2:e (and:<t*,t> (state:<s,t> $2) (next_to:<lo,<lo,t>> $1 $2))))))
 
 what are the populations of the states through which the mississippi run
-(lambda $0:i (exists:<<e,t>,t> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (loc:<lo,<lo,t>> mississippi_river:r $1) (population:<lo,<i,t>> $1 $0)))))
+(lambda $0:e (exists:<<e,t>,t> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (loc:<lo,<lo,t>> mississippi_river:r $1) (population:<lo,<i,t>> $1 $0)))))
 
 what are the high points of states surrounding mississippi
 (lambda $0:e (exists:<<e,t>,t> (lambda $1:e (and:<t*,t> (state:<s,t> $1) (next_to:<lo,<lo,t>> $1 mississippi:s) (high_point:<e,<e,t>> $1 $0)))))