diff --git a/Jamroot b/Jamroot
index ccd792283..00a13d110 100644
--- a/Jamroot
+++ b/Jamroot
@@ -167,7 +167,7 @@ project : requirements
;
#Add directories here if you want their incidental targets too (i.e. tests).
-build-projects lm util phrase-extract search moses moses/LM mert moses-cmd moses-chart-cmd mira scripts regression-testing ;
+build-projects lm util phrase-extract search moses moses/LM mert moses-cmd mira scripts regression-testing ;
if [ option.get "with-mm" : : "yes" ]
{
@@ -195,7 +195,6 @@ else
alias programs :
lm//programs
-moses-chart-cmd//moses_chart
moses-cmd//programs
OnDiskPt//CreateOnDiskPt
OnDiskPt//queryOnDiskPt
@@ -216,7 +215,7 @@ mm
install-bin-libs programs ;
-install-headers headers-base : [ path.glob-tree biconcor contrib lm mert misc moses-chart-cmd moses-cmd OnDiskPt phrase-extract symal util : *.hh *.h ] : . ;
+install-headers headers-base : [ path.glob-tree biconcor contrib lm mert misc moses-cmd OnDiskPt phrase-extract symal util : *.hh *.h ] : . ;
install-headers headers-moses : moses//headers-to-install : moses ;
alias install : prefix-bin prefix-lib headers-base headers-moses ;
diff --git a/contrib/other-builds/moses-chart-cmd/.cproject b/contrib/other-builds/moses-chart-cmd/.cproject
deleted file mode 100644
index e244f8ac8..000000000
--- a/contrib/other-builds/moses-chart-cmd/.cproject
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/contrib/other-builds/moses-chart-cmd/.project b/contrib/other-builds/moses-chart-cmd/.project
deleted file mode 100644
index 16eb28b21..000000000
--- a/contrib/other-builds/moses-chart-cmd/.project
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
- moses-chart-cmd
-
-
- lm
- moses
- OnDiskPt
- search
- util
-
-
-
- org.eclipse.cdt.managedbuilder.core.genmakebuilder
- clean,full,incremental,
-
-
- ?name?
-
-
-
- org.eclipse.cdt.make.core.append_environment
- true
-
-
- org.eclipse.cdt.make.core.autoBuildTarget
- all
-
-
- org.eclipse.cdt.make.core.buildArguments
- -j3
-
-
- org.eclipse.cdt.make.core.buildCommand
- make
-
-
- org.eclipse.cdt.make.core.buildLocation
- ${workspace_loc:/moses-chart-cmd/Debug}
-
-
- org.eclipse.cdt.make.core.cleanBuildTarget
- clean
-
-
- org.eclipse.cdt.make.core.contents
- org.eclipse.cdt.make.core.activeConfigSettings
-
-
- org.eclipse.cdt.make.core.enableAutoBuild
- false
-
-
- org.eclipse.cdt.make.core.enableCleanBuild
- true
-
-
- org.eclipse.cdt.make.core.enableFullBuild
- true
-
-
- org.eclipse.cdt.make.core.fullBuildTarget
- all
-
-
- org.eclipse.cdt.make.core.stopOnError
- true
-
-
- org.eclipse.cdt.make.core.useDefaultBuildCmd
- true
-
-
-
-
- org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
- full,incremental,
-
-
-
-
-
- org.eclipse.cdt.core.cnature
- org.eclipse.cdt.core.ccnature
- org.eclipse.cdt.managedbuilder.core.managedBuildNature
- org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
-
-
-
- Jamfile
- 1
- PARENT-3-PROJECT_LOC/moses-chart-cmd/Jamfile
-
-
- Main.cpp
- 1
- PARENT-3-PROJECT_LOC/moses-chart-cmd/Main.cpp
-
-
- Main.h
- 1
- PARENT-3-PROJECT_LOC/moses-chart-cmd/Main.h
-
-
- mbr.cpp
- 1
- PARENT-3-PROJECT_LOC/moses-chart-cmd/mbr.cpp
-
-
- mbr.h
- 1
- PARENT-3-PROJECT_LOC/moses-chart-cmd/mbr.h
-
-
-
diff --git a/moses-chart-cmd/Jamfile b/moses-chart-cmd/Jamfile
deleted file mode 100644
index fe84871c7..000000000
--- a/moses-chart-cmd/Jamfile
+++ /dev/null
@@ -1,2 +0,0 @@
-exe moses_chart : Main.cpp mbr.cpp ../moses//moses $(TOP)//boost_iostreams ..//boost_filesystem ..//z ;
-
diff --git a/moses-chart-cmd/Main.cpp b/moses-chart-cmd/Main.cpp
deleted file mode 100644
index 30f847079..000000000
--- a/moses-chart-cmd/Main.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-// $Id$
-
-/***********************************************************************
-Moses - factored phrase-based language decoder
-Copyright (c) 2006 University of Edinburgh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the University of Edinburgh nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-***********************************************************************/
-
-// example file on how to use moses library
-
-#ifdef WIN32
-// Include Visual Leak Detector
-//#include
-#endif
-
-#include
-#include
-#include "Main.h"
-#include "moses/TranslationAnalysis.h"
-#include "mbr.h"
-#include "moses/IOWrapper.h"
-
-#include "moses/FactorCollection.h"
-#include "moses/HypergraphOutput.h"
-#include "moses/Manager.h"
-#include "moses/Phrase.h"
-#include "moses/Util.h"
-#include "moses/Timer.h"
-#include "moses/Sentence.h"
-#include "moses/ConfusionNet.h"
-#include "moses/WordLattice.h"
-#include "moses/TreeInput.h"
-#include "moses/ThreadPool.h"
-#include "moses/ChartManager.h"
-#include "moses/ChartHypothesis.h"
-#include "moses/FF/StatefulFeatureFunction.h"
-#include "moses/FF/StatelessFeatureFunction.h"
-#include "moses/TranslationTask.h"
-
-#include "util/usage.hh"
-#include "util/exception.hh"
-
-
-
-using namespace std;
-using namespace Moses;
-
-int main(int argc, char* argv[])
-{
- try {
- IFVERBOSE(1) {
- TRACE_ERR("command: ");
- for(int i=0; i > hypergraphOutput;
- if (staticData.GetOutputSearchGraphHypergraph()) {
- hypergraphOutput.reset(new HypergraphOutput(3));
- }
-
- if (ioWrapper == NULL)
- return EXIT_FAILURE;
-
-#ifdef WITH_THREADS
- ThreadPool pool(staticData.ThreadCount());
-#endif
-
- // read each sentence & decode
- InputType *source=NULL;
- size_t lineCount = staticData.GetStartTranslationId();
- while(ioWrapper->ReadInput(*ioWrapper,staticData.GetInputType(),source)) {
- source->SetTranslationId(lineCount);
- IFVERBOSE(1)
- ResetUserTime();
-
- FeatureFunction::CallChangeSource(source);
-
- TranslationTask *task = new TranslationTask(source, *ioWrapper, hypergraphOutput);
- source = NULL; // task will delete source
-#ifdef WITH_THREADS
- pool.Submit(task); // pool will delete task
-#else
- task->Run();
- delete task;
-#endif
- ++lineCount;
- }
-
-#ifdef WITH_THREADS
- pool.Stop(true); // flush remaining jobs
-#endif
-
- delete ioWrapper;
- FeatureFunction::Destroy();
-
- IFVERBOSE(1)
- PrintUserTime("End.");
-
- } catch (const std::exception &e) {
- std::cerr << "Exception: " << e.what() << std::endl;
- return EXIT_FAILURE;
- }
-
- IFVERBOSE(1) util::PrintUsage(std::cerr);
-
-#ifndef EXIT_RETURN
- //This avoids that detructors are called (it can take a long time)
- exit(EXIT_SUCCESS);
-#else
- return EXIT_SUCCESS;
-#endif
-}
-
diff --git a/moses-chart-cmd/Main.h b/moses-chart-cmd/Main.h
deleted file mode 100644
index 5c660b826..000000000
--- a/moses-chart-cmd/Main.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// $Id$
-
-/***********************************************************************
-Moses - factored phrase-based language decoder
-Copyright (c) 2006 University of Edinburgh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the University of Edinburgh nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-***********************************************************************/
-
-// example file on how to use moses library
-
-#pragma once
-
-#include "moses/StaticData.h"
-
-int main(int argc, char* argv[]);
diff --git a/moses-chart-cmd/mbr.cpp b/moses-chart-cmd/mbr.cpp
deleted file mode 100644
index 551378054..000000000
--- a/moses-chart-cmd/mbr.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#include
-#include
-#include
-#include
-#include
-#include