From 02ba6756245d1424dd740f260e91e7bdb579f2d7 Mon Sep 17 00:00:00 2001
From: Benoit Favre <benoit.favre@lif.univ-mrs.fr>
Date: Tue, 19 May 2015 10:45:00 +0200
Subject: [PATCH] fix jump without text
---
.../automate/simple-example_section1.fst | Bin 854 -> 1162 bytes
.../automate/simple-example_section2.fst | Bin 574 -> 882 bytes
asr/tools/slu/src/compile_automate.sh | 32 +++++++++---------
main.py | 2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/asr/models/simple-example/automate/simple-example_section1.fst b/asr/models/simple-example/automate/simple-example_section1.fst
index 32673adcfb28b250bf1ba2ad1c98707922ab701a..e5c4a706642ce99afc3b62a9ca227874fa3f14b4 100644
GIT binary patch
delta 368
zcmcb{*2Ou&NK}ad9W>N4PjuJhMhJ^<%s$De-cZj36=H+ZAc_}6AYuN=+RW0rd`KcN
zCQLVs28jzWFfi~>j%QM56r6mTNt>0Gfq{W(@^2>P$+wtzCTlSZu!2-@Pqt?k*JNP8
z?g9yrK}c8%<N`}cBoP=BW;2WiiA#fA0AfI~{N!vVX-1jJr<tT>Wx-+%^^9PefdT9~
bC|hpwekOGt1uzex0_<9_7z2YMl!j3NyU7~3
delta 129
zcmeC;yv8=cNK~8w9W>N4O?21X*l>hVn}LBDD$4|=K@=|o0|P&Z0mXtKdh%u_bw<9)
x^32kcvzP=XYq9V!3QRU<QJ?&cNnmmw3(sUBW*J7d$@<LFljkw>Ob%lf000Mc5_SLp
diff --git a/asr/models/simple-example/automate/simple-example_section2.fst b/asr/models/simple-example/automate/simple-example_section2.fst
index a18c933e1fcb950472d67483cbe1696416e0643f..32fe174f2ad2b3b2369078f5f50581256f7e6c89 100644
GIT binary patch
literal 882
zcmccicT*i30|P@@YH~?_5eEYULvcxBUP@w73KIhaFf%x*YC@P`QU**S6Akq+wIES0
z5W&E}zzC&blpvUaPz&PofyEdYK>9)IA^a0gAU*>FLM=!cKZsypU|@#Q5bA^z$o1%I
z1t5|PEKnLkA=HBGf`~CN@Io1^V7j3mSq?13z`%fR2ZRriWrt93k`v5Am;-VH4_J(W
z0TjMaCY*x!6%qz8K~NaN{0kC;gbTt<<S^g{DPTazf$RedF)%Pd>_y0d{0OrT=5Lr<
zP#D7ej%)_R9SAc(VGFU7fdRxu=m)V7afTd5LLez5ECOaD%mmp7aVrCZFjx+ifVmk)
zgJeY+7#JXK1MwIbB*7HIOyn>ULz4s92Nq&rU=Rm05c-hANCGT}Od!-Dn;`{Of{+7+
M3oMMJ!Ey)!0DC_pV*mgE
delta 188
zcmeywwvT0k3O|#gCIbQpPL^ku<^}P&Km-E=1LMT(gW3!X%up^9lm=1k3=9nXAO;k3
zgXqb#8Pyp%CTlZGGjdM8&nV5vHCdineeyj<0bT(H1_rPi1_lORkVO`3ARSN)F{z=R
T5z1#_U|`^ZvOzkbOfUriZio(l
diff --git a/asr/tools/slu/src/compile_automate.sh b/asr/tools/slu/src/compile_automate.sh
index 12a4777..5b9658f 100755
--- a/asr/tools/slu/src/compile_automate.sh
+++ b/asr/tools/slu/src/compile_automate.sh
@@ -2,12 +2,6 @@
prefix=$1
-dir=`dirname $0`/../../../
-export LD_LIBRARY_PATH=$dir/libs:$dir/libs/fst:$dir/libs/atlas:$PWD/src
-export PATH=$dir/bin:$PATH
-
-set -e -u -o pipefail
-
WORDSYMB_I="--isymbols=""$prefix""_dico_word.txt"
WORDSYMB_O="--osymbols=""$prefix""_dico_word.txt"
@@ -15,8 +9,10 @@ WORDSYMB_O="--osymbols=""$prefix""_dico_word.txt"
fstcompile $WORDSYMB_I $WORDSYMB_O "$prefix""_clean_tail.txt" > "$prefix""_clean_tail.fst"
# compile glouton
fstcompile $WORDSYMB_I "$prefix""_glouton.txt" > "$prefix""_glouton.fst"
-
+# compile section 0
cat "$prefix""_section0.txt" | fstcompile $WORDSYMB_I | fstunion - "$prefix""_glouton.fst" | fstclosure > "$prefix""_section0.fst"
+# compilte exit and change section
+cat "$prefix""_section0.txt" | fstcompile $WORDSYMB_I > "$prefix""_section0.basic.fst"
nbsect=1
while [ "$nbsect" != 80 ]
@@ -24,19 +20,23 @@ do
if [ -e "$prefix""_section""$nbsect"".txt" ]
then
rm -f "$prefix""_section""$nbsect".fst
+ if [ `cat "$prefix""_section""$nbsect""_exit.txt"| wc -l` == 0 ]
+ then
+ echo "Error: no $prefix""_section""$nbsect""_exit.txt file"
+ exit
+ fi
+ cat "$prefix""_section""$nbsect""_exit.txt" | fstcompile $WORDSYMB_I > "$prefix""_section""$nbsect"".exit.fst"
+ fstunion "$prefix""_section""$nbsect"".exit.fst" "$prefix""_section0.basic.fst" > "$prefix""_section""$nbsect"".exit.basic.fst"
if [ `cat "$prefix""_section""$nbsect"".txt" | wc -l` != 0 ]
then
- cat "$prefix""_section""$nbsect"".txt" | fstcompile $WORDSYMB_I > "$prefix""_section""$nbsect"".fst"
- cat "$prefix""_section0.txt" | fstcompile $WORDSYMB_I > "$prefix""_section""$nbsect"".fst.tmp"
- cat "$prefix""_section""$nbsect""_exit.txt" | fstcompile $WORDSYMB_I > "$prefix""_section""$nbsect"".fst.tmp"2
- fstunion "$prefix""_section""$nbsect"".fst.tmp" "$prefix""_section""$nbsect"".fst.tmp2" > "$prefix""_section""$nbsect"".fst.tmp4"
- fstconcat "$prefix""_section""$nbsect"".fst" "$prefix""_section""$nbsect"".fst.tmp4" > "$prefix""_section""$nbsect"".fst.tmp6"
- mv "$prefix""_section""$nbsect"".fst.tmp6" "$prefix""_section""$nbsect"".fst"
- rm -f "$prefix""_section""$nbsect"".fst.tmp" "$prefix""_section""$nbsect"".fst.tmp2" "$prefix""_section""$nbsect"".fst.tmp4"
+ cat "$prefix""_section""$nbsect"".txt" | fstcompile $WORDSYMB_I > "$prefix""_section""$nbsect"".fst2"
+ fstconcat "$prefix""_section""$nbsect"".fst2" "$prefix""_section""$nbsect"".exit.basic.fst" > "$prefix""_section""$nbsect"".fst4"
+ fstunion "$prefix""_section""$nbsect"".fst4" "$prefix""_section""$nbsect"".exit.basic.fst" > "$prefix""_section""$nbsect"".fst"
+ else
+ cp "$prefix""_section""$nbsect"".exit.basic.fst" "$prefix""_section""$nbsect"".fst"
fi
+ rm -f "$prefix""_section""$nbsect"".exit.fst" -f "$prefix""_section""$nbsect"".exit.basic.fst" -f "$prefix""_section""$nbsect"".fst2" -f "$prefix""_section""$nbsect"".fst4"
fi
-
nbsect=$(($nbsect+1))
done
-
diff --git a/main.py b/main.py
index ce64ed7..de8151d 100644
--- a/main.py
+++ b/main.py
@@ -57,7 +57,7 @@ class ScriptedASR(Gtk.Window):
# slu
self.fake_asr = Gtk.Entry()
self.fake_asr.connect('key-press-event', self.simulate_asr)
- vbox.pack_start(self.fake_asr, False, True, 5)
+ #vbox.pack_start(self.fake_asr, False, True, 5)
slu_prefix = config_dict['slu_prefix']
slu_actions = config_dict['slu_actions']
--
GitLab