mirror of
https://github.com/moses-smt/mosesdecoder.git
synced 2024-09-11 11:25:40 +03:00
rename IOStream to IOWrapper.
move vs.net solution file to root folder git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1872 1f5c12ca-751b-0410-a591-d2e778427230
This commit is contained in:
parent
90e3107ef4
commit
5dee5d04aa
@ -40,7 +40,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\src";"$(SolutionDir)..\mysqlpp\lib";"$(SolutionDir)..\irstlm\src";"$(SolutionDir)..\srilm\src""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\moses\src""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -117,7 +117,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\src";"$(SolutionDir)..\mysqlpp\lib";"$(SolutionDir)..\irstlm\src";"$(SolutionDir)..\srilm\src""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\moses\src""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
@ -194,7 +194,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\src";"$(SolutionDir)..\mysqlpp\lib";"$(SolutionDir)..\irstlm\src";"$(SolutionDir)..\srilm\src""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\moses\src""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
@ -272,7 +272,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\src";"$(SolutionDir)..\mysqlpp\lib";"$(SolutionDir)..\irstlm\src";"$(SolutionDir)..\srilm\src""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\moses\src""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
|
@ -40,7 +40,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\src";"$(SolutionDir)..\mysqlpp\lib";"$(SolutionDir)..\irstlm\src";"$(SolutionDir)..\srilm\src""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\moses\src""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -117,7 +117,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\src";"$(SolutionDir)..\mysqlpp\lib";"$(SolutionDir)..\irstlm\src";"$(SolutionDir)..\srilm\src""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\moses\src""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
@ -194,7 +194,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\src";"$(SolutionDir)..\mysqlpp\lib";"$(SolutionDir)..\irstlm\src";"$(SolutionDir)..\srilm\src""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\moses\src""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
@ -272,7 +272,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\src";"$(SolutionDir)..\mysqlpp\lib";"$(SolutionDir)..\irstlm\src";"$(SolutionDir)..\srilm\src""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\moses\src""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
|
@ -40,7 +40,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\src";"$(SolutionDir)..\mysqlpp\lib";"$(SolutionDir)..\irstlm\src";"$(SolutionDir)..\srilm\src""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\moses\src""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;LM_INTERNAL;TRACE_ENABLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;EXIT_RETURN"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -62,7 +62,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies=""$(SolutionDir)$(ConfigurationName)\moses.lib" zlib.lib"
|
||||
OutputFile="$(ProjectDir)$(ConfigurationName)\$(ProjectName).exe"
|
||||
OutputFile="$(OutDir)\$(ProjectName).exe"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
@ -118,7 +118,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\src";"$(SolutionDir)..\mysqlpp\lib";"$(SolutionDir)..\irstlm\src";"$(SolutionDir)..\srilm\src""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\moses\src""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;LM_INTERNAL;TRACE_ENABLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;EXIT_RETURN"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
@ -138,7 +138,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies=""$(SolutionDir)$(ConfigurationName)\moses.lib" zlib.lib"
|
||||
OutputFile="$(ProjectDir)$(ConfigurationName)\$(ProjectName).exe"
|
||||
OutputFile="$(OutDir)\$(ProjectName).exe"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
@ -196,7 +196,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\src";"$(SolutionDir)..\mysqlpp\lib";"$(SolutionDir)..\irstlm\src";"$(SolutionDir)..\srilm\src""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\moses\src""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;LM_INTERNAL;LM_SRI;TRACE_ENABLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;EXIT_RETURN"
|
||||
RuntimeLibrary="0"
|
||||
UsePrecompiledHeader="0"
|
||||
@ -217,7 +217,7 @@
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/FORCE:MULTIPLE"
|
||||
AdditionalDependencies=""$(SolutionDir)$(ConfigurationName)\moses.lib" zlib.lib dstruct.lib flm.lib lattice.lib misc.lib oolm.lib"
|
||||
OutputFile="$(ProjectDir)$(ConfigurationName)\$(ProjectName).exe"
|
||||
OutputFile="$(OutDir)\$(ProjectName).exe"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
@ -275,7 +275,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\src";"$(SolutionDir)..\mysqlpp\lib";"$(SolutionDir)..\irstlm\src";"$(SolutionDir)..\srilm\src""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\moses\src""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;LM_INTERNAL;LM_SRI;TRACE_ENABLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;EXIT_RETURN"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -298,7 +298,7 @@
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/FORCE:MULTIPLE"
|
||||
AdditionalDependencies=""$(SolutionDir)$(ConfigurationName)\moses.lib" zlib.lib dstruct.lib flm.lib lattice.lib misc.lib oolm.lib"
|
||||
OutputFile="$(ProjectDir)$(ConfigurationName)\$(ProjectName).exe"
|
||||
OutputFile="$(OutDir)\$(ProjectName).exe"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
@ -339,7 +339,7 @@
|
||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\src\IOStream.cpp"
|
||||
RelativePath=".\src\IOWrapper.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@ -361,7 +361,7 @@
|
||||
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\src\IOStream.h"
|
||||
RelativePath=".\src\IOWrapper.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||
#include <iostream>
|
||||
#include "TypeDef.h"
|
||||
#include "Util.h"
|
||||
#include "IOStream.h"
|
||||
#include "IOWrapper.h"
|
||||
#include "Hypothesis.h"
|
||||
#include "WordsRange.h"
|
||||
#include "TrellisPathList.h"
|
||||
@ -45,7 +45,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
using namespace std;
|
||||
|
||||
IOStream::IOStream(
|
||||
IOWrapper::IOWrapper(
|
||||
const vector<FactorType> &inputFactorOrder
|
||||
, const vector<FactorType> &outputFactorOrder
|
||||
, const FactorMask &inputFactorUsed
|
||||
@ -65,7 +65,7 @@ IOStream::IOStream(
|
||||
, nBestSize, nBestFilePath);
|
||||
}
|
||||
|
||||
IOStream::IOStream(const std::vector<FactorType> &inputFactorOrder
|
||||
IOWrapper::IOWrapper(const std::vector<FactorType> &inputFactorOrder
|
||||
, const std::vector<FactorType> &outputFactorOrder
|
||||
, const FactorMask &inputFactorUsed
|
||||
, size_t nBestSize
|
||||
@ -87,7 +87,7 @@ IOStream::IOStream(const std::vector<FactorType> &inputFactorOrder
|
||||
m_inputStream = m_inputFile;
|
||||
}
|
||||
|
||||
IOStream::~IOStream()
|
||||
IOWrapper::~IOWrapper()
|
||||
{
|
||||
if (m_inputFile != NULL)
|
||||
delete m_inputFile;
|
||||
@ -105,7 +105,7 @@ IOStream::~IOStream()
|
||||
}
|
||||
}
|
||||
|
||||
void IOStream::Initialization(const std::vector<FactorType> &inputFactorOrder
|
||||
void IOWrapper::Initialization(const std::vector<FactorType> &inputFactorOrder
|
||||
, const std::vector<FactorType> &outputFactorOrder
|
||||
, const FactorMask &inputFactorUsed
|
||||
, size_t nBestSize
|
||||
@ -151,7 +151,7 @@ void IOStream::Initialization(const std::vector<FactorType> &inputFactorOrder
|
||||
}
|
||||
}
|
||||
|
||||
InputType*IOStream::GetInput(InputType* inputType)
|
||||
InputType*IOWrapper::GetInput(InputType* inputType)
|
||||
{
|
||||
if(inputType->Read(*m_inputStream, m_inputFactorOrder))
|
||||
{
|
||||
@ -211,7 +211,7 @@ void OutputSurface(std::ostream &out, const Hypothesis *hypo, const std::vector<
|
||||
}
|
||||
}
|
||||
|
||||
void IOStream::Backtrack(const Hypothesis *hypo){
|
||||
void IOWrapper::Backtrack(const Hypothesis *hypo){
|
||||
|
||||
if (hypo->GetPrevHypo() != NULL) {
|
||||
VERBOSE(3,hypo->GetId() << " <= ");
|
||||
@ -219,7 +219,7 @@ void IOStream::Backtrack(const Hypothesis *hypo){
|
||||
}
|
||||
}
|
||||
|
||||
void IOStream::OutputBestHypo(const std::vector<const Factor*>& mbrBestHypo, long /*translationId*/, bool reportSegmentation, bool reportAllFactors)
|
||||
void IOWrapper::OutputBestHypo(const std::vector<const Factor*>& mbrBestHypo, long /*translationId*/, bool reportSegmentation, bool reportAllFactors)
|
||||
{
|
||||
for (size_t i = 0 ; i < mbrBestHypo.size() ; i++)
|
||||
{
|
||||
@ -248,7 +248,7 @@ void OutputInput(std::ostream& os, const Hypothesis* hypo)
|
||||
if (inp_phrases[i]) os << *inp_phrases[i];
|
||||
}
|
||||
|
||||
void IOStream::OutputBestHypo(const Hypothesis *hypo, long /*translationId*/, bool reportSegmentation, bool reportAllFactors)
|
||||
void IOWrapper::OutputBestHypo(const Hypothesis *hypo, long /*translationId*/, bool reportSegmentation, bool reportAllFactors)
|
||||
{
|
||||
if (hypo != NULL)
|
||||
{
|
||||
@ -277,7 +277,7 @@ void IOStream::OutputBestHypo(const Hypothesis *hypo, long /*translationId*/, bo
|
||||
}
|
||||
}
|
||||
|
||||
void IOStream::OutputNBestList(const TrellisPathList &nBestList, long translationId)
|
||||
void IOWrapper::OutputNBestList(const TrellisPathList &nBestList, long translationId)
|
||||
{
|
||||
bool labeledOutput = StaticData::Instance().IsLabeledNBestList();
|
||||
bool includeAlignment = StaticData::Instance().NBestIncludesAlignment();
|
@ -45,7 +45,7 @@ class Hypothesis;
|
||||
class TrellisPathList;
|
||||
class InputFileStream;
|
||||
|
||||
class IOStream
|
||||
class IOWrapper
|
||||
{
|
||||
protected:
|
||||
long m_translationId;
|
||||
@ -67,19 +67,19 @@ protected:
|
||||
, const std::string &nBestFilePath);
|
||||
|
||||
public:
|
||||
IOStream(const std::vector<FactorType> &inputFactorOrder
|
||||
IOWrapper(const std::vector<FactorType> &inputFactorOrder
|
||||
, const std::vector<FactorType> &outputFactorOrder
|
||||
, const FactorMask &inputFactorUsed
|
||||
, size_t nBestSize
|
||||
, const std::string &nBestFilePath);
|
||||
|
||||
IOStream(const std::vector<FactorType> &inputFactorOrder
|
||||
IOWrapper(const std::vector<FactorType> &inputFactorOrder
|
||||
, const std::vector<FactorType> &outputFactorOrder
|
||||
, const FactorMask &inputFactorUsed
|
||||
, size_t nBestSize
|
||||
, const std::string &nBestFilePath
|
||||
, const std::string &infilePath);
|
||||
~IOStream();
|
||||
~IOWrapper();
|
||||
|
||||
InputType* GetInput(InputType *inputType);
|
||||
void OutputBestHypo(const Hypothesis *hypo, long translationId, bool reportSegmentation, bool reportAllFactors);
|
@ -46,7 +46,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||
#include "Util.h"
|
||||
#include "TrellisPathList.h"
|
||||
#include "Timer.h"
|
||||
#include "IOStream.h"
|
||||
#include "IOWrapper.h"
|
||||
#include "Sentence.h"
|
||||
#include "ConfusionNet.h"
|
||||
#include "WordLattice.h"
|
||||
@ -62,14 +62,14 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
using namespace std;
|
||||
|
||||
bool ReadInput(IOStream &ioStream, InputTypeEnum inputType, InputType*& source)
|
||||
bool ReadInput(IOWrapper &ioWrapper, InputTypeEnum inputType, InputType*& source)
|
||||
{
|
||||
delete source;
|
||||
switch(inputType)
|
||||
{
|
||||
case SentenceInput: source = ioStream.GetInput(new Sentence(Input)); break;
|
||||
case ConfusionNetworkInput: source = ioStream.GetInput(new ConfusionNet); break;
|
||||
case WordLatticeInput: source = ioStream.GetInput(new WordLattice); break;
|
||||
case SentenceInput: source = ioWrapper.GetInput(new Sentence(Input)); break;
|
||||
case ConfusionNetworkInput: source = ioWrapper.GetInput(new ConfusionNet); break;
|
||||
case WordLatticeInput: source = ioWrapper.GetInput(new WordLattice); break;
|
||||
default: TRACE_ERR("Unknown input type: " << inputType << "\n");
|
||||
}
|
||||
return (source ? true : false);
|
||||
@ -104,7 +104,7 @@ int main(int argc, char* argv[])
|
||||
return EXIT_FAILURE;
|
||||
|
||||
// set up read/writing class
|
||||
IOStream *ioStream = GetIODevice(staticData);
|
||||
IOWrapper *ioWrapper = GetIODevice(staticData);
|
||||
|
||||
// check on weights
|
||||
vector<float> weights = staticData.GetAllWeights();
|
||||
@ -120,13 +120,13 @@ int main(int argc, char* argv[])
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
if (ioStream == NULL)
|
||||
if (ioWrapper == NULL)
|
||||
return EXIT_FAILURE;
|
||||
|
||||
// read each sentence & decode
|
||||
InputType *source=0;
|
||||
size_t lineCount = 0;
|
||||
while(ReadInput(*ioStream,staticData.GetInputType(),source))
|
||||
while(ReadInput(*ioWrapper,staticData.GetInputType(),source))
|
||||
{
|
||||
// note: source is only valid within this while loop!
|
||||
IFVERBOSE(1)
|
||||
@ -138,14 +138,14 @@ int main(int argc, char* argv[])
|
||||
manager.ProcessSentence();
|
||||
|
||||
if (staticData.GetOutputWordGraph())
|
||||
manager.GetWordGraph(source->GetTranslationId(), ioStream->GetOutputWordGraphStream());
|
||||
manager.GetWordGraph(source->GetTranslationId(), ioWrapper->GetOutputWordGraphStream());
|
||||
|
||||
if (staticData.GetOutputSearchGraph())
|
||||
manager.GetSearchGraph(source->GetTranslationId(), ioStream->GetOutputSearchGraphStream());
|
||||
manager.GetSearchGraph(source->GetTranslationId(), ioWrapper->GetOutputSearchGraphStream());
|
||||
|
||||
// pick best translation (maximum a posteriori decoding)
|
||||
if (! staticData.UseMBR()) {
|
||||
ioStream->OutputBestHypo(manager.GetBestHypothesis(), source->GetTranslationId(),
|
||||
ioWrapper->OutputBestHypo(manager.GetBestHypothesis(), source->GetTranslationId(),
|
||||
staticData.GetReportSegmentation(), staticData.GetReportAllFactors());
|
||||
IFVERBOSE(2) { PrintUserTime("Best Hypothesis Generation Time:"); }
|
||||
|
||||
@ -156,7 +156,7 @@ int main(int argc, char* argv[])
|
||||
VERBOSE(2,"WRITING " << nBestSize << " TRANSLATION ALTERNATIVES TO " << staticData.GetNBestFilePath() << endl);
|
||||
TrellisPathList nBestList;
|
||||
manager.CalcNBest(nBestSize, nBestList,staticData.GetDistinctNBest());
|
||||
ioStream->OutputNBestList(nBestList, source->GetTranslationId());
|
||||
ioWrapper->OutputNBestList(nBestList, source->GetTranslationId());
|
||||
//RemoveAllInColl(nBestList);
|
||||
|
||||
IFVERBOSE(2) { PrintUserTime("N-Best Hypotheses Generation Time:"); }
|
||||
@ -178,7 +178,7 @@ int main(int argc, char* argv[])
|
||||
VERBOSE(2,"size of n-best: " << nBestList.GetSize() << " (" << nBestSize << ")" << endl);
|
||||
IFVERBOSE(2) { PrintUserTime("calculated n-best list for MBR decoding"); }
|
||||
std::vector<const Factor*> mbrBestHypo = doMBR(nBestList);
|
||||
ioStream->OutputBestHypo(mbrBestHypo, source->GetTranslationId(),
|
||||
ioWrapper->OutputBestHypo(mbrBestHypo, source->GetTranslationId(),
|
||||
staticData.GetReportSegmentation(),
|
||||
staticData.GetReportAllFactors());
|
||||
IFVERBOSE(2) { PrintUserTime("finished MBR decoding"); }
|
||||
@ -194,7 +194,7 @@ int main(int argc, char* argv[])
|
||||
manager.CalcDecoderStatistics();
|
||||
}
|
||||
|
||||
delete ioStream;
|
||||
delete ioWrapper;
|
||||
|
||||
IFVERBOSE(1)
|
||||
PrintUserTime("End.");
|
||||
@ -207,9 +207,9 @@ int main(int argc, char* argv[])
|
||||
#endif
|
||||
}
|
||||
|
||||
IOStream *GetIODevice(const StaticData &staticData)
|
||||
IOWrapper *GetIODevice(const StaticData &staticData)
|
||||
{
|
||||
IOStream *ioStream;
|
||||
IOWrapper *ioWrapper;
|
||||
const std::vector<FactorType> &inputFactorOrder = staticData.GetInputFactorOrder()
|
||||
,&outputFactorOrder = staticData.GetOutputFactorOrder();
|
||||
FactorMask inputFactorUsed(inputFactorOrder);
|
||||
@ -220,7 +220,7 @@ IOStream *GetIODevice(const StaticData &staticData)
|
||||
VERBOSE(2,"IO from File" << endl);
|
||||
string filePath = staticData.GetParam("input-file")[0];
|
||||
|
||||
ioStream = new IOStream(inputFactorOrder, outputFactorOrder, inputFactorUsed
|
||||
ioWrapper = new IOWrapper(inputFactorOrder, outputFactorOrder, inputFactorUsed
|
||||
, staticData.GetNBestSize()
|
||||
, staticData.GetNBestFilePath()
|
||||
, filePath);
|
||||
@ -228,14 +228,14 @@ IOStream *GetIODevice(const StaticData &staticData)
|
||||
else
|
||||
{
|
||||
VERBOSE(1,"IO from STDOUT/STDIN" << endl);
|
||||
ioStream = new IOStream(inputFactorOrder, outputFactorOrder, inputFactorUsed
|
||||
ioWrapper = new IOWrapper(inputFactorOrder, outputFactorOrder, inputFactorUsed
|
||||
, staticData.GetNBestSize()
|
||||
, staticData.GetNBestFilePath());
|
||||
}
|
||||
ioStream->ResetTranslationId();
|
||||
ioWrapper->ResetTranslationId();
|
||||
|
||||
IFVERBOSE(1)
|
||||
PrintUserTime("Created input-output object");
|
||||
|
||||
return ioStream;
|
||||
return ioWrapper;
|
||||
}
|
||||
|
@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include "StaticData.h"
|
||||
|
||||
class IOStream;
|
||||
class IOWrapper;
|
||||
|
||||
int main(int argc, char* argv[]);
|
||||
IOStream *GetIODevice(const StaticData &staticData);
|
||||
IOWrapper *GetIODevice(const StaticData &staticData);
|
||||
|
@ -1,5 +1,5 @@
|
||||
bin_PROGRAMS = moses
|
||||
moses_SOURCES = Main.cpp mbr.cpp IOStream.cpp TranslationAnalysis.cpp
|
||||
moses_SOURCES = Main.cpp mbr.cpp IOWrapper.cpp TranslationAnalysis.cpp
|
||||
AM_CPPFLAGS = -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DUSE_HYPO_POOL -I$(top_srcdir)/moses/src
|
||||
|
||||
moses_LDADD = -L$(top_srcdir)/moses/src -lmoses
|
||||
|
65
moses.sln
Normal file
65
moses.sln
Normal file
@ -0,0 +1,65 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 9.00
|
||||
# Visual Studio 2005
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moses", "moses\moses.vcproj", "{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moses-cmd", "moses-cmd\moses-cmd.vcproj", "{5BBAC701-84F5-438E-8F54-B3391F451F2A}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF} = {8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "processLexicalTable", "misc\processLexicalTable.vcproj", "{9834EABB-2033-4607-9DAC-36D16E0725B5}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF} = {8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "processPhraseTable", "misc\processPhraseTable.vcproj", "{AA230564-6DF1-4662-9BF9-7AD73DE53B76}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF} = {8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
Debug-withSRILM|Win32 = Debug-withSRILM|Win32
|
||||
Release|Win32 = Release|Win32
|
||||
Release-withSRILM|Win32 = Release-withSRILM|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug-withSRILM|Win32.ActiveCfg = Debug-withSRILM|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug-withSRILM|Win32.Build.0 = Debug-withSRILM|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release|Win32.Build.0 = Release|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release-withSRILM|Win32.ActiveCfg = Release-withSRILM|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release-withSRILM|Win32.Build.0 = Release-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug-withSRILM|Win32.ActiveCfg = Debug-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug-withSRILM|Win32.Build.0 = Debug-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release|Win32.Build.0 = Release|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release-withSRILM|Win32.ActiveCfg = Release-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release-withSRILM|Win32.Build.0 = Release-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug-withSRILM|Win32.ActiveCfg = Debug-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug-withSRILM|Win32.Build.0 = Debug-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release|Win32.Build.0 = Release|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release-withSRILM|Win32.ActiveCfg = Release-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release-withSRILM|Win32.Build.0 = Release-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug-withSRILM|Win32.ActiveCfg = Debug-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug-withSRILM|Win32.Build.0 = Debug-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release|Win32.Build.0 = Release|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release-withSRILM|Win32.ActiveCfg = Release-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release-withSRILM|Win32.Build.0 = Release-withSRILM|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
121
moses/moses.sln
121
moses/moses.sln
@ -1,121 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 9.00
|
||||
# Visual Studio 2005
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moses", "moses.vcproj", "{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moses-cmd", "..\moses-cmd\moses-cmd.vcproj", "{5BBAC701-84F5-438E-8F54-B3391F451F2A}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF} = {8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "processPhraseTable", "..\misc\processPhraseTable.vcproj", "{AA230564-6DF1-4662-9BF9-7AD73DE53B76}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF} = {8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "processLexicalTable", "..\misc\processLexicalTable.vcproj", "{9834EABB-2033-4607-9DAC-36D16E0725B5}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF} = {8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|Mixed Platforms = Debug|Mixed Platforms
|
||||
Debug|Win32 = Debug|Win32
|
||||
Debug-withSRILM|Any CPU = Debug-withSRILM|Any CPU
|
||||
Debug-withSRILM|Mixed Platforms = Debug-withSRILM|Mixed Platforms
|
||||
Debug-withSRILM|Win32 = Debug-withSRILM|Win32
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|Mixed Platforms = Release|Mixed Platforms
|
||||
Release|Win32 = Release|Win32
|
||||
Release-withSRILM|Any CPU = Release-withSRILM|Any CPU
|
||||
Release-withSRILM|Mixed Platforms = Release-withSRILM|Mixed Platforms
|
||||
Release-withSRILM|Win32 = Release-withSRILM|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug|Any CPU.ActiveCfg = Debug|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug-withSRILM|Any CPU.ActiveCfg = Debug-withSRILM|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug-withSRILM|Mixed Platforms.ActiveCfg = Debug-withSRILM|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug-withSRILM|Mixed Platforms.Build.0 = Debug-withSRILM|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug-withSRILM|Win32.ActiveCfg = Debug-withSRILM|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Debug-withSRILM|Win32.Build.0 = Debug-withSRILM|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release|Any CPU.ActiveCfg = Release|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release|Mixed Platforms.Build.0 = Release|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release|Win32.Build.0 = Release|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release-withSRILM|Any CPU.ActiveCfg = Release-withSRILM|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release-withSRILM|Mixed Platforms.ActiveCfg = Release-withSRILM|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release-withSRILM|Mixed Platforms.Build.0 = Release-withSRILM|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release-withSRILM|Win32.ActiveCfg = Release-withSRILM|Win32
|
||||
{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release-withSRILM|Win32.Build.0 = Release-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug|Any CPU.ActiveCfg = Debug|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug-withSRILM|Any CPU.ActiveCfg = Debug-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug-withSRILM|Mixed Platforms.ActiveCfg = Debug-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug-withSRILM|Mixed Platforms.Build.0 = Debug-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug-withSRILM|Win32.ActiveCfg = Debug-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Debug-withSRILM|Win32.Build.0 = Debug-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release|Any CPU.ActiveCfg = Release|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release|Mixed Platforms.Build.0 = Release|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release|Win32.Build.0 = Release|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release-withSRILM|Any CPU.ActiveCfg = Release-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release-withSRILM|Mixed Platforms.ActiveCfg = Release-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release-withSRILM|Mixed Platforms.Build.0 = Release-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release-withSRILM|Win32.ActiveCfg = Release-withSRILM|Win32
|
||||
{5BBAC701-84F5-438E-8F54-B3391F451F2A}.Release-withSRILM|Win32.Build.0 = Release-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug|Any CPU.ActiveCfg = Debug|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug|Mixed Platforms.Build.0 = Debug|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug-withSRILM|Any CPU.ActiveCfg = Debug-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug-withSRILM|Mixed Platforms.ActiveCfg = Debug-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug-withSRILM|Mixed Platforms.Build.0 = Debug-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug-withSRILM|Win32.ActiveCfg = Debug-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Debug-withSRILM|Win32.Build.0 = Debug-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release|Any CPU.ActiveCfg = Release|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release|Mixed Platforms.ActiveCfg = Release|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release|Mixed Platforms.Build.0 = Release|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release|Win32.Build.0 = Release|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release-withSRILM|Any CPU.ActiveCfg = Release-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release-withSRILM|Mixed Platforms.ActiveCfg = Release-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release-withSRILM|Mixed Platforms.Build.0 = Release-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release-withSRILM|Win32.ActiveCfg = Release-withSRILM|Win32
|
||||
{AA230564-6DF1-4662-9BF9-7AD73DE53B76}.Release-withSRILM|Win32.Build.0 = Release-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug|Any CPU.ActiveCfg = Debug|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug|Mixed Platforms.Build.0 = Debug|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug-withSRILM|Any CPU.ActiveCfg = Debug-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug-withSRILM|Mixed Platforms.ActiveCfg = Debug-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug-withSRILM|Mixed Platforms.Build.0 = Debug-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug-withSRILM|Win32.ActiveCfg = Debug-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Debug-withSRILM|Win32.Build.0 = Debug-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release|Any CPU.ActiveCfg = Release|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release|Mixed Platforms.ActiveCfg = Release|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release|Mixed Platforms.Build.0 = Release|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release|Win32.Build.0 = Release|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release-withSRILM|Any CPU.ActiveCfg = Release-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release-withSRILM|Mixed Platforms.ActiveCfg = Release-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release-withSRILM|Mixed Platforms.Build.0 = Release-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release-withSRILM|Win32.ActiveCfg = Release-withSRILM|Win32
|
||||
{9834EABB-2033-4607-9DAC-36D16E0725B5}.Release-withSRILM|Win32.Build.0 = Release-withSRILM|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
@ -17,7 +17,7 @@
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="$(ProjectDir)$(ConfigurationName)"
|
||||
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
CharacterSet="1"
|
||||
@ -81,7 +81,7 @@
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="$(ProjectDir)$(ConfigurationName)"
|
||||
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
|
||||
IntermediateDirectory="$(ConfigurationName)"
|
||||
ConfigurationType="4"
|
||||
CharacterSet="1"
|
||||
|
Loading…
Reference in New Issue
Block a user