diff options
| -rw-r--r-- | contrib/other-builds/moses/.cproject | 12 | ||||
| -rw-r--r-- | contrib/other-builds/moses/.project | 75 | ||||
| -rw-r--r-- | moses/ExportInterface.cpp | 2 | ||||
| -rw-r--r-- | moses/TranslationModel/ProbingPT/line_splitter.cpp | 4 | ||||
| -rw-r--r-- | moses/TranslationModel/UG/mmsapt.cpp | 3 |
5 files changed, 47 insertions, 49 deletions
diff --git a/contrib/other-builds/moses/.cproject b/contrib/other-builds/moses/.cproject index 80b8bd141..b7d9152b9 100644 --- a/contrib/other-builds/moses/.cproject +++ b/contrib/other-builds/moses/.cproject @@ -71,8 +71,18 @@ <fileInfo id="cdt.managedbuild.config.gnu.exe.debug.1846963597.1272004353" name="BilingualLM.h" rcbsApplicability="disable" resourcePath="LM/BilingualLM.h" toolsToInvoke=""/> <fileInfo id="cdt.managedbuild.config.gnu.exe.debug.1846963597.1459438132" name="DALMWrapper.h" rcbsApplicability="disable" resourcePath="LM/DALMWrapper.h" toolsToInvoke=""/> <fileInfo id="cdt.managedbuild.config.gnu.exe.debug.1846963597.871386239" name="LDHT.h" rcbsApplicability="disable" resourcePath="LM/LDHT.h" toolsToInvoke=""/> + <folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1846963597.1794213083" name="/" resourcePath="TranslationModel/ProbingPT"> + <toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.82859340" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug" unusedChildren=""> + <tool id="cdt.managedbuild.tool.gnu.archiver.base.1921366786" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base.1097285966"/> + <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.134968597" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1729217620"/> + <tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1710850362" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1313249282"/> + <tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1196753099" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1471271407"/> + <tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1604515781" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1144959654"/> + <tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.903919080" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug.1362368838"/> + </toolChain> + </folderInfo> <sourceEntries> - <entry excluding="TranslationModel/UG/mm/test-http-client.cc|TranslationModel/UG/ptable-describe-features.cc|TranslationModel/UG/count-ptable-features.cc|TranslationModel/UG/try-align2.cc|TranslationModel/UG/try-align.cc|TranslationModel/UG/spe-check-coverage3.cc|TranslationModel/UG/spe-check-coverage2.cc|TranslationModel/UG/spe-check-coverage.cc|TranslationModel/UG/sim-pe.cc|TranslationModel/UG/generic/stringdist|TranslationModel/UG/mm/test-dynamic-im-tsa.cc|TranslationModel/UG/mm/mtt.count.cc|LM/ParallelBackoff.h|LM/ParallelBackoff.cpp|LM/bilingual-lm|LM/MaxEntSRI.h|LM/MaxEntSRI.cpp|LM/BilingualLM.h|LM/BilingualLM.cpp|LM/Rand.h|LM/Rand.cpp|LM/LDHT.h|LM/LDHT.cpp|LM/ORLM.h|LM/ORLM.cpp|LM/NeuralLMWrapper.h|LM/NeuralLMWrapper.cpp|LM/SRI.h|LM/SRI.cpp|LM/IRST.h|LM/IRST.cpp|LM/DALMWrapper.h|LM/DALMWrapper.cpp|LM/oxlm|TranslationModel/ProbingPT|TranslationModel/UG/util" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="TranslationModel/UG/mm/test-http-client.cc|TranslationModel/UG/ptable-describe-features.cc|TranslationModel/UG/count-ptable-features.cc|TranslationModel/UG/try-align2.cc|TranslationModel/UG/try-align.cc|TranslationModel/UG/spe-check-coverage3.cc|TranslationModel/UG/spe-check-coverage2.cc|TranslationModel/UG/spe-check-coverage.cc|TranslationModel/UG/sim-pe.cc|TranslationModel/UG/generic/stringdist|TranslationModel/UG/mm/test-dynamic-im-tsa.cc|TranslationModel/UG/mm/mtt.count.cc|LM/ParallelBackoff.h|LM/ParallelBackoff.cpp|LM/bilingual-lm|LM/MaxEntSRI.h|LM/MaxEntSRI.cpp|LM/BilingualLM.h|LM/BilingualLM.cpp|LM/Rand.h|LM/Rand.cpp|LM/LDHT.h|LM/LDHT.cpp|LM/ORLM.h|LM/ORLM.cpp|LM/NeuralLMWrapper.h|LM/NeuralLMWrapper.cpp|LM/SRI.h|LM/SRI.cpp|LM/IRST.h|LM/IRST.cpp|LM/DALMWrapper.h|LM/DALMWrapper.cpp|LM/oxlm|TranslationModel/UG/util" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> diff --git a/contrib/other-builds/moses/.project b/contrib/other-builds/moses/.project index 85e27e694..009acf0ba 100644 --- a/contrib/other-builds/moses/.project +++ b/contrib/other-builds/moses/.project @@ -86,6 +86,16 @@ <locationURI>PARENT-3-PROJECT_LOC/moses/parameters/BeamSearchOptions.h</locationURI> </link> <link> + <name>Bitmap.cpp</name> + <type>1</type> + <locationURI>PARENT-3-PROJECT_LOC/moses/Bitmap.cpp</locationURI> + </link> + <link> + <name>Bitmap.h</name> + <type>1</type> + <locationURI>PARENT-3-PROJECT_LOC/moses/Bitmap.h</locationURI> + </link> + <link> <name>BitmapContainer.cpp</name> <type>1</type> <locationURI>PARENT-3-PROJECT_LOC/moses/BitmapContainer.cpp</locationURI> @@ -726,6 +736,16 @@ <locationURI>PARENT-3-PROJECT_LOC/moses/PrefixTreeMap.h</locationURI> </link> <link> + <name>Range.cpp</name> + <type>1</type> + <locationURI>PARENT-3-PROJECT_LOC/moses/Range.cpp</locationURI> + </link> + <link> + <name>Range.h</name> + <type>1</type> + <locationURI>PARENT-3-PROJECT_LOC/moses/Range.h</locationURI> + </link> + <link> <name>ReorderingConstraint.cpp</name> <type>1</type> <locationURI>PARENT-3-PROJECT_LOC/moses/ReorderingConstraint.cpp</locationURI> @@ -1136,26 +1156,6 @@ <locationURI>PARENT-3-PROJECT_LOC/moses/WordLattice.h</locationURI> </link> <link> - <name>Bitmap.cpp</name> - <type>1</type> - <locationURI>PARENT-3-PROJECT_LOC/moses/Bitmap.cpp</locationURI> - </link> - <link> - <name>Bitmap.h</name> - <type>1</type> - <locationURI>PARENT-3-PROJECT_LOC/moses/Bitmap.h</locationURI> - </link> - <link> - <name>Range.cpp</name> - <type>1</type> - <locationURI>PARENT-3-PROJECT_LOC/moses/Range.cpp</locationURI> - </link> - <link> - <name>Range.h</name> - <type>1</type> - <locationURI>PARENT-3-PROJECT_LOC/moses/Range.h</locationURI> - </link> - <link> <name>XmlOption.cpp</name> <type>1</type> <locationURI>PARENT-3-PROJECT_LOC/moses/XmlOption.cpp</locationURI> @@ -3256,11 +3256,6 @@ <locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/ProbingPT/storing.hh</locationURI> </link> <link> - <name>TranslationModel/ProbingPT/tests</name> - <type>2</type> - <locationURI>virtual:/virtual</locationURI> - </link> - <link> <name>TranslationModel/ProbingPT/vocabid.cpp</name> <type>1</type> <locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/ProbingPT/vocabid.cpp</locationURI> @@ -3701,16 +3696,6 @@ <locationURI>virtual:/virtual</locationURI> </link> <link> - <name>TranslationModel/ProbingPT/tests/tokenization_tests.cpp</name> - <type>1</type> - <locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/ProbingPT/tests/tokenization_tests.cpp</locationURI> - </link> - <link> - <name>TranslationModel/ProbingPT/tests/vocabid_test.cpp</name> - <type>1</type> - <locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel/ProbingPT/tests/vocabid_test.cpp</locationURI> - </link> - <link> <name>TranslationModel/UG/bin/gcc-4.8</name> <type>2</type> <locationURI>virtual:/virtual</locationURI> @@ -4486,6 +4471,11 @@ <locationURI>PARENT-3-PROJECT_LOC/moses/bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/BilingualLM.o</locationURI> </link> <link> + <name>bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/Bitmap.o</name> + <type>1</type> + <locationURI>PARENT-3-PROJECT_LOC/moses/bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/Bitmap.o</locationURI> + </link> + <link> <name>bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/BitmapContainer.o</name> <type>1</type> <locationURI>PARENT-3-PROJECT_LOC/moses/bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/BitmapContainer.o</locationURI> @@ -4761,6 +4751,11 @@ <locationURI>PARENT-3-PROJECT_LOC/moses/bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/PrefixTreeMap.o</locationURI> </link> <link> + <name>bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/Range.o</name> + <type>1</type> + <locationURI>PARENT-3-PROJECT_LOC/moses/bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/Range.o</locationURI> + </link> + <link> <name>bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/Remote.o</name> <type>1</type> <locationURI>PARENT-3-PROJECT_LOC/moses/bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/Remote.o</locationURI> @@ -4951,16 +4946,6 @@ <locationURI>PARENT-3-PROJECT_LOC/moses/bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/WordLattice.o</locationURI> </link> <link> - <name>bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/Bitmap.o</name> - <type>1</type> - <locationURI>PARENT-3-PROJECT_LOC/moses/bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/Bitmap.o</locationURI> - </link> - <link> - <name>bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/Range.o</name> - <type>1</type> - <locationURI>PARENT-3-PROJECT_LOC/moses/bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/Range.o</locationURI> - </link> - <link> <name>bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/XmlOption.o</name> <type>1</type> <locationURI>PARENT-3-PROJECT_LOC/moses/bin/gcc-4.8/release/debug-symbols-on/link-static/threading-multi/XmlOption.o</locationURI> diff --git a/moses/ExportInterface.cpp b/moses/ExportInterface.cpp index 5acb90a92..216eba335 100644 --- a/moses/ExportInterface.cpp +++ b/moses/ExportInterface.cpp @@ -229,8 +229,10 @@ batch_run() if (context_window) task->SetContextWindow(context_window); +#ifdef HAVE_XMLRPC_C if (context_weights != "" && !task->GetScope()->GetContextWeights()) task->GetScope()->SetContextWeights(context_weights); +#endif // Allow for (sentence-)context-specific processing prior to // decoding. This can be used, for example, for context-sensitive diff --git a/moses/TranslationModel/ProbingPT/line_splitter.cpp b/moses/TranslationModel/ProbingPT/line_splitter.cpp index 97ccfcae1..1425b35f6 100644 --- a/moses/TranslationModel/ProbingPT/line_splitter.cpp +++ b/moses/TranslationModel/ProbingPT/line_splitter.cpp @@ -16,10 +16,10 @@ line_text splitLine(StringPiece textin) //Get probabilities output.prob = *it; it++; - //Get WordAllignment 1 + //Get WordAllignment output.word_all1 = *it; it++; - //Get WordAllignment 2 + //Get count output.word_all2 = *it; return output; diff --git a/moses/TranslationModel/UG/mmsapt.cpp b/moses/TranslationModel/UG/mmsapt.cpp index 1110bc16a..4fa53d0f4 100644 --- a/moses/TranslationModel/UG/mmsapt.cpp +++ b/moses/TranslationModel/UG/mmsapt.cpp @@ -811,9 +811,9 @@ namespace Moses Mmsapt:: setup_bias(ttasksptr const& ttask) { +#ifdef HAVE_XMLRPC_C // VERBOSE(2,"Setting up bias at " << HERE << std::endl); - SPTR<ContextScope> const& scope = ttask->GetScope(); SPTR<ContextForQuery> context = scope->get<ContextForQuery>(btfix.get(), true); if (context->bias) return; @@ -853,6 +853,7 @@ namespace Moses context->bias_log = m_bias_log; context->bias->loglevel = m_bias_loglevel; } +#endif } void |