ran update.sh

.gitignore

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #################
 ## Eclipse
 #################
@@ -164,3 +165,79 @@ pip-log.txt
 
 # Tortoise SVN
 *.svn
+=======
+*.d
+*.pyc
+*.lo
+*.o
+*.so
+*.lo
+*.o
+*.la
+*.a
+*.swp
+*.save
+*.cmd
+*~
+*.gch
+dist*
+jam-files/bjam
+jam-files/engine/bootstrap
+jam-files/engine/bin.*
+lm/build_binary
+lm/query
+mert/evaluator
+mert/extractor
+mert/mert
+mert/megam_i686.opt
+mert/pro
+mert/kbmira
+misc/processLexicalTable
+misc/processPhraseTable
+misc/queryLexicalTable
+mira/mira
+mira/Makefile
+mira/Makefile.in
+misc/queryPhraseTable
+moses-chart-cmd/src/moses_chart
+moses-cmd/src/checkplf
+moses-cmd/src/lmbrgrid
+moses-cmd/src/moses
+regression-testing/moses-reg-test-data-*
+regression-testing/tests/mert.extractor-bin/FEATSTAT*
+regression-testing/tests/mert.extractor-bin/SCORESTAT*
+scripts/ems/biconcor/biconcor
+scripts/release-exclude
+scripts/training/cmert-0.5/mert
+scripts/training/compact-rule-table/tools/compactify
+scripts/training/eppex/counter
+scripts/training/eppex/eppex
+scripts/training/lexical-reordering/score
+scripts/training/memscore/memscore
+scripts/training/mbr/mbr
+scripts/training/phrase-extract/consolidate
+scripts/training/phrase-extract/consolidate-direct
+scripts/training/phrase-extract/consolidate-reverse
+scripts/training/phrase-extract/extract
+scripts/training/phrase-extract/extract-ghkm/tools/extract-ghkm
+scripts/training/phrase-extract/extract-lex
+scripts/training/phrase-extract/extract-rules
+scripts/training/phrase-extract/relax-parse
+scripts/training/phrase-extract/score
+scripts/training/phrase-extract/statistics
+scripts/training/symal/symal
+scripts/training/train-model.perl
+dist
+bin
+previous.sh
+contrib/other-builds/*.xcodeproj/project.xcworkspace/
+contrib/other-builds/*.xcodeproj/xcuserdata/
+*/*.xcodeproj/project.xcworkspace
+*/*.xcodeproj/xcuserdata
+
+mert/sentence-bleu
+._*
+.DS_Store
+*.pbxuser
+*.mode1v3
+>>>>>>> 81ad92cc3f4653bc6ff19b63faae19e52606faec

.gitmodules

@@ -0,0 +1,21 @@
+<<<<<<< HEAD
+[submodule "TesseractTrainer"]
+	path = TesseractTrainer
+	url = git://github.com/BaltoRouberol/TesseractTrainer.git
+[submodule "mosesdecoder"]
+	path = mosesdecoder
+	url = git://github.com/moses-smt/mosesdecoder.git
+[submodule "tesseract-trainer"]
+	path = tesseract-trainer
+	url = git://github.com/BaltoRouberol/TesseractTrainer.git
+[submodule "moses-smt"]
+	path = moses-smt
+	url = git://github.com/moses-smt/mosesdecoder.git
+=======
+[submodule "contrib/arrow-pipelines/python/pcl"]
+	path = contrib/arrow-pipelines/python/pcl
+	url = https://github.com/ianj-als/pcl.git
+[submodule "contrib/omtc/omtc"]
+	path = contrib/omtc/omtc
+	url = https://github.com/ianj-als/omtc.git
+>>>>>>> 81ad92cc3f4653bc6ff19b63faae19e52606faec

BUILD-INSTRUCTIONS.txt

@@ -0,0 +1,143 @@
+PRELIMINARIES
+
+Moses is primarily targeted at gcc on UNIX.  
+
+Moses requires gcc, Boost >= 1.36, and zlib including the headers that some
+distributions package separately (i.e. -dev or -devel packages).  Source is
+available at http://boost.org .
+
+There are several optional dependencies:
+
+GIZA++ from http://code.google.com/p/giza-pp/ is used to align words in the parallel corpus during training.
+
+Moses server requires xmlrpc-c with abyss-server.  Source is available from
+http://xmlrpc-c.sourceforge.net/.  
+
+The scripts support building ARPA format language models with SRILM or IRSTLM.
+To apply models inside the decoder, you can use SRILM, IRSTLM, or KenLM.  The
+ARPA format is exchangable so that e.g. you can build a model with SRILM and
+run the decoder with IRSTLM or KenLM.
+
+If you want to use SRILM, you will need to download its source and build it.  
+The SRILM can be downloaded from 
+http://www.speech.sri.com/projects/srilm/download.html .
+On x86_64, the default machine type is broken.  Edit sbin/machine-type, find
+this code
+    else if (`uname -m` == x86_64) then
+        set MACHINE_TYPE = i686
+and change it to
+    else if (`uname -m` == x86_64) then
+        set MACHINE_TYPE = i686-m64
+You may have to chmod +w sbin/machine-type first.  
+
+If you want to use IRSTLM, you will need to download its source and build it.  
+The IRSTLM can be downloaded from either the SourceForge website
+http://sourceforge.net/projects/irstlm
+or the official IRSTLM website
+http://hlt.fbk.eu/en/irstlm
+
+KenLM is included with Moses.  
+
+--------------------------------------------------------------------------
+
+ADVICE ON INSTALLING EXTERNAL LIBRARIES
+
+Generally, for trouble installing external libraries, you should get support
+directly from the library maker:
+
+Boost: http://www.boost.org/doc/libs/release/more/getting_started/unix-variants.html
+IRSTLM: https://list.fbk.eu/sympa/subscribe/user-irstlm
+SRILM: http://www.speech.sri.com/projects/srilm/#srilm-user
+
+However, here's some general advice on installing software (for bash users):
+
+#Determine where you want to install packages
+PREFIX=$HOME/usr
+#If your system has lib64 directories, lib64 should be used AND NOT lib  
+if [ -d /lib64 ]; then
+  LIBDIR=$PREFIX/lib64
+else
+  LIBDIR=$PREFIX/lib
+fi
+#If you're installing to a non-standard path, tell programs where to find things:
+export PATH=$PREFIX/bin${PATH:+:$PATH}
+export LD_LIBRARY_PATH=$LIBDIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+export LIBRARY_PATH=$LIBDIR${LIBRARY_PATH:+:$LIBRARY_PATH}
+export CPATH=$PREFIX/include${CPATH:+:$CPATH}
+
+Add all the above code to your .bashrc or .bash_login as appropriate.  Then
+you're ready to install packages in non-standard paths:
+
+#For autotools packages e.g. xmlrpc-c and zlib
+./configure --prefix=$PREFIX --libdir=$LIBDIR [other options here]
+
+#tcmalloc is a malloc implementation with threaded performance.  To see how it
+#improves Moses performance, read
+# http://www.mail-archive.com/moses-support@mit.edu/msg07303.html
+#It is part of gperftools which can be downloaded from from
+# https://code.google.com/p/gperftools/downloads/list
+#configure with this:
+./configure --prefix=$PREFIX --libdir=$LIBDIR --enable-shared --enable-static --enable-minimal
+
+#For bzip2:
+wget http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
+tar xzvf bzip2-1.0.6.tar.gz
+cd bzip2-1.0.6/
+#Compile and install libbz2.a (static library)
+make
+make install PREFIX=$PREFIX
+mkdir -p $LIBDIR
+#Note this may be the same file; you can ignore the error
+mv $PREFIX/lib/libbz2.a $LIBDIR 2>/dev/null
+#Compile and install libbz2.so (dynamic library)
+make clean
+make -f Makefile-libbz2_so
+cp libbz2.so.* $LIBDIR
+ln -sf libbz2.so.1.0 $LIBDIR/libbz2.so
+
+#For Boost:
+./bootstrap.sh
+./b2 --prefix=$PREFIX --libdir=$LIBDIR --layout=tagged link=static,shared threading=multi,single install || echo FAILURE
+
+--------------------------------------------------------------------------
+
+BUILDING
+
+Building consists of running
+  ./bjam [options]
+
+Common options are:
+--with-srilm=/path/to/srilm to compile the decoder with SRILM support
+--with-irstlm=/path/to/irstlm to compile the decoder with IRSTLM support
+-jN where N is the number of CPUs
+
+--with-macports=/path/to/macports use MacPorts on Mac OS X.
+
+If you leave out /path/to/macports bjam will use the /opt/local as default.
+You don't have to use --with-boost with-macports as it is implicitly set.
+Also note that using --with-macports automatically triggers "using darwin".
+
+Binaries will appear in dist/bin.  
+
+You can clean up data from previous builds using
+  ./bjam --clean
+
+For further documentation, run 
+  ./bjam --help
+
+--------------------------------------------------------------------------
+
+ALTERNATIVE WAYS TO BUILD ON UNIX AND OTHER PLATFORMS
+
+Microsoft Windows
+-----------------
+Moses is primarily targeted at gcc on UNIX.  Windows users should
+install using Cygwin. Outdated instructions can be found here:
+http://ssli.ee.washington.edu/people/amittai/Moses-on-Win7.pdf .
+
+Binaries for all external libraries needed can be downloaded from 
+	http://www.statmt.org/moses/?n=Moses.LibrariesUsed
+
+Only the decoder is developed and tested under Windows. There are
+difficulties using the training scripts under Windows, even with
+Cygwin, but it can be done.

HOWTO

@@ -0,0 +1 @@
+tesseract-gle-uncial/scripts/HOWTO