Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/moses-smt/mosesdecoder.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTetsuo Kiso <tetsuo-s@is.naist.jp>2012-03-31 05:43:54 +0400
committerTetsuo Kiso <tetsuo-s@is.naist.jp>2012-03-31 05:43:54 +0400
commit24b1314d901fe1d19f5b70c0616c3d4d9a5c57d8 (patch)
treee8b4043116c5fc3b55dc12612c2784ddf7b74cd1
parent59f755587a7955356ca6769f6820228e70b61628 (diff)
Fix indentation.
-rw-r--r--mert/Optimizer.h16
-rw-r--r--mert/OptimizerFactory.cpp2
-rw-r--r--mert/mert.cpp10
3 files changed, 14 insertions, 14 deletions
diff --git a/mert/Optimizer.h b/mert/Optimizer.h
index 49918266e..3de1f2f08 100644
--- a/mert/Optimizer.h
+++ b/mert/Optimizer.h
@@ -77,8 +77,8 @@ class SimpleOptimizer : public Optimizer
private:
const float kEPS;
public:
- SimpleOptimizer(unsigned dim, const vector<unsigned>& i2O, const vector<bool>& positive,
- const vector<parameter_t>& start, unsigned int nrandom)
+ SimpleOptimizer(unsigned dim, const vector<unsigned>& i2O, const vector<bool>& positive,
+ const vector<parameter_t>& start, unsigned int nrandom)
: Optimizer(dim, i2O, positive, start,nrandom), kEPS(0.0001) {}
virtual statscore_t TrueRun(Point&) const;
};
@@ -91,9 +91,9 @@ class RandomDirectionOptimizer : public Optimizer
private:
const float kEPS;
public:
- RandomDirectionOptimizer(unsigned dim, const vector<unsigned>& i2O, const vector<bool>& positive,
- const vector<parameter_t>& start, unsigned int nrandom)
- : Optimizer(dim, i2O, positive, start, nrandom), kEPS(0.0001) {}
+ RandomDirectionOptimizer(unsigned dim, const vector<unsigned>& i2O, const vector<bool>& positive,
+ const vector<parameter_t>& start, unsigned int nrandom)
+ : Optimizer(dim, i2O, positive, start, nrandom), kEPS(0.0001) {}
virtual statscore_t TrueRun(Point&) const;
};
@@ -103,9 +103,9 @@ public:
class RandomOptimizer : public Optimizer
{
public:
- RandomOptimizer(unsigned dim, const vector<unsigned>& i2O, const vector<bool>& positive,
- const vector<parameter_t>& start, unsigned int nrandom)
- : Optimizer(dim, i2O, positive, start, nrandom) {}
+ RandomOptimizer(unsigned dim, const vector<unsigned>& i2O, const vector<bool>& positive,
+ const vector<parameter_t>& start, unsigned int nrandom)
+ : Optimizer(dim, i2O, positive, start, nrandom) {}
virtual statscore_t TrueRun(Point&) const;
};
diff --git a/mert/OptimizerFactory.cpp b/mert/OptimizerFactory.cpp
index e6adc13d4..6cafd15b0 100644
--- a/mert/OptimizerFactory.cpp
+++ b/mert/OptimizerFactory.cpp
@@ -35,7 +35,7 @@ OptimizerFactory::OptimizerType OptimizerFactory::GetOptimizerType(const string&
Optimizer* OptimizerFactory::BuildOptimizer(unsigned dim,
const vector<unsigned>& i2o,
- const std::vector<bool>& positive,
+ const std::vector<bool>& positive,
const vector<parameter_t>& start,
const string& type,
unsigned int nrandom)
diff --git a/mert/mert.cpp b/mert/mert.cpp
index e7fde6370..bbad8fe38 100644
--- a/mert/mert.cpp
+++ b/mert/mert.cpp
@@ -175,7 +175,7 @@ struct ProgramOption {
scorer_file(kDefaultScorerFile),
feature_file(kDefaultFeatureFile),
init_file(kDefaultInitFile),
- positive_string(kDefaultPositiveString),
+ positive_string(kDefaultPositiveString),
num_threads(1),
shard_size(0),
shard_count(0) { }
@@ -398,10 +398,9 @@ int main(int argc, char **argv)
}
positive.resize(option.pdim);
- for (int i=0; i<option.pdim; i++)
+ for (int i = 0; i < option.pdim; i++)
positive[i] = false;
if (option.positive_string.length() > 0) {
-
// Parse string to get weights that need to be positive
std::string substring;
int index;
@@ -412,12 +411,13 @@ int main(int argc, char **argv)
if (index >= 0 && index < option.pdim) {
positive[index] = true;
} else {
- cerr << "Index " << index << " is out of bounds in positivity list. Allowed indexes are [0," << (option.pdim-1) << "]." << endl;
+ cerr << "Index " << index
+ << " is out of bounds in positivity list. Allowed indexes are [0,"
+ << (option.pdim-1) << "]." << endl;
}
}
}
-
// treat sparse features just like regular features
if (data.hasSparseFeatures()) {
data.mergeSparseFeatures();