change return type from size_t to int

git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/branches/mira-mtm5@3751 1f5c12ca-751b-0410-a591-d2e778427230
This commit is contained in:
evahasler 2010-11-30 17:26:34 +00:00
parent 13dd3b282c
commit da712f0eeb
4 changed files with 7 additions and 7 deletions

View File

@ -378,7 +378,7 @@ int main(int argc, char** argv) {
// run optimiser on batch
cerr << "\nRun optimiser.." << endl;
ScoreComponentCollection oldWeights(mosesWeights);
size_t constraintChange = optimiser->updateWeights(mosesWeights, featureValues, losses, oracleFeatureValues);
int constraintChange = optimiser->updateWeights(mosesWeights, featureValues, losses, oracleFeatureValues);
// update moses weights
mosesWeights.L1Normalise();

View File

@ -6,7 +6,7 @@ using namespace std;
namespace Mira {
size_t MiraOptimiser::updateWeights(ScoreComponentCollection& currWeights,
int MiraOptimiser::updateWeights(ScoreComponentCollection& currWeights,
const vector< vector<ScoreComponentCollection> >& featureValues,
const vector< vector<float> >& losses,
const vector< ScoreComponentCollection>& oracleFeatureValues) {

View File

@ -29,7 +29,7 @@ namespace Mira {
class Optimiser {
public:
Optimiser() {}
virtual size_t updateWeights(Moses::ScoreComponentCollection& weights,
virtual int updateWeights(Moses::ScoreComponentCollection& weights,
const std::vector<std::vector<Moses::ScoreComponentCollection> >& scores,
const std::vector<std::vector<float> >& losses,
const std::vector<Moses::ScoreComponentCollection>& oracleScores) = 0;
@ -37,7 +37,7 @@ namespace Mira {
class DummyOptimiser : public Optimiser {
public:
virtual size_t updateWeights(Moses::ScoreComponentCollection& weights,
virtual int updateWeights(Moses::ScoreComponentCollection& weights,
const std::vector< std::vector<Moses::ScoreComponentCollection> >& scores,
const std::vector< std::vector<float> >& losses,
const std::vector<Moses::ScoreComponentCollection>& oracleScores)
@ -48,7 +48,7 @@ namespace Mira {
public:
virtual size_t updateWeights(Moses::ScoreComponentCollection& weights,
virtual int updateWeights(Moses::ScoreComponentCollection& weights,
const std::vector< std::vector<Moses::ScoreComponentCollection> >& scores,
const std::vector< std::vector<float> >& losses,
const std::vector<Moses::ScoreComponentCollection>& oracleScores);
@ -71,7 +71,7 @@ namespace Mira {
~MiraOptimiser() {}
virtual size_t updateWeights(Moses::ScoreComponentCollection& weights,
virtual int updateWeights(Moses::ScoreComponentCollection& weights,
const std::vector< std::vector<Moses::ScoreComponentCollection> >& scores,
const std::vector< std::vector<float> >& losses,
const std::vector< Moses::ScoreComponentCollection>& oracleScores);

View File

@ -24,7 +24,7 @@ using namespace std;
namespace Mira {
size_t Perceptron::updateWeights(ScoreComponentCollection& currWeights,
int Perceptron::updateWeights(ScoreComponentCollection& currWeights,
const vector< vector<ScoreComponentCollection> >& scores,
const vector<vector<float> >& losses,
const vector<ScoreComponentCollection>& oracleScores)