From e7281e2d1451515d039dba3c9335d9bfaacf4d70 Mon Sep 17 00:00:00 2001
From: Sida Wang <sidaw@cs.stanford.edu>
Date: Wed, 8 Mar 2017 14:43:58 -0800
Subject: [PATCH] merge build

---
 build.xml    | 22 ++++++------
 shrdlurn/run | 94 +++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 88 insertions(+), 28 deletions(-)

diff --git a/build.xml b/build.xml
index c41b576..18c20e3 100644
--- a/build.xml
+++ b/build.xml
@@ -91,9 +91,17 @@
     <jar destfile="${libsempre}/sempre-overnight.jar" basedir="${classes}/overnight"/>
   </target>
 
-<<<<<<< HEAD
+	<!-- Compile interactive -->
+  <target name="interactive" depends="init,core">
+    <echo message="Compiling ${ant.project.name}: interactive"/>
+    <mkdir dir="${classes}/interactive"/>
+    <javac srcdir="${src}" destdir="${classes}/interactive" classpathref="lib.path" debug="true" includeantruntime="false" source="${source}" target="${target}">
+      <include name="edu/stanford/nlp/sempre/interactive/"/>
+    </javac>
+    <jar destfile="${libsempre}/sempre-interactive.jar" basedir="${classes}/interactive"/>
+  </target>
+	
   <!-- BEGIN_HIDE -->
-
   <target name="compile.internal" depends="fbalignment,paraphrase,clojure,regex,jungle,logicpuzzles"/>
 
   <!-- Compile fbalignment -->
@@ -156,16 +164,6 @@
     <jar destfile="${libsempre}/sempre-logicpuzzles.jar" basedir="${classes}/logicpuzzles"/>
   </target>
 
-  <!-- Compile interactive -->
-  <target name="interactive" depends="init,core">
-    <echo message="Compiling ${ant.project.name}: interactive"/>
-    <mkdir dir="${classes}/interactive"/>
-    <javac srcdir="${src}" destdir="${classes}/interactive" classpathref="lib.path" debug="true" includeantruntime="false" source="${source}" target="${target}">
-      <include name="edu/stanford/nlp/sempre/interactive/"/>
-    </javac>
-    <jar destfile="${libsempre}/sempre-interactive.jar" basedir="${classes}/interactive"/>
-  </target>
-
   <!-- Compile geo880 -->
   <target name="geo880" depends="init,core,corenlp,tables">
     <echo message="Compiling ${ant.project.name}: geo880"/>
diff --git a/shrdlurn/run b/shrdlurn/run
index d7ac029..4c870ea 100755
--- a/shrdlurn/run
+++ b/shrdlurn/run
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 
-# This is the main entry point for running all SEMPRE programs.  See
+# This is the main entry point for running SHRDLURN.  See
 # fig/lib/execrunner.rb for more documentation for how commands are generated.
 # There are a bunch of modes that this script can be invoked with, which
 # loosely correspond to the modules.
@@ -57,21 +57,10 @@ def header(modules='core', codalabDependencies=nil)
   nil)
 end
 
-def rlwrap; system('which rlwrap') ? 'rlwrap' : nil end
-
-def unbalancedTrainDevSplit
-  l(o('Dataset.trainFrac', 0.8), o('Dataset.devFrac', 0.2))
-end
-def balancedTrainDevSplit
-  l(o('Dataset.trainFrac', 0.5), o('Dataset.devFrac', 0.5))
-end
-
 def figOpts; l(selo(:pooldir, 'execDir', 'exec', '_OUTPATH_'), o('overwriteExecDir'), o('addToView', 0)) end
 
 ############################################################
 # Unit tests
-# Community Server
-
 
 addMode('backup', 'small commands like run community server, backup, or simulator', lambda { |e| l(
   lambda { |e| system 'echo "backing up with mv"'},
@@ -101,10 +90,6 @@ addMode('community', 'start the community server', lambda { |e| l(
 l('python community-server/server.py -- port 8403'),
 nil)})
 
-addMode('others', 'print out common commands', lambda { |e| l(
-	lambda { |e| system 'echo mv folder folder-`date +%Y-%m-%d.%H:%M:%S`'},
-nil)})
-
 addMode('simulator', 'run the simulator', lambda { |e| l(
 	# rlwrap,
 	header('core,interactive'),
@@ -174,6 +159,83 @@ addMode('simulator', 'run the simulator', lambda { |e| l(
 		}),
 nil)})
 
+############################################################
+# {2016-07-02} [Sida Wang]: interactive semantic parsing
+addMode('interactive', 'interactive semantic parsing in a blocksworld', lambda { |e| l(
+  #rlwrap,
+  header('core,interactive'),
+  'edu.stanford.nlp.sempre.Main',
+  #figOpts,
+
+  o('Executor', 'interactive.ActionExecutor'),
+  o('LanguageAnalyzer', 'interactive.ActionLanguageAnalyzer'),
+  o('ActionExecutor.convertNumberValues', true),
+  o('ActionExecutor.printStackTrace', true),
+  o('BlocksWorld.maxBlocks', 3000),
+  selo(0, 'ActionExecutor.FlatWorldType', 'BlocksWorld', 'CalendarWorld'),
+  selo(0, 'Grammar.inPaths', './shrdlurn/blocksworld.grammar', './shrdlurn/calendar.grammar'),
+
+  o('Params.initWeightsRandomly', false),
+  o('Grammar.binarizeRules', false),
+  o('Grammar.useApplyFn', 'interactive.ApplyFn'),
+
+  o('LanguageAnalyzer.lowerCaseTokens', true),
+  o('LanguageAnalyzer.useLemmaTokens', false),
+
+  o('Parser.pruneErrorValues', true),
+  o('Parser', 'BeamFloatingParser'),
+  o('Parser.trackedCats', 'Number', 'Numbers', 'Color',  'Direction', 'Set', 'Sets', 'Action', 'Actions'),
+  o('FloatingParser.defaultIsFloating', true),
+  selo(0, 'BeamFloatingParser.floatStrategy', 'Never', 'NoParse', 'Always'),
+
+	o('ParserState.customExpectedCounts', 'None'),
+	o('Params.l1Reg', 'nonlazy'),
+	o('Params.l1RegCoeff', 0.0001),
+	o('Parser.beamSize', 25),
+	o('Params.initStepSize', 0.1),
+	o('Params.adaptiveStepSize', true),
+	#o('Params.stepSizeReduction', 0.25),
+
+	o('FeatureExtractor.featureComputers', 'interactive.ActionFeatureComputer'),
+	o('FeatureExtractor.featureDomains', ':rule', ':span', ':stats', ':scope', ':social', ':window'),
+	# o('FeatureExtractor.featureDomains', ':rule'),
+
+	o('Master.intOutputPath', './int-output/'),
+	o('ILUtils.citationPath', './int-output/citation/'),
+
+	o('ILUtils.useAligner', true),
+	o('ILUtils.maxSequence', 20),
+
+	o('DefinitionAligner.strategies', 'ExactExclusion'),
+
+	o('Master.onlineLearnExamples', true),
+	o('Master.independentSessions', false),
+
+	o('Master.onlyInteractive', true),
+
+	o('server', true),
+
+	o('JsonServer.numThreads', 16),
+	o('JsonServer.maxCandidates', 50),
+	o('JsonServer.queryLogPath', './int-output/query.log'),
+	o('JsonServer.responseLogPath', './int-output/response.log'),
+	o('JsonServer.port', 8410),
+
+	o('GrammarInducer.useBestPacking', true),
+	o('GrammarInducer.useSimplePacking', true),
+
+	o('Derivation.showTypes', false),
+	o('Derivation.showValues', false),
+	o('Derivation.showRules', false),
+
+	lambda { |e| system 'mkdir -p ./int-output/'; nil},
+	lambda { |e| system 'mkdir -p ./int-output/log/'; nil},
+	lambda { |e| system 'mkdir -p ./int-output/citation/'; nil},
+	lambda { |e| system 'mkdir -p server.exec';
+		l(o('execDir', 'server.exec/'),
+		o('overwriteExecDir'))
+	 },
+nil) })
 ############################################################
 
 if ARGV.size == 0