OK

64 files changed, 170 insertions, 250 deletions

diff --git a/experimental/dual-model/MGIZA/src/.deps/cmd.Po b/experimental/dual-model/MGIZA/src/.deps/cmd.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/cmd.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/d4norm-d4norm.Po b/experimental/dual-model/MGIZA/src/.deps/d4norm-d4norm.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/d4norm-d4norm.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/hmmnorm-hmmnorm.Po b/experimental/dual-model/MGIZA/src/.deps/hmmnorm-hmmnorm.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/hmmnorm-hmmnorm.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-ATables.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-ATables.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-ATables.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-AlignTables.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-AlignTables.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-AlignTables.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-Dictionary.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-Dictionary.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-Dictionary.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-ForwardBackward.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-ForwardBackward.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-ForwardBackward.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-HMMTables.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-HMMTables.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-HMMTables.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-MoveSwapMatrix.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-MoveSwapMatrix.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-MoveSwapMatrix.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-NTables.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-NTables.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-NTables.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-Parameter.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-Parameter.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-Parameter.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-Perplexity.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-Perplexity.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-Perplexity.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-SetArray.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-SetArray.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-SetArray.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-TTables.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-TTables.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-TTables.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-alignment.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-alignment.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-alignment.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-collCounts.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-collCounts.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-collCounts.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-getSentence.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-getSentence.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-getSentence.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-hmm.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-hmm.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-hmm.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-logprob.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-logprob.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-logprob.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model1.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model1.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model1.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model2.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model2.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model2.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model2to3.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model2to3.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model2to3.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model3.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model3.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model3.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model345-peg.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model345-peg.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model345-peg.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model3_viterbi.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model3_viterbi.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model3_viterbi.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model3_viterbi_with_tricks.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model3_viterbi_with_tricks.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-model3_viterbi_with_tricks.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-myassert.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-myassert.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-myassert.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-parse.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-parse.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-parse.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-reports.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-reports.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-reports.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-transpair_model3.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-transpair_model3.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-transpair_model3.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-transpair_model4.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-transpair_model4.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-transpair_model4.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-transpair_model5.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-transpair_model5.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-transpair_model5.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-utility.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-utility.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-utility.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-vocab.Po b/experimental/dual-model/MGIZA/src/.deps/libgiza_a-vocab.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/libgiza_a-vocab.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/mgiza-main.Po b/experimental/dual-model/MGIZA/src/.deps/mgiza-main.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/mgiza-main.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/plain2snt.Po b/experimental/dual-model/MGIZA/src/.deps/plain2snt.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/plain2snt.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/snt2cooc-snt2cooc.Po b/experimental/dual-model/MGIZA/src/.deps/snt2cooc-snt2cooc.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/snt2cooc-snt2cooc.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/snt2plain.Po b/experimental/dual-model/MGIZA/src/.deps/snt2plain.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/snt2plain.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/.deps/symal.Po b/experimental/dual-model/MGIZA/src/.deps/symal.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/.deps/symal.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/Makefile.in b/experimental/dual-model/MGIZA/src/Makefile.in
index 62c8b7b..cc9f259 100644
--- a/experimental/dual-model/MGIZA/src/Makefile.in
+++ b/experimental/dual-model/MGIZA/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -31,8 +31,6 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
 bin_PROGRAMS = mgiza$(EXEEXT) snt2cooc$(EXEEXT) snt2plain$(EXEEXT) \
 	plain2snt$(EXEEXT) symal$(EXEEXT) hmmnorm$(EXEEXT) \
 	d4norm$(EXEEXT)
@@ -54,6 +52,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
 libLIBRARIES_INSTALL = $(INSTALL_DATA)
 LIBRARIES = $(lib_LIBRARIES)
+AR = ar
 ARFLAGS = cru
 libgiza_a_AR = $(AR) $(ARFLAGS)
 libgiza_a_LIBADD =
@@ -83,19 +82,16 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_d4norm_OBJECTS = d4norm-d4norm.$(OBJEXT)
 d4norm_OBJECTS = $(am_d4norm_OBJECTS)
-d4norm_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(d4norm_CXXFLAGS) $(CXXFLAGS) \
+d4norm_LINK = $(CXXLD) $(d4norm_CXXFLAGS) $(CXXFLAGS) \
 	$(d4norm_LDFLAGS) $(LDFLAGS) -o $@
 am_hmmnorm_OBJECTS = hmmnorm-hmmnorm.$(OBJEXT)
 hmmnorm_OBJECTS = $(am_hmmnorm_OBJECTS)
-hmmnorm_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(hmmnorm_CXXFLAGS) $(CXXFLAGS) \
+hmmnorm_LINK = $(CXXLD) $(hmmnorm_CXXFLAGS) $(CXXFLAGS) \
 	$(hmmnorm_LDFLAGS) $(LDFLAGS) -o $@
 am_mgiza_OBJECTS = mgiza-main.$(OBJEXT)
 mgiza_OBJECTS = $(am_mgiza_OBJECTS)
-mgiza_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(mgiza_CXXFLAGS) $(CXXFLAGS) \
-	$(mgiza_LDFLAGS) $(LDFLAGS) -o $@
+mgiza_LINK = $(CXXLD) $(mgiza_CXXFLAGS) $(CXXFLAGS) $(mgiza_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_plain2snt_OBJECTS = plain2snt.$(OBJEXT)
 plain2snt_OBJECTS = $(am_plain2snt_OBJECTS)
 plain2snt_LDADD = $(LDADD)
@@ -113,22 +109,13 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
 SOURCES = $(libgiza_a_SOURCES) $(d4norm_SOURCES) $(hmmnorm_SOURCES) \
 	$(mgiza_SOURCES) $(plain2snt_SOURCES) $(snt2cooc_SOURCES) \
 	$(snt2plain_SOURCES) $(symal_SOURCES)
@@ -150,7 +137,6 @@ DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -161,43 +147,30 @@ CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
-CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -206,7 +179,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
-SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -217,29 +189,20 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
-build = @build@
 build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-host = @host@
 host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -248,7 +211,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -472,13 +434,13 @@ SUBDIRS = \
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .cpp .cxx .lo .o .obj
+.SUFFIXES: .c .cpp .cxx .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -541,11 +503,10 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
-	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -558,11 +519,7 @@ uninstall-binPROGRAMS:
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 d4norm$(EXEEXT): $(d4norm_OBJECTS) $(d4norm_DEPENDENCIES) 
 	@rm -f d4norm$(EXEEXT)
 	$(d4norm_LINK) $(d4norm_OBJECTS) $(d4norm_LDADD) $(LIBS)
@@ -645,13 +602,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -666,13 +616,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-.cpp.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-
 libgiza_a-alignment.o: alignment.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-alignment.o -MD -MP -MF $(DEPDIR)/libgiza_a-alignment.Tpo -c -o libgiza_a-alignment.o `test -f 'alignment.cpp' || echo '$(srcdir)/'`alignment.cpp
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-alignment.Tpo $(DEPDIR)/libgiza_a-alignment.Po
@@ -1177,19 +1120,6 @@ snt2cooc-snt2cooc.obj: snt2cooc.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-.cxx.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -1265,7 +1195,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1398,7 +1328,7 @@ maintainer-clean-generic:
 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \
-	clean-libtool mostlyclean-am
+	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
@@ -1441,8 +1371,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
 pdf: pdf-recursive
 
@@ -1459,18 +1388,17 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLIBRARIES
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLIBRARIES clean-libtool ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-libLIBRARIES install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	clean-generic clean-libLIBRARIES ctags ctags-recursive \
+	distclean distclean-compile distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-binPROGRAMS install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-libLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-libLIBRARIES
 
diff --git a/experimental/dual-model/MGIZA/src/TTables.cpp b/experimental/dual-model/MGIZA/src/TTables.cpp
index 1e4f3b6..4ee32bf 100644
--- a/experimental/dual-model/MGIZA/src/TTables.cpp
+++ b/experimental/dual-model/MGIZA/src/TTables.cpp
@@ -86,6 +86,10 @@ void tmodel<COUNT, PROB>::printProbTable(const char *filename,
 					 const bool actual) const
 {
 	ofstream of(filename);
+	if(!of){
+		cerr << "Failed to open " << filename << endl;
+		return;
+	}
 	/*  for(unsigned int i=0;i<es.size()-1;++i)
 	for(unsigned int j=es[i];j<es[i+1];++j)
 	{
@@ -104,7 +108,12 @@ void tmodel<COUNT, PROB>::printProbTable(const char *filename,
 				WordIndex e=i,f=(*lexmat[i])[j].first;
 				if( x.prob>PROB_SMOOTH ){
 					if( actual ){
-						of << evlist[e].word << ' ' << fvlist[f].word << ' ' << x.prob << '\n';
+//						cerr << e <<" " << f << endl;
+						if(!(e < evlist.size() && f<fvlist.size())){
+							cerr << "Error, word not found in vocabulary" << e << " " << f <<" " << evlist.size() << " " << fvlist.size() << endl;
+							continue;
+						}
+						of <<fvlist[e].word << ' ' << evlist[f].word << ' ' << x.prob << '\n';
 					}else{
 						of << e << ' ' << f << ' ' << x.prob << '\n';
 					}
diff --git a/experimental/dual-model/MGIZA/src/TTables.h b/experimental/dual-model/MGIZA/src/TTables.h
index 2120ef6..5a52a21 100644
--- a/experimental/dual-model/MGIZA/src/TTables.h
+++ b/experimental/dual-model/MGIZA/src/TTables.h
@@ -148,6 +148,9 @@ class tmodel{
 	typedef LpPair<COUNT, PROB> CPPair;
 public:
 	bool recordDiff;
+	float wt,wmle; // The weight of normal t table and the weight of mle table from manual alignment
+// By now it is fixed
+	tmodel<COUNT,PROB> *secT; // Secondary 
         
 public:
 	int noEnglishWords;  // total number of unique source words
@@ -162,6 +165,24 @@ public:
 		if(p)
 			*p=CPPair(0,0);
 	};
+
+	void init_constant(COUNT c){
+		for (WordIndex e = 0; e < lexmat.size(); e++){
+			if (lexmat[e])
+			for (WordIndex f = 0 ; f < lexmat[e]->size();f++){
+//				cerr << e << " " << f << endl;
+				(*(lexmat[e]))[f].second.count = c;
+			}
+		}
+	}
+
+	void inc_constant(COUNT c){
+		for (WordIndex e = 0; e < lexmat.size(); e++){
+			for (WordIndex f = 0 ; f < lexmat[e]->size();f++){
+				(*(lexmat[e]))[f].second.count += c;
+			}
+		}
+	}
       
     CPPair*find(int e,int f){
 		//pair<unsigned int,CPPair> *be=&(fs[0])+es[e];
@@ -181,6 +202,9 @@ public:
 	}
       
 	const CPPair*find(int e,int f)const{
+		if(e>lexmat.size()||lexmat[e]==NULL){
+			return NULL;
+		}
         const pair<unsigned int,CPPair> *be=&(*lexmat[e])[0];
 		const pair<unsigned int,CPPair> *en=&(*lexmat[e])[0]+(*lexmat[e]).size();
 		//const pair<unsigned int,CPPair> *be=&(fs[0])+es[e];
@@ -297,8 +321,13 @@ public:
 
 	PROB getProb(WordIndex e, WordIndex f) const{
 		const CPPair *p=find(e,f);
-        if( p )
-            return max(p->prob, PROB_SMOOTH);
+        if( p ){
+			float w = p->prob;
+			if(secT && wmle) {
+				w = w*wt + secT->getProb(e,f)*wmle;
+			}
+			return max(p->prob, PROB_SMOOTH);
+		}
         else
             return PROB_SMOOTH;
     }
diff --git a/experimental/dual-model/MGIZA/src/collCounts.cpp b/experimental/dual-model/MGIZA/src/collCounts.cpp
index 051d8cc..2663898 100644
--- a/experimental/dual-model/MGIZA/src/collCounts.cpp
+++ b/experimental/dual-model/MGIZA/src/collCounts.cpp
@@ -265,7 +265,14 @@ template<class TRANSPAIR, class MODEL> int collectCountsOverNeighborhood(
 		all_total+=this_total;
 	}
 	_total=all_total;
-	all_total/=(double)count;
+	if(count==0){
+		cerr << "WARNING: COUNT ==0" << endl;
+	}else
+		all_total/=(double)count;
+	if(isinf(all_total)){
+		cerr << "ALL_TOTAL is INF\n" ;
+		return 0;
+	}
 	double sum2=0;
 	if (addCounts && d4Table) {
 		for (unsigned int i=0; i<smsc.size(); ++i) {
@@ -275,13 +282,17 @@ template<class TRANSPAIR, class MODEL> int collectCountsOverNeighborhood(
 					*smsc[i].first, smsc[i].second/all_total, d4Table);
 		}
 		if (!(fabs(count-sum2)<0.05))
-			cerr << "WARNING: DIFFERENT SUMS: (" << count << ") (" << sum2
+			cerr << "WARNING: DIFFERENT SUMS: (" << count << ") (" << sum2 << ") (" << all_total
 					<< ")\n";
 	}
 
 	/**
 	 NOTE! HERE IS THE UPDATE PROCESS！
 	 */
+	if(fabs(all_total)==0){
+		// Error
+		cerr << "Hill climbing yields zero count " << endl;
+	}else{
 	if (addCounts) {
 		for (PositionIndex i=0; i<=l; i++) {
 			for (PositionIndex j=1; j<=m; j++) {
@@ -298,7 +309,7 @@ template<class TRANSPAIR, class MODEL> int collectCountsOverNeighborhood(
 		}
 		p0count+=p0/all_total;
 		p1count+=p1/all_total;
-	}
+	}}
 	return nAl;
 }
 
diff --git a/experimental/dual-model/MGIZA/src/main.cpp b/experimental/dual-model/MGIZA/src/main.cpp
index b0e6677..84c0b70 100644
--- a/experimental/dual-model/MGIZA/src/main.cpp
+++ b/experimental/dual-model/MGIZA/src/main.cpp
@@ -63,6 +63,7 @@ GLOBAL_PARAMETER2(bool,Verbose,"verbose","v","0: not verbose; 1: verbose",PARLEV
 GLOBAL_PARAMETER(bool,Log,"log","0: no logfile; 1: logfile",PARLEV_OUTPUT,0);
 
 GLOBAL_PARAMETER(double,P0,"p0","fixed value for parameter p_0 in IBM-3/4 (if negative then it is determined in training)",PARLEV_EM,-1.0);
+GLOBAL_PARAMETER(double,pmle,"pmle","The weight of MLE lexicon table",PARLEV_EM,0.1);
 GLOBAL_PARAMETER(double,M5P0,"m5p0","fixed value for parameter p_0 in IBM-5 (if negative then it is determined in training)",PARLEV_EM,-1.0);
 GLOBAL_PARAMETER3(bool,Peg,"pegging","p","DO PEGGING? (Y/N)","0: no pegging; 1: do pegging",PARLEV_EM,0);
 
@@ -579,6 +580,10 @@ double StartTraining(int&result) {
 
 	//ifstream coocs(CoocurrenceFile.c_str());
 	tmodel<COUNT, PROB> tTable(CoocurrenceFile);
+	tmodel<COUNT, PROB> *mle = NULL;
+	if(pmle>0){
+		mle = new tmodel<COUNT,PROB>(CoocurrenceFile);
+	}
 	cerr << "cooc file loading completed" << endl;
 	
 
@@ -654,7 +659,20 @@ double StartTraining(int&result) {
 	model1 m1(CorpusFilename.c_str(), eTrainVcbList, fTrainVcbList, tTable,
 			trainPerp, *corpus, &testPerp, testCorpus, trainViterbiPerp,
 			&testViterbiPerp);
+	m1.tTable2 = mle;
+	if(mle){
+		cerr << "Build secondary translation table" << endl;
+		m1.mle_with_links(*corpus);
+		cerr << "Done" << endl;
+		m1.tTable.secT = mle;
+		m1.tTable.secT->secT = NULL;
+		m1.tTable.secT->wt = 1;
+		m1.tTable.secT->wmle = 0;
+	}
+	m1.tTable.wt = 1- pmle;
+	m1.tTable.wmle = pmle;
 	cerr << "Model one initalization OK" << endl;
+
 	amodel<PROB> aTable(false);
 	
 	if (restart >2 && restart != 4 ){ // 1 is model 1, 2 is model 2 init, both just need t-table, 4 is directly train HMM from model one
@@ -914,6 +932,8 @@ double StartTraining(int&result) {
 		}
 	}
 	result=minIter;
+	if(mle)
+		delete mle;
 	return errors;
 }
 
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-GDAOptimization.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-GDAOptimization.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-GDAOptimization.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-HCOptimization.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-HCOptimization.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-HCOptimization.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-IterOptimization.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-IterOptimization.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-IterOptimization.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-KategProblem.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-KategProblem.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-KategProblem.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-KategProblemKBC.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-KategProblemKBC.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-KategProblemKBC.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-KategProblemTest.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-KategProblemTest.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-KategProblemTest.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-KategProblemWBC.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-KategProblemWBC.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-KategProblemWBC.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-MYOptimization.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-MYOptimization.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-MYOptimization.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-Optimization.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-Optimization.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-Optimization.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-Problem.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-Problem.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-Problem.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-ProblemTest.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-ProblemTest.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-ProblemTest.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-RRTOptimization.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-RRTOptimization.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-RRTOptimization.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-SAOptimization.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-SAOptimization.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-SAOptimization.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-StatVar.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-StatVar.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-StatVar.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-TAOptimization.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-TAOptimization.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-TAOptimization.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-general.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-general.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-general.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-mkcls.Po b/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-mkcls.Po
deleted file mode 100644
index 9ce06a8..0000000
--- a/experimental/dual-model/MGIZA/src/mkcls/.deps/mkcls-mkcls.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/experimental/dual-model/MGIZA/src/mkcls/Makefile.in b/experimental/dual-model/MGIZA/src/mkcls/Makefile.in
index dc69fc2..a08b2f2 100644
--- a/experimental/dual-model/MGIZA/src/mkcls/Makefile.in
+++ b/experimental/dual-model/MGIZA/src/mkcls/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30,8 +30,6 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
 bin_PROGRAMS = mkcls$(EXEEXT)
 subdir = src/mkcls
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -57,30 +55,20 @@ am_mkcls_OBJECTS = mkcls-GDAOptimization.$(OBJEXT) \
 	mkcls-StatVar.$(OBJEXT) mkcls-TAOptimization.$(OBJEXT)
 mkcls_OBJECTS = $(am_mkcls_OBJECTS)
 mkcls_LDADD = $(LDADD)
-mkcls_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(mkcls_CXXFLAGS) $(CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+mkcls_LINK = $(CXXLD) $(mkcls_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(mkcls_SOURCES)
 DIST_SOURCES = $(mkcls_SOURCES)
 ETAGS = etags
@@ -88,7 +76,6 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -99,43 +86,30 @@ CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
-CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -144,7 +118,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
-SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -155,29 +128,20 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
-build = @build@
 build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-host = @host@
 host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
@@ -186,7 +150,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -252,13 +215,13 @@ mkcls_CXXFLAGS = \
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
+.SUFFIXES: .cpp .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -288,11 +251,10 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
-	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -305,11 +267,7 @@ uninstall-binPROGRAMS:
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 mkcls$(EXEEXT): $(mkcls_OBJECTS) $(mkcls_DEPENDENCIES) 
 	@rm -f mkcls$(EXEEXT)
 	$(mkcls_LINK) $(mkcls_OBJECTS) $(mkcls_LDADD) $(LIBS)
@@ -352,13 +310,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-.cpp.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-
 mkcls-GDAOptimization.o: GDAOptimization.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-GDAOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-GDAOptimization.Tpo -c -o mkcls-GDAOptimization.o `test -f 'GDAOptimization.cpp' || echo '$(srcdir)/'`GDAOptimization.cpp
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-GDAOptimization.Tpo $(DEPDIR)/mkcls-GDAOptimization.Po
@@ -597,18 +548,12 @@ mkcls-TAOptimization.obj: TAOptimization.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-TAOptimization.obj `if test -f 'TAOptimization.cpp'; then $(CYGPATH_W) 'TAOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/TAOptimization.cpp'; fi`
 
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -709,7 +654,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -752,8 +697,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
 pdf: pdf-am
 
@@ -768,18 +712,17 @@ uninstall-am: uninstall-binPROGRAMS
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
+	clean-generic ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/experimental/dual-model/MGIZA/src/model1.cpp b/experimental/dual-model/MGIZA/src/model1.cpp
index e649f8d..8052434 100644
--- a/experimental/dual-model/MGIZA/src/model1.cpp
+++ b/experimental/dual-model/MGIZA/src/model1.cpp
@@ -43,14 +43,14 @@ model1::model1(const char* efname, vcbList& evcblist, vcbList& fvcblist,tmodel<C
   eTotalWCount(Elist.totalVocab()), fTotalWCount(Flist.totalVocab()), 
   noEnglishWords(Elist.size()), noFrenchWords(Flist.size()), tTable(_tTable),
   evlist(Elist.getVocabList()), fvlist(Flist.getVocabList())
-{}
+{tTable2 = NULL;}
 
 model1::model1 (const model1& m1, int _threadID):
 report_info(m1),efFilename(m1.efFilename),
 Elist(m1.Elist),Flist(m1.Flist),eTotalWCount(m1.eTotalWCount),fTotalWCount(m1.fTotalWCount),
 noEnglishWords(m1.noEnglishWords),noFrenchWords(m1.noFrenchWords),tTable(m1.tTable),
 evlist(m1.evlist),fvlist(m1.fvlist)
-{}
+{tTable2 = NULL;}
 
 void model1::initialize_table_uniformly(sentenceHandler& sHandler1){
   WordIndex i, j;
@@ -64,10 +64,44 @@ void model1::initialize_table_uniformly(sentenceHandler& sHandler1){
     Vector<WordIndex>& fs = sent.fSent;
     PROB uniform = 1.0/es.size() ;
     for( i=0; i < es.size(); i++)
-          for(j=1; j < fs.size(); j++)
-          tTable.insert(es[i],fs[j],0,uniform);
+      for(j=1; j < fs.size(); j++)
+      tTable.insert(es[i],fs[j],0,uniform);
+	
   }
 }
+void model1::mle_with_links(sentenceHandler& sHandler1){
+	if(tTable2){
+		tTable2->init_constant(1e-10);
+	}else{
+		return;
+	}
+	WordIndex i, j;
+
+  cout << "Initialize tTable (cost)\n";
+
+  sentPair sent ;
+  sHandler1.rewind();
+  while(sHandler1.getNextSentence(sent)){
+    Vector<WordIndex>& es = sent.eSent;
+    Vector<WordIndex>& fs = sent.fSent;
+	for(int k = 0 ; k < sent.eAnchor.size(); k++){
+		i = sent.eAnchor[k];
+		j = sent.fAnchor[k];
+		if(i > es.size()||j > fs.size()){
+			continue;
+		}else{
+			tTable2->incCount(i,j,1);
+		}
+	}
+  }
+  tTable2->normalizeTable(Elist,Flist);
+  cerr << "Outputting MLE TTable file " << endl;
+  string rs = Prefix + ".tmle"  ;
+  cerr << "Before " << Elist.getVocabList().size() << " " << Flist.getVocabList().size()<<endl;
+  tTable2->printProbTable(rs.c_str(),Elist.getVocabList(),Flist.getVocabList(),false);
+
+}
+
 
 struct em_loop_t{
     model1 *m1;
diff --git a/experimental/dual-model/MGIZA/src/model1.h b/experimental/dual-model/MGIZA/src/model1.h
index cadc1e3..b152039 100644
--- a/experimental/dual-model/MGIZA/src/model1.h
+++ b/experimental/dual-model/MGIZA/src/model1.h
@@ -92,6 +92,7 @@ public:
     int noEnglishWords;
     int noFrenchWords;
     tmodel<COUNT, PROB>&tTable;
+    tmodel<COUNT, PROB> *tTable2; //Secondary T-Table
     Vector<WordEntry>& evlist ;
     Vector<WordEntry>& fvlist ;
     int threadID;
@@ -108,6 +109,7 @@ public:
     
     model1 (const model1& m1, int _threadID=0);
     void initialize_table_uniformly(sentenceHandler& sHandler1);
+    void mle_with_links(sentenceHandler& sHandler1);
     
     int em_with_tricks(int noIterations, 
         bool seedModel1, Dictionary& dictionary, bool useDict, bool dumpCount = false,