diff --git a/HOWTO b/HOWTO
index c18edcd..9da8060 100644
--- a/HOWTO
+++ b/HOWTO
@@ -28,6 +28,7 @@ There are five main options for otmedia scripts.
-f n : number of forks for speeral
Output : result_directory/110624FR2_20002100/res_p1/
+ and .ctm, .trs and .txt files.
2.2\ SecondPass.sh
------------------
@@ -40,6 +41,7 @@ There are five main options for otmedia scripts.
-f n : number of forks for speeral
Output : result_directory/110624FR2_20002100/res_p2/
+ and .ctm, .trs and .txt files.
2.3\ ConfPass.sh
----------------
@@ -75,6 +77,7 @@ There are five main options for otmedia scripts.
-f n : number of forks for speeral
Output : result_directory/110624FR2_20002100/conf/res_p3
+ and .ctm, .trs and .txt files.
2.6\ RecomposePass.sh
--------------------
@@ -84,6 +87,7 @@ There are five main options for otmedia scripts.
$> RecomposePass.sh [options] result_directory/110624FR2_20002100/
Output : result_directory/110624FR2_20002100/res_all
+ and .ctm, .trs and .txt files.
2.7\ ScoringRes.sh
------------------
@@ -127,8 +131,35 @@ There are five main options for otmedia scripts.
-s Do Scoring pass
4\ Modify configuration
+-----------------------
+
+ Most of the main scripts got a configuration file (cfg/ directory).
+ You can change script behaviour and data used.
+ Speeral configuration file can be also change (tools/Speeral/CFG/ directory)
4.1\ Scripts configurations
+
+ In scripts configuration files (OTMEDIA_HOME/cfg/) you can change default options as architecture, verbose ...
+ Scripts using Speeral got information on binaries, models path and name, and the configuration file for speeral.
+
4.2\ Speeral configurations
+ Speeral configuration files are in OTMEDIA_HOME/tools/Speeral/CFG directory.
+ The .tmp files are use to generate .xml file from install.sh.
+ You can modify .xml files for your needs, but most of data informations are pass through arguments at speeral call in scripts.
+
5\ Modify binaries
+------------------
+
+ Binaries can be find in bin and tools directory.
+ Some binaries are compiled in 32 and 64 bits. By default all binaries are compiled in 32 bits.
+ You can update binaries as you need.
+
+ To modify tools binaries, you need to download a compatible version.
+ lia_ltbox can be found in /labo/Tools/
+ Speeral (binaries) can be compiled from the git remote git@gitlia.univ-avignon.fr:vaudriguard/libspeeral.git . Do not modify Speeral data from OTMEDIA (unless you know what you do).
+ In PACKAGES_MESURES_V1.0 you can update icsiboost binary (in bin) from the projet page : https://code.google.com/p/icsiboost/
+ For QUOTE_FINDER and SIGMUND please contact support.
+
+Good Luck ! Luke !
+And the force be with you !
diff --git a/INSTALL b/INSTALL
index e3cdbe6..5ce8e0e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -14,6 +14,7 @@ SUMMARY
1\ Before installation
2\ install.sh script
3\ SOLR install
+4\ Install descriptions
1\ Before installation
@@ -24,7 +25,7 @@ SUMMARY
- Have 300 Go of free space.
- Have acces to the network and the nyx server.
-2/ install.sh script
+2\ install.sh script
--------------------
install.sh script will do most of the work.
@@ -37,6 +38,8 @@ To disable lexicon adaption using SOLR DB put EXPLOITCONFPASS to 0 (mainly the 2
To disable confidence measure put CONFPASS to 0.
To disable second and third pass put PASS2 to 0.
+If your login name differ from your nyx login name, edit install.sh and change the username variable to your nyx login name.
+
run install.sh and follow the white rabbit.
3\ SOLR install
@@ -46,6 +49,7 @@ The install.sh script download otmedia-2013-04.tar.gz and untar it in OTMEDIA_HO
See SOLR.INSTALL file to install OTMEDIA SOLR DB.
4\ Install descriptions
+-----------------------
OTMEDIA_HOME
|-> bin/
@@ -55,7 +59,7 @@ OTMEDIA_HOME
|-> lia_plp_mt.64
|-> LIUM_SpkDiarization-4.2.jar
|-> sclite
- |-> cfg/
+ |-> cfg/ # Main scripts configurations files
|-> ConfidenceMeasure.cfg
|-> ConfPass.cfg
|-> ExploitConfidencePass.cfg
@@ -65,7 +69,7 @@ OTMEDIA_HOME
|-> Scoring.cfg
|-> Secondass.cfg
|-> ThirdPass.cfg
- |-> data/
+ |-> data/ # Some data
|-> rules/
|-> asupp
|-> basic
@@ -75,7 +79,7 @@ OTMEDIA_HOME
|-> postprocess.regex
|-> preprocess.regex
|-> random_regex.tab
- |-> main_tools/
+ |-> main_tools/ # Main scripts
|-> CheckResults.sh
|-> ConfidenceMeasure.sh
|-> ConfPass.sh
@@ -86,11 +90,11 @@ OTMEDIA_HOME
|-> ScoringRes.sh
|-> SecondPass.sh
|-> ThirdPass.sh
- |-> tools/
+ |-> tools/ # Tools
|-> lia_ltbox/
|-> PACKAGE_MESURES_V1.0/
|-> QUOTE_FINDER/
- |-> scripts/
+ |-> scripts/ # Secondary scripts (but useful)
|-> ApplyCorrectionRules.pl
|-> BdlexUC.pl
|-> CheckConfPass.sh
@@ -127,6 +131,8 @@ OTMEDIA_HOME
|-> Tools.sh
|-> UrlConverter.pl
|-> SIGMUND/
+ |-> SOLR/
+ |-> Speeral/
|-> COPYING
|-> CorpusOTMedia.txt
|-> HOWTO
diff --git a/README b/README
index 75a50d1..92d5869 100644
--- a/README
+++ b/README
@@ -28,7 +28,8 @@ DESCRIPTION
- Confidence pass : calcul confidence measure from transcription output.
- Exploit Confidence Measure : use SOLR DB data to extend the lexicon on low confidence measure and create trigg files.
- Third pass : second pass using the new lexicon and trigg files.
-
+
+ From GIT : git@gitlia.univ-avignon.fr/otmedia.git
DEPENDENCIES
------------
diff --git a/install.sh b/install.sh
index 178969e..0f37dc4 100755
--- a/install.sh
+++ b/install.sh
@@ -3,9 +3,10 @@
#-------------------#
# OTMEDIA LIA #
# Install script #
-# version : 1.0.0 #
+# version : 1.1.0 #
#-------------------#
+# nyx login name
username=${LOGNAME}
# Color variables
@@ -143,8 +144,12 @@ echo -e "SRILM toolkit : \t ${txtgrn}OK${txtrst}"
### Speeral Configuration ###
echo -e "\n\t${txtblu}Speeral configuration${txtrst}\n"
-echo -e "Download Speeral bin and data :"
-scp -r ${username}@nyx:~/OTMEDIA_DATA/Speeral $OTMEDIA_HOME/tools/
+read -e -p "Download Speeral bin and data ? (y/n) " speeral
+if [ "$speeral" == "y" ]
+then
+ echo -e "Download Speeral bin and data :"
+ scp -r ${username}@nyx:/local/OTMEDIA/OTMEDIA_DATA/Speeral $OTMEDIA_HOME/tools/
+fi
echo -e "\n\t${txtblu}Generating Speeral configuration files :${txtrst}\n"
cat $PWD/tools/Speeral/CFG/SpeeralFirstPass.xml.tmp | sed -e "s|[^<]*|$PWD/tools/Speeral/LEX/LEXIQUE_V6.speer|g" \
| sed -e "s|[^<]*|$PWD/tools/Speeral/LM/ML_4gOTMEDIA_LEXIQUE_V6|g" \
@@ -204,7 +209,7 @@ then
echo -e "Download SOLR DB\r"
mkdir -p $OTMEDIA_HOME/tools/SOLR 2> /dev/null
- scp -r ${username}@nyx:~/OTMEDIA_DATA/SOLR/otmedia-2013-04.tar.gz $OTMEDIA_HOME/tools/SOLR
+ scp -r ${username}@nyx:/local/OTMEDIA/OTMEDIA_DATA/SOLR/otmedia-2013-04.tar.gz $OTMEDIA_HOME/tools/SOLR
echo -e "Unzip SOLR DB\r"
res=0
#res = $(tar -xvzf "$OTMEDIA_HOME/tools/SOLR/otmedia-2013-04.tar.gz" "$OTMEDIA_HOME/tools/SOLR/")
@@ -259,9 +264,9 @@ echo "export PATH=\$PATH:$OTMEDIA_HOME/main_tools"
echo "export SRILM_BIN=$SRILM/bin/$MACHINE_TYPE"
-echo " \\\\ "
+echo "${txtwht} \\\\ "
echo " ,-~~~-\\\\_"
echo " ( .\ "
-echo " @\___(__--'"
+echo " @\___(__--'${txtrst}"
echo "${txtgrn}Yes${txtylw}I${txtred}Rastafari${txtrst}"
diff --git a/main_tools/ConfidenceMeasure.sh b/main_tools/ConfidenceMeasure.sh
index d2b65f2..48d48e0 100755
--- a/main_tools/ConfidenceMeasure.sh
+++ b/main_tools/ConfidenceMeasure.sh
@@ -102,9 +102,12 @@ mkdir -p $GVCTM > /dev/null 2>&1
mkdir -p $SEGCTM > /dev/null 2>&1
mkdir -p $SUPER_CTM > /dev/null 2>&1
mkdir -p $SCORED_CTM > /dev/null 2>&1
-if [ -z $BOOST_BIN ];then
+if [ -z $BOOST_BIN ] && [ $ARCH == ".64"] ;then
BOOST_BIN=$ROOT/bin/icsiboost-64bit-static-r160
fi
+if [ -z $BOOST_BIN ] ;then
+ BOOST_BIN=$ROOT/bin/icsiboost-32bit-static-r176
+fi
#-----------------------------------------------------------------
# STEP 1 - Extension des treillis + ajout posteriors (format htk)
#-----------------------------------------------------------------