From eb2c9ee5e3e4ed76dd9b155c1b509a22d5ab7f4f Mon Sep 17 00:00:00 2001 From: Tetsuo Kiso Date: Sat, 10 Mar 2012 17:12:34 +0900 Subject: mert: Prefix private members with "m_" except TER. Squashed commit of the following: - Clean up PRO. - Clean up ScoreStats. - Clean up ScoreData. - Clean up ScoreArray. - Remove unnecessary headers. - Clean up ScopedVector. - Clean up Point. - Clean up PerScorer. - Clean up Optimizer. - Clean up MergeScorer. - Clean up InterpolatedScorer. - Clean up FileStream. - Clean up FeatureStats. - Remove inefficient string concatenation. - Clean up FeatureData. - Clean up FeatureArray. - Clean up Data. --- mert/mert.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mert/mert.cpp') diff --git a/mert/mert.cpp b/mert/mert.cpp index 694b48e8e..cd9efa45a 100755 --- a/mert/mert.cpp +++ b/mert/mert.cpp @@ -434,7 +434,7 @@ int main(int argc, char **argv) vector& tasks = allTasks[i]; Optimizer *optimizer = OptimizerFactory::BuildOptimizer(option.pdim, to_optimize, start_list[0], option.optimize_type, option.nrandom); optimizer->SetScorer(data_ref.getScorer()); - optimizer->SetFData(data_ref.getFeatureData()); + optimizer->SetFeatureData(data_ref.getFeatureData()); // A task for each start point for (size_t j = 0; j < startingPoints.size(); ++j) { OptimizationTask* task = new OptimizationTask(optimizer, startingPoints[j]); -- cgit v1.2.3