Permalink
Browse files

Update for SPF 1.4

  • Loading branch information...
Yoav Artzi
Yoav Artzi committed Sep 3, 2013
1 parent 2e5d278 commit 9ce466a95dddc50cbcaa1fdae3abbaecbda5088e
Showing with 45,271 additions and 23,797 deletions.
  1. +2 −2 README.md
  2. +1 −1 build.properties
  3. +2 −1 build.xml
  4. +33 −0 experiments/default.include.data.exp
  5. +1 −1 experiments/default.include.genlex.exp
  6. +1 −1 experiments/default.include.jobs.exp
  7. +2 −1 experiments/default.include.learn.exp
  8. +3 −0 experiments/default.include.maps.exp
  9. +1 −3 experiments/default.include.model.exp
  10. +18 −0 experiments/default.include.parser.exp
  11. +7 −0 experiments/default.include.resources.exp
  12. +3 −0 experiments/default.include.validation.exp
  13. +2 −2 experiments/default.params
  14. +5 −6 experiments/dev.abimp.cross/dev.fold0.exp
  15. +6 −7 experiments/dev.abimp.cross/dev.fold1.exp
  16. +6 −7 experiments/dev.abimp.cross/dev.fold2.exp
  17. +6 −7 experiments/dev.abimp.cross/dev.fold3.exp
  18. +6 −7 experiments/dev.abimp.cross/dev.fold4.exp
  19. +0 −8 experiments/dev.abimp.cross/dev.include.data.exp
  20. +0 −923 experiments/dev.cross/data/fold0.settrc
  21. +0 −1,416 experiments/dev.cross/data/fold1.ccgsettrc
  22. +0 −1,009 experiments/dev.cross/data/fold1.settrc
  23. +0 −1,260 experiments/dev.cross/data/fold2.ccgsettrc
  24. +0 −905 experiments/dev.cross/data/fold2.settrc
  25. +0 −1,206 experiments/dev.cross/data/fold3.ccgsettrc
  26. +0 −869 experiments/dev.cross/data/fold3.settrc
  27. +0 −1,224 experiments/dev.cross/data/fold4.ccgsettrc
  28. +0 −881 experiments/dev.cross/data/fold4.settrc
  29. +0 −207 experiments/dev.cross/data/lfs.ccgsettrc
  30. +0 −12 experiments/dev.cross/data/lfs.ids
  31. +5 −6 experiments/dev.cross/dev.fold0.exp
  32. +5 −6 experiments/dev.cross/dev.fold1.exp
  33. +5 −6 experiments/dev.cross/dev.fold2.exp
  34. +5 −6 experiments/dev.cross/dev.fold3.exp
  35. +5 −6 experiments/dev.cross/dev.fold4.exp
  36. +0 −8 experiments/dev.cross/dev.include.data.exp
  37. +5 −6 experiments/eval.chen.cross/fold-grid.exp
  38. +5 −5 experiments/eval.chen.cross/fold-jelly.exp
  39. +5 −5 experiments/eval.chen.cross/fold-l.exp
  40. +0 −19 experiments/eval.chen.cross/include.data.exp
  41. +0 −369 experiments/eval/data/eval.lf.ccgsettrc
  42. +0 −6,600 experiments/eval/data/train.ccgsettrc
  43. +0 −4,737 experiments/eval/data/train.settrc
  44. +5 −8 experiments/eval/eval.exp
  45. BIN lib/{spf-1.2.jar → spf-1.4.jar}
  46. +1 −2 navi/.classpath
  47. +1 −1 navi/src-test/edu/uw/cs/lil/navi/data/LabeledInstructionSetTraceDatasetTest.java
  48. +1 −1 navi/src-test/edu/uw/cs/lil/navi/data/LabeledSingleTraceDatasetTest.java
  49. +7 −12 navi/src-test/edu/uw/cs/lil/navi/eval/NaviEvalTestingConstants.java
  50. +2 −2 navi/src-test/edu/uw/cs/lil/navi/eval/NaviSingleEvaluatorTest.java
  51. +25 −15 navi/src/edu/uw/cs/lil/navi/agent/Action.java
  52. +11 −1 navi/src/edu/uw/cs/lil/navi/agent/Direction.java
  53. +6 −12 navi/src/edu/uw/cs/lil/navi/data/InstructionSeqTrace.java
  54. +3 −12 navi/src/edu/uw/cs/lil/navi/data/InstructionSeqTraceDataset.java
  55. +11 −29 navi/src/edu/uw/cs/lil/navi/data/InstructionTrace.java
  56. +3 −12 navi/src/edu/uw/cs/lil/navi/data/InstructionTraceDataset.java
  57. +4 −10 navi/src/edu/uw/cs/lil/navi/data/LabeledInstructionSeqTrace.java
  58. +2 −10 navi/src/edu/uw/cs/lil/navi/data/LabeledInstructionSeqTraceDataset.java
  59. +13 −29 navi/src/edu/uw/cs/lil/navi/data/LabeledInstructionTrace.java
  60. +3 −12 navi/src/edu/uw/cs/lil/navi/data/LabeledInstructionTraceDataset.java
  61. +2 −3 navi/src/edu/uw/cs/lil/navi/eval/NaviEvaluation.java
  62. +69 −13 navi/src/edu/uw/cs/lil/navi/eval/NaviEvaluationConstants.java
  63. +3 −1 navi/src/edu/uw/cs/lil/navi/eval/NaviEvaluationServicesFactory.java
  64. +2 −1 navi/src/edu/uw/cs/lil/navi/eval/NaviSingleEvaluator.java
  65. +3 −8 navi/src/edu/uw/cs/lil/navi/eval/StatefulWrapping.java
  66. +3 −7 navi/src/edu/uw/cs/lil/navi/eval/XPositionWrap.java
  67. +3 −1 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/INaviLiteralEvaluator.java
  68. +2 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/NaviInvariantLiteralEvaluator.java
  69. +2 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/actions/ActionPrePosition.java
  70. +2 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/actions/ActionPreState.java
  71. +2 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/actions/ActionTo.java
  72. +1 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/actions/ActionType.java
  73. +2 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/actions/ActionWhile.java
  74. +2 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/positions/functions/PositionSetAgentDistance.java
  75. +2 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/positions/functions/PositionSetFrontDistance.java
  76. +2 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/positions/functions/PositionSetOrient.java
  77. +1 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/positions/functions/PositionSetType.java
  78. +2 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/positions/relations/PositionSetDistance.java
  79. +2 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/positions/relations/PositionSetEnd.java
  80. +2 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/positions/relations/PositionSetFront.java
  81. +2 −0 navi/src/edu/uw/cs/lil/navi/eval/literalevaluators/positions/relations/PositionSetMiddle.java
  82. +2 −5 navi/src/edu/uw/cs/lil/navi/eval/splitter/ExtractSingleAction.java
  83. +4 −4 navi/src/edu/uw/cs/lil/navi/exec/NaviNaiveSeqExecutor.java
  84. +8 −8 navi/src/edu/uw/cs/lil/navi/exec/NaviSeqExecutor.java
  85. +9 −7 navi/src/edu/uw/cs/lil/navi/exec/NaviSetExecution.java
  86. +2 −1 navi/src/edu/uw/cs/lil/navi/exec/NaviSetExecutionOutput.java
  87. +4 −4 navi/src/edu/uw/cs/lil/navi/exec/NaviSingleExecutor.java
  88. +8 −1 navi/src/edu/uw/cs/lil/navi/experiments/{NaviGeneric.java → NaviMain.java}
  89. +93 −182 navi/src/edu/uw/cs/lil/navi/experiments/plat/NaviExperiment.java
  90. +47 −12 navi/src/edu/uw/cs/lil/navi/experiments/plat/NaviResourceCreatorRepository.java
  91. +16 −14 navi/src/edu/uw/cs/lil/navi/experiments/plat/resources/InstructionSeqTraceDatasetCreator.java
  92. +15 −14 navi/src/edu/uw/cs/lil/navi/experiments/plat/resources/InstructionTraceDatasetCreator.java
  93. +18 −14 navi/src/edu/uw/cs/lil/navi/experiments/plat/resources/LabeledInstructionSeqTraceDatasetCreator.java
  94. +20 −16 navi/src/edu/uw/cs/lil/navi/experiments/plat/resources/LabeledInstructionTraceDatasetCreator.java
  95. +15 −18 .../uw/cs/lil/navi/experiments/plat/resources/NaviJointTemplatedAbstractLexiconGeneratorCreator.java
  96. +4 −4 navi/src/edu/uw/cs/lil/navi/experiments/plat/resources/NaviLearningRelaxedValidatorCreator.java
  97. +4 −4 navi/src/edu/uw/cs/lil/navi/experiments/plat/resources/NaviLearningValidatorCreator.java
  98. +4 −4 navi/src/edu/uw/cs/lil/navi/experiments/plat/resources/NaviLearningWeakValidatorCreator.java
  99. +3 −1 navi/src/edu/uw/cs/lil/navi/experiments/plat/resources/NaviNaiveSeqExecutorCreator.java
  100. +11 −7 navi/src/edu/uw/cs/lil/navi/experiments/plat/resources/NaviPairValidatorWrapperCreator.java
  101. +3 −1 navi/src/edu/uw/cs/lil/navi/experiments/plat/resources/NaviSeqExecutorCreator.java
  102. +3 −1 navi/src/edu/uw/cs/lil/navi/experiments/plat/resources/NaviSingleExecutorCreator.java
  103. +5 −7 ...c/edu/uw/cs/lil/navi/experiments/plat/resources/NaviTemplatedAbstractLexiconGeneratorCreator.java
  104. +5 −4 navi/src/edu/uw/cs/lil/navi/experiments/plat/resources/ReptFeaturesInitCreator.java
  105. +52 −14 navi/src/edu/uw/cs/lil/navi/features/ExecutionFeatureSet.java
  106. +4 −2 navi/src/edu/uw/cs/lil/navi/features/init/ReptFeaturesInit.java
  107. +11 −12 navi/src/edu/uw/cs/lil/navi/learn/lexicalgen/NaviJointTemplatedAbstractLexiconGenerator.java
  108. +3 −6 navi/src/edu/uw/cs/lil/navi/learn/lexicalgen/NaviTemplatedAbstractLexiconGenerator.java
  109. +0 −36 navi/src/edu/uw/cs/lil/navi/learn/validation/INaviValidator.java
  110. +6 −21 navi/src/edu/uw/cs/lil/navi/learn/validation/NaviLearningRelaxedValidator.java
  111. +8 −24 navi/src/edu/uw/cs/lil/navi/learn/validation/NaviLearningValidator.java
  112. +6 −23 navi/src/edu/uw/cs/lil/navi/learn/validation/NaviLearningWeakValidator.java
  113. +10 −35 navi/src/edu/uw/cs/lil/navi/learn/validation/NaviPairValidatorWrapper.java
  114. +40 −0 navi/src/edu/uw/cs/lil/navi/map/NavigationMap.java
  115. +50 −0 navi/src/edu/uw/cs/lil/navi/parse/NaviGraphParser.java
  116. +56 −47 navi/src/edu/uw/cs/lil/navi/test/stats/FinalCoordinatesTestStatistics.java
  117. +44 −43 navi/src/edu/uw/cs/lil/navi/test/stats/FinalPositionTestStatistics.java
  118. +78 −23 navi/src/edu/uw/cs/lil/navi/test/stats/LogicalFormSentenceTestStatistics.java
  119. +41 −32 navi/src/edu/uw/cs/lil/navi/test/stats/LogicalFormTestStatistics.java
  120. +41 −36 navi/src/edu/uw/cs/lil/navi/test/stats/TraceTestStatistics.java
  121. +162 −0 navi/src/edu/uw/cs/lil/navi/test/stats/set/AbstractSetTestStatistics.java
  122. +19 −112 navi/src/edu/uw/cs/lil/navi/test/stats/set/SetFinalCoordinatesTestStatistics.java
  123. +19 −113 navi/src/edu/uw/cs/lil/navi/test/stats/set/SetGoalCoordinatesTestStatistics.java
  124. +58 −44 navi/src/edu/uw/cs/lil/navi/test/stats/set/SetLogicalFormTestStatistics.java
  125. +1,212 −0 resources/data/dev/extra.shuffles/1/fold0.ccgsettrc
  126. +873 −0 resources/data/dev/extra.shuffles/1/fold0.settrc
  127. +1,413 −0 resources/data/dev/extra.shuffles/1/fold1.ccgsettrc
  128. +1,007 −0 resources/data/dev/extra.shuffles/1/fold1.settrc
  129. +1,203 −0 resources/data/dev/extra.shuffles/1/fold2.ccgsettrc
  130. +867 −0 resources/data/dev/extra.shuffles/1/fold2.settrc
  131. +1,344 −0 resources/data/dev/extra.shuffles/1/fold3.ccgsettrc
  132. +961 −0 resources/data/dev/extra.shuffles/1/fold3.settrc
  133. +1,221 −0 resources/data/dev/extra.shuffles/1/fold4.ccgsettrc
  134. +879 −0 resources/data/dev/extra.shuffles/1/fold4.settrc
  135. +1,374 −0 resources/data/dev/extra.shuffles/2/fold0.ccgsettrc
  136. +981 −0 resources/data/dev/extra.shuffles/2/fold0.settrc
  137. +1,215 −0 resources/data/dev/extra.shuffles/2/fold1.ccgsettrc
  138. +875 −0 resources/data/dev/extra.shuffles/2/fold1.settrc
  139. +1,314 −0 resources/data/dev/extra.shuffles/2/fold2.ccgsettrc
  140. +941 −0 resources/data/dev/extra.shuffles/2/fold2.settrc
  141. +1,098 −0 resources/data/dev/extra.shuffles/2/fold3.ccgsettrc
  142. +797 −0 resources/data/dev/extra.shuffles/2/fold3.settrc
  143. +1,392 −0 resources/data/dev/extra.shuffles/2/fold4.ccgsettrc
  144. +993 −0 resources/data/dev/extra.shuffles/2/fold4.settrc
  145. +1,365 −0 resources/data/dev/extra.shuffles/3/fold0.ccgsettrc
  146. +975 −0 resources/data/dev/extra.shuffles/3/fold0.settrc
  147. +1,365 −0 resources/data/dev/extra.shuffles/3/fold1.ccgsettrc
  148. +975 −0 resources/data/dev/extra.shuffles/3/fold1.settrc
  149. +1,224 −0 resources/data/dev/extra.shuffles/3/fold2.ccgsettrc
  150. +881 −0 resources/data/dev/extra.shuffles/3/fold2.settrc
  151. +822 −798 experiments/dev.cross/data/fold0.ccgsettrc → resources/data/dev/extra.shuffles/3/fold3.ccgsettrc
  152. +939 −0 resources/data/dev/extra.shuffles/3/fold3.settrc
  153. +1,128 −0 resources/data/dev/extra.shuffles/3/fold4.ccgsettrc
  154. +817 −0 resources/data/dev/extra.shuffles/3/fold4.settrc
  155. +1,374 −0 resources/data/dev/extra.shuffles/4/fold0.ccgsettrc
  156. +981 −0 resources/data/dev/extra.shuffles/4/fold0.settrc
  157. +1,254 −0 resources/data/dev/extra.shuffles/4/fold1.ccgsettrc
  158. +901 −0 resources/data/dev/extra.shuffles/4/fold1.settrc
  159. +1,164 −0 resources/data/dev/extra.shuffles/4/fold2.ccgsettrc
  160. +841 −0 resources/data/dev/extra.shuffles/4/fold2.settrc
  161. +1,290 −0 resources/data/dev/extra.shuffles/4/fold3.ccgsettrc
  162. +925 −0 resources/data/dev/extra.shuffles/4/fold3.settrc
  163. +1,311 −0 resources/data/dev/extra.shuffles/4/fold4.ccgsettrc
  164. +939 −0 resources/data/dev/extra.shuffles/4/fold4.settrc
  165. 0 {experiments/dev.abimp.cross/data → resources/data/dev}/fold0.ccgsettrc
  166. 0 {experiments/dev.abimp.cross/data → resources/data/dev}/fold0.settrc
  167. 0 {experiments/dev.abimp.cross/data → resources/data/dev}/fold1.ccgsettrc
  168. 0 {experiments/dev.abimp.cross/data → resources/data/dev}/fold1.settrc
  169. 0 {experiments/dev.abimp.cross/data → resources/data/dev}/fold2.ccgsettrc
  170. 0 {experiments/dev.abimp.cross/data → resources/data/dev}/fold2.settrc
  171. 0 {experiments/dev.abimp.cross/data → resources/data/dev}/fold3.ccgsettrc
  172. 0 {experiments/dev.abimp.cross/data → resources/data/dev}/fold3.settrc
  173. 0 {experiments/dev.abimp.cross/data → resources/data/dev}/fold4.ccgsettrc
  174. 0 {experiments/dev.abimp.cross/data → resources/data/dev}/fold4.settrc
  175. +325 −0 resources/data/dev/folds_ids
  176. 0 {experiments/dev.abimp.cross/data → resources/data/dev}/lfs.ccgsettrc
  177. 0 {experiments/dev.abimp.cross/data → resources/data/dev}/lfs.ids
  178. +150 −0 resources/data/dev/lfs.settrc
  179. 0 {experiments/eval.chen.cross/data → resources/data/test.chen}/grid.ccgsettrc
  180. 0 {experiments/eval.chen.cross/data → resources/data/test.chen}/grid.settrc
  181. 0 {experiments/eval.chen.cross/data → resources/data/test.chen}/jelly.ccgsettrc
  182. 0 {experiments/eval.chen.cross/data → resources/data/test.chen}/jelly.settrc
  183. 0 {experiments/eval.chen.cross/data → resources/data/test.chen}/l.ccgsettrc
  184. 0 {experiments/eval.chen.cross/data → resources/data/test.chen}/l.settrc
  185. 0 experiments/eval/data/eval.ccgsettrc → resources/data/test/test.ccgsettrc
  186. 0 experiments/eval.chen.cross/data/eval.lf.ccgsettrc → resources/data/test/test.lf.ccgsettrc
  187. +0 −96 resources/seed.old.lex
View
@@ -1,4 +1,4 @@
# _**Navi**_
# _**Navi v1.1**_
Yoav Artzi and Luke Zettlemoyer. [Weakly Supervised Learning of Semantic Parsers for Mapping Instructions to Actions](http://yoavartzi.com/pub/az-tacl.2013.pdf). In Transactions of the Association for Computational Linguistics (TACL), 2013.
@@ -111,4 +111,4 @@ details.
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
View
@@ -1,2 +1,2 @@
src.navi = navi/src
mainclass=edu.uw.cs.lil.navi.experiments.NaviGeneric
mainclass=edu.uw.cs.lil.navi.experiments.NaviMain
View
@@ -4,7 +4,7 @@
</description>
<!-- set global properties for this build -->
<property file="build.properties" />
<property name="version" value="1.0" />
<property name="version" value="1.1" />
<property name="build" location="build" />
<property name="build.src" location="build.src" />
<property name="dist" location="dist" />
@@ -32,6 +32,7 @@
<javac debug="true" srcdir="${build.src}" destdir="${build}" includeantruntime="false">
<classpath refid="classpath" />
<compilerarg value="-Xlint"/>
<compilerarg value="-Xlint:-serial"/>
</javac>
</target>
@@ -0,0 +1,33 @@
## Data
# Oracle corpus - Development folds
[XX=0-4] type=data.ccgsettrc id=devFoldXXSetCCG file=../../resources/data/dev/foldXX.ccgsettrc maps=jelly,l,grid
[XX=0-4] type=data.ccgtrc id=devFoldXXCCG sets=devFoldXXSetCCG
[XX=0-4] type=data.settrc id=devFoldXXSet file=../../resources/data/dev/foldXX.settrc maps=jelly,l,grid
[XX=0-4] type=data.trc id=devFoldXX sets=devFoldXXSet
# Oracle corpus - Development LF annotated data
type=data.ccgsettrc id=devTestLFSetCCG file=../../resources/data/dev/lfs.ccgsettrc maps=jelly,l,grid
type=data.ccgtrc id=devTestLFCCG sets=devTestLFSetCCG
type=data.settrc id=devTestLFSet file=../../resources/data/dev/lfs.settrc maps=jelly,l,grid
type=data.trc id=devTestLF sets=devTestLFSet
# Evaluation set
type=data.ccgsettrc id=evalSet file=../../resources/data/test/test.ccgsettrc maps=jelly,l,grid
type=data.ccgtrc id=eval sets=evalSet
# Evaluation set with logical forms
type=data.ccgsettrc id=evalLFSetCCG file=../../resources/data/test/test.lf.ccgsettrc maps=jelly,l,grid
type=data.ccgtrc id=evalLFCCG sets=evalLFSetCCG
# Chen et al. corpus - Complete set
# grid
type=data.ccgsettrc id=evalChenFold-gridSetCCG file=../../resources/data/test.chen/grid.ccgsettrc maps=jelly,l,grid
type=data.ccgtrc id=evalChenFold-gridCCG sets=evalChenFold-gridSetCCG
type=data.settrc id=evalChenFold-gridSet file=../../resources/data/test.chen/grid.settrc maps=jelly,l,grid
type=data.trc id=evalChenFold-grid sets=evalChenFold-gridSet
# jelly
type=data.ccgsettrc id=evalChenFold-jellySetCCG file=../../resources/data/test.chen/jelly.ccgsettrc maps=jelly,l,grid
type=data.ccgtrc id=evalChenFold-jellyCCG sets=evalChenFold-jellySetCCG
type=data.settrc id=evalChenFold-jellySet file=../../resources/data/test.chen/jelly.settrc maps=jelly,l,grid
type=data.trc id=evalChenFold-jelly sets=evalChenFold-jellySet
# l
type=data.ccgsettrc id=evalChenFold-lSetCCG file=../../resources/data/test.chen/l.ccgsettrc maps=jelly,l,grid
type=data.ccgtrc id=evalChenFold-lCCG sets=evalChenFold-lSetCCG
type=data.settrc id=evalChenFold-lSet file=../../resources/data/test.chen/l.settrc maps=jelly,l,grid
type=data.trc id=evalChenFold-l sets=evalChenFold-lSet
@@ -1,2 +1,2 @@
## Lexicon generator
type=genlex.templated.abstract.joint.navi model=model maxTokens=4 id=genlex beam=@lexbeam validator=validator margin=2.0 lexicon=initialLexicon
type=genlex.templated.abstract.joint.navi model=model lexicon=initialLexicon maxTokens=4 id=genlex beam=%{lexbeam} margin=2.0 validator=wValidator baseParser=baseParser parser=parser
@@ -6,7 +6,7 @@ type=test id=test.set.naive.pre tester=testerSet data=testSet exec=execSetNaive
type=test stats=exact.position,exact.lf,exact.lf.dup,exact.lf.dup.nl id=test.lf.pre tester=tester data=testLF exec=execSingle dep=init
type=test stats=exact.trace,exact.position,exact.coordinates id=test.pre tester=tester data=test exec=execSingle dep=init
type=test stats=exact.trace,exact.position,exact.coordinates id=test.naive.pre tester=tester data=test exec=execSingleNaive dep=init
type=train id=train model=model learner=learner dep=test.pre,test.naive.pre,test.set.pre,test.set.naive.pre,log.pre
type=train id=train model=model learner=learner dep=init dep=test.pre,test.naive.pre,test.set.pre,test.set.naive.pre,log.pre
type=test stats=exact.trace,exact.position,exact.coordinates id=test.post tester=tester data=test dep=train exec=execSingle
type=test stats=exact.trace,exact.position,exact.coordinates id=test.naive.post tester=tester data=test exec=execSingleNaive dep=train
type=test id=test.set.post tester=testerSet data=testSet exec=execSet stats=exact.set.coordinates,exact.set.xcoordinates dep=train
@@ -1,6 +1,7 @@
## Learner
#type=chart.logger id=chartLogger outputDir=/scratch/yoav
type=learner.trc id=learner maxSentenceLength=@trainingMaxSentenceLength genlexbeam=@lexbeam iter=@iter data=train hard=true validator=validator
type=learner.trc id=learner maxSentenceLength=%{trainingMaxSentenceLength} genlexbeam=%{lexbeam} iter=%{gIter} data=train hard=true validator=wValidator genlex=genlex
type=learner.stocgrad.trc id=learnerStocGrad maxSentenceLength=%{trainingMaxSentenceLength} genlexbeam=%{lexbeam} iter=%{gIter} data=train validator=validator genlex=genlex
# parseLogger=chartLogger
## Testers
type=tester.exec id=tester
@@ -0,0 +1,3 @@
type=navimap id=jelly file=../../resources/maps/map-jelly.xml
type=navimap id=l file=../../resources/maps/map-l.xml
type=navimap id=grid file=../../resources/maps/map-grid.xml
@@ -2,7 +2,7 @@
type=scorer.uniform id=uniform0Scorer class=lexEntry weight=0.0
type=scorer.uniform id=uniform10Scorer class=lexEntry weight=10.0
type=scorer.lenexp id=expScorer coef=10.0 exp=1.1
type=scorer.lex.skipping id=skippingScorer cost=@wordSkippingCost baseScorer=uniform0Scorer
type=scorer.lex.skipping id=skippingScorer cost=%{wordSkippingCost} baseScorer=uniform0Scorer
type=feat.logexp.coordination id=featLogexpCoordination rept=true
type=feat.lex init=skippingScorer initFixed=expScorer id=featLex
type=feat.lexeme id=featLexeme initFixed=uniform0Scorer
@@ -11,8 +11,6 @@ type=feat.lextemplate id=featLextemplate scale=0.1
type=lexicon.factored id=lexicon
type=model.joint id=model lexicon=lexicon lexicalFeatures=featLex,featLextemplate,featLexeme parseFeatures=featLogexpCoordination,featRules
type=logger.model id=loggerModel cluster=true
## Validator
type=navi.validator.relaxed id=validator
## Model init
type=init.lex id=init.lex lexicon=initialLexicon fixed=true
type=init.feats.rept id=init.rept tag=LOGEXP name=REPT weight=-10
@@ -0,0 +1,18 @@
# Parsing rules
type=rule.composition id=ruleComp
type=rule.application id=ruleApp
type=rule.shifting.pp id=shiftPP
type=rule.shifting.adj id=shiftADJ
type=rule.shifting.ap id=shiftAP
type=rule.shifting.ap.topic id=shiftAPTopic
type=rule.shifting.sentence.ap id=shiftSAP
type=rule.set.overload id=overloadedRules rules=ruleComp,ruleApp functions=shiftPP,shiftAP,shiftAPTopic,shiftSAP,shiftADJ
type=rule.skipping id=ruleSkipping
type=rule.set id=ruleSet rules=overloadedRules,ruleSkipping
type=ckyrule.marked id=markedCKYRule baseRule=ruleSet maxEntries=1
# Parse filter
type=parsefilter.lambda.simple id=parseFilter syntax=S
# CKY Parser
type=parser.cky.multi id=baseParser parseFilter=parseFilter beam=%{gBeam} preChartPruning=true pruneLexicalCells=true rules=overloadedRules,ruleSkipping executor=executor ckyRules=markedCKYRule
# Joint parser
type=parser.joint.navi.graph id=parser baseParser=baseParser evalTimeout=120000
@@ -0,0 +1,7 @@
# Include the various resources, except learning
include=../default.include.maps.exp
include=../default.include.parser.exp
include=../default.include.model.exp
include=../default.include.validation.exp
include=../default.include.genlex.exp
include=../default.include.data.exp
@@ -0,0 +1,3 @@
## Validator
type=navi.validator.relaxed id=validator
type=navi.validator.wrapper id=wValidator base=validator
@@ -4,9 +4,9 @@ domain_ont=../../resources/navi.ont
generic_ont=../../resources/generic.ont
types=../../resources/navi.types
seedlex=../../resources/seed.lex:../../resources/coord.lex
beam=100
gBeam=100
lexbeam=250
iter=6
gIter=6
wordSkippingCost=-1.0
initialFixedLexicalWeight=100.0
trainingMaxSentenceLength=50
@@ -4,13 +4,12 @@ outputDir=logs0
globalLog=logs0/global.log
# Resources
include=../default.include.model.exp
include=../default.include.genlex.exp
include=dev.include.data.exp
include=../default.include.resources.exp
## Training and testing sets
type=data.composite.trc id=train sets=fold1,fold2,fold3,fold4
type=data.composite.ccgtrc id=test sets=fold0CCG
type=data.composite.ccgsettrc id=testSet sets=fold0SetCCG
type=data.composite.trc id=train sets=devgFold1,devFold2,devFold3,devFold4
type=data.composite.ccgtrc id=test sets=devgFold0CCG
type=data.composite.ccgsettrc id=testSet sets=devgFold0SetCCG
type=data.composite.ccgtrc id=testLF sets=devTestLFCCG
include=../default.include.learn.exp
# Jobs
@@ -1,16 +1,15 @@
include=../default.params
include=dev.params
outputDir=logs1
globalLog=global.log
globalLog=logs1/global.log
# Resources
include=../default.include.model.exp
include=../default.include.genlex.exp
include=dev.include.data.exp
include=../default.include.resources.exp
## Training and testing sets
type=data.composite.trc id=train sets=fold0,fold2,fold3,fold4
type=data.composite.ccgtrc id=test sets=fold1CCG
type=data.composite.ccgsettrc id=testSet sets=fold1SetCCG
type=data.composite.trc id=train sets=devFold0,devFold2,devFold3,devFold4
type=data.composite.ccgtrc id=test sets=devFold1CCG
type=data.composite.ccgsettrc id=testSet sets=devFold1SetCCG
type=data.composite.ccgtrc id=testLF sets=devTestLFCCG
include=../default.include.learn.exp
# Jobs
@@ -1,16 +1,15 @@
include=../default.params
include=dev.params
outputDir=logs2
globalLog=global.log
globalLog=logs2/global.log
# Resources
include=../default.include.model.exp
include=../default.include.genlex.exp
include=dev.include.data.exp
include=../default.include.resources.exp
## Training and testing sets
type=data.composite.trc id=train sets=fold0,fold1,fold3,fold4
type=data.composite.ccgtrc id=test sets=fold2CCG
type=data.composite.ccgsettrc id=testSet sets=fold2SetCCG
type=data.composite.trc id=train sets=devFold0,devFold1,devFold3,devFold4
type=data.composite.ccgtrc id=test sets=devFold2CCG
type=data.composite.ccgsettrc id=testSet sets=devFold2SetCCG
type=data.composite.ccgtrc id=testLF sets=devTestLFCCG
include=../default.include.learn.exp
# Jobs
@@ -1,16 +1,15 @@
include=../default.params
include=dev.params
outputDir=logs3
globalLog=global.log
globalLog=logs3/global.log
# Resources
include=../default.include.model.exp
include=../default.include.genlex.exp
include=dev.include.data.exp
include=../default.include.resources.exp
## Training and testing sets
type=data.composite.trc id=train sets=fold0,fold1,fold2,fold4
type=data.composite.ccgtrc id=test sets=fold3CCG
type=data.composite.ccgsettrc id=testSet sets=fold3SetCCG
type=data.composite.trc id=train sets=devFold0,devFold1,devFold2,devFold4
type=data.composite.ccgtrc id=test sets=devFold3CCG
type=data.composite.ccgsettrc id=testSet sets=devFold3SetCCG
type=data.composite.ccgtrc id=testLF sets=devTestLFCCG
include=../default.include.learn.exp
# Jobs
@@ -1,16 +1,15 @@
include=../default.params
include=dev.params
outputDir=logs4
globalLog=global.log
globalLog=logs4/global.log
# Resources
include=../default.include.model.exp
include=../default.include.genlex.exp
include=dev.include.data.exp
include=../default.include.resources.exp
## Training and testing sets
type=data.composite.trc id=train sets=fold0,fold1,fold2,fold3
type=data.composite.ccgtrc id=test sets=fold4CCG
type=data.composite.ccgsettrc id=testSet sets=fold4SetCCG
type=data.composite.trc id=train sets=devFold0,devFold1,devFold2,devFold3
type=data.composite.ccgtrc id=test sets=devFold4CCG
type=data.composite.ccgsettrc id=testSet sets=devFold4SetCCG
type=data.composite.ccgtrc id=testLF sets=devTestLFCCG
include=../default.include.learn.exp
# Jobs

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 9ce466a

Please sign in to comment.