fix bug parsing replace_numbers

stanford-oval · May 6, 2020 · b2c3072 · b2c3072
1 parent beb1e82
commit b2c3072
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/lib/replace_parameters.js b/lib/replace_parameters.js
@@ -524,7 +524,7 @@ module.exports = class ParameterReplacer {
                 }
                 if (slot.type.isLocation && !this._replaceLocations)
                     continue;
-                if ( (slot.type.isNumber || slot.type.type==='tt:phone_number') && !this._replaceNumbers)
+                if ((slot.type.isNumber || slot.type.type==='tt:phone_number') && !this._replaceNumbers)
                     continue;
 
                 if (isReplaceType(slot.type)) {

diff --git a/test/cmdline.sh b/test/cmdline.sh
@@ -10,10 +10,10 @@ export TMPDIR=$srcdir
 workdir=`mktemp -d $TMPDIR/genie-XXXXXX`
 workdir=`realpath $workdir`
 
-on_error() {
-    rm -fr $workdir
-}
-trap on_error ERR INT TERM
+#on_error() {
+#    rm -fr $workdir
+#}
+#trap on_error ERR INT TERM
 
 oldpwd=`pwd`
 cd $workdir
@@ -28,15 +28,15 @@ node $srcdir/tool/genie.js --help
 node $srcdir/tool/genie.js requote $srcdir/test/data/en-US/samples-en-hard.tsv --output ./samples-en-hard-requoted.tsv --mode replace
 diff -u $srcdir/test/data/en-US/samples-en-hard-requoted.tsv ./samples-en-hard-requoted.tsv
 # qpis mode
-node $srcdir/tool/genie.js requote $srcdir/test/data/en-US/samples-en-hard.tsv --output ./samples-en-hard-qpis.tsv --mode qpis --requote-numbers
+node $srcdir/tool/genie.js requote $srcdir/test/data/en-US/samples-en-hard.tsv --output ./samples-en-hard-qpis.tsv --mode qpis
 diff -u $srcdir/test/data/en-US/samples-en-hard-qpis.tsv ./samples-en-hard-qpis.tsv
 
 
 ## test augment.js and requote.js
 # first augment input dataset
-node $srcdir/tool/genie.js augment $srcdir/test/data/fa/para-restaurants-fixed.tsv --output ./para-restaurants-aug.tsv --random-seed 123 -l en-US --param-local fa --replace-numbers --thingpedia $srcdir/data/fa/restaurants/schema.tt --parameter-datasets $srcdir/data/fa/restaurants/parameter-datasets.tsv --synthetic-expand-factor 1 --quoted-paraphrasing-expand-factor 1 --no-quote-paraphrasing-expand-factor 1 --quoted-fraction 0.0 --debug
+node $srcdir/tool/genie.js augment $srcdir/test/data/fa/para-restaurants-fixed.tsv --output ./para-restaurants-aug.tsv --random-seed 123 -l en-US --param-local fa --thingpedia $srcdir/data/fa/restaurants/schema.tt --parameter-datasets $srcdir/data/fa/restaurants/parameter-datasets.tsv --synthetic-expand-factor 1 --quoted-paraphrasing-expand-factor 1 --no-quote-paraphrasing-expand-factor 1 --quoted-fraction 0.0 --debug
 # then requote the augmented dataset and assert the result matches the input dataset
-node $srcdir/tool/genie.js requote ./para-restaurants-aug.tsv --output ./para-restaurants-aug-req.tsv --mode replace --requote-numbers
+node $srcdir/tool/genie.js requote ./para-restaurants-aug.tsv --output ./para-restaurants-aug-req.tsv --mode replace
 diff -u --left-column <(cut -f2- ./para-restaurants-aug-req.tsv) <(cut -f2- $srcdir/test/data/fa/para-restaurants-fixed.tsv)
 
 

diff --git a/tool/workers/augment-worker.js b/tool/workers/augment-worker.js
@@ -41,7 +41,7 @@ module.exports = async function worker(args, shard) {
         noQuoteExpandFactor: args.no_quote_paraphrasing_expand_factor,
         singleDeviceExpandFactor: args.single_device_expand_factor,
         replaceLocations: args.replace_locations,
-        replaceNumbers: args.replaceNumbers,
+        replaceNumbers: args.replace_numbers,
         cleanParameters: args.clean_parameters
     });
 };