Code cleanup and refactoring.

4 files changed, 10 insertions, 13 deletions

diff --git a/moses/Syntax/F2S/Manager-inl.h b/moses/Syntax/F2S/Manager-inl.h
index 29b1f2ba9..60c0ba25f 100644
--- a/moses/Syntax/F2S/Manager-inl.h
+++ b/moses/Syntax/F2S/Manager-inl.h
@@ -60,9 +60,9 @@ void Manager<RuleMatcher>::Decode()
   const StaticData &staticData = StaticData::Instance();
 
   // Get various pruning-related constants.
-  const std::size_t popLimit = staticData.options()->cube.pop_limit;
-  const std::size_t ruleLimit = staticData.GetRuleLimit();
-  const std::size_t stackLimit = staticData.options()->search.stack_size;
+  const std::size_t popLimit = options()->cube.pop_limit;
+  const std::size_t ruleLimit = options()->syntax.rule_limit;
+  const std::size_t stackLimit = options()->search.stack_size;
 
   // Initialize the stacks.
   InitializeStacks();
diff --git a/moses/Syntax/S2T/Manager-inl.h b/moses/Syntax/S2T/Manager-inl.h
index 6bfc4a61c..a21de6a94 100644
--- a/moses/Syntax/S2T/Manager-inl.h
+++ b/moses/Syntax/S2T/Manager-inl.h
@@ -163,9 +163,9 @@ void Manager<Parser>::Decode()
   const StaticData &staticData = StaticData::Instance();
 
   // Get various pruning-related constants.
-  const std::size_t popLimit = staticData.options()->cube.pop_limit;
-  const std::size_t ruleLimit = staticData.GetRuleLimit();
-  const std::size_t stackLimit = staticData.options()->search.stack_size;
+  const std::size_t popLimit = options()->cube.pop_limit;
+  const std::size_t ruleLimit = options()->syntax.rule_limit;
+  const std::size_t stackLimit = options()->search.stack_size;
 
   // Initialise the PChart and SChart.
   InitializeCharts();
diff --git a/moses/Syntax/T2S/Manager-inl.h b/moses/Syntax/T2S/Manager-inl.h
index ec97e76de..ee8b33b15 100644
--- a/moses/Syntax/T2S/Manager-inl.h
+++ b/moses/Syntax/T2S/Manager-inl.h
@@ -94,11 +94,11 @@ void Manager<RuleMatcher>::InitializeStacks()
 template<typename RuleMatcher>
 void Manager<RuleMatcher>::Decode()
 {
-  const StaticData &staticData = StaticData::Instance();
+  // const StaticData &staticData = StaticData::Instance();
 
   // Get various pruning-related constants.
   const std::size_t popLimit = this->options()->cube.pop_limit;
-  const std::size_t ruleLimit = staticData.GetRuleLimit();
+  const std::size_t ruleLimit = this->options()->syntax.rule_limit;
   const std::size_t stackLimit = this->options()->search.stack_size;
 
   // Initialize the stacks.
@@ -215,8 +215,8 @@ void Manager<RuleMatcher>::ExtractKBest(
   // than k.  The k-best factor determines how much bigger the limit should be,
   // with 0 being 'unlimited.'  This actually sets a large-ish limit in case
   // too many translations are identical.
-  const StaticData &staticData = StaticData::Instance();
-  const std::size_t nBestFactor = staticData.options()->nbest.factor;
+  // const StaticData &staticData = StaticData::Instance();
+  const std::size_t nBestFactor = this->options()->nbest.factor;
   std::size_t numDerivations = (nBestFactor == 0) ? k*1000 : k*nBestFactor;
 
   // Extract the derivations.
diff --git a/moses/Syntax/T2S/RuleTrieLoader.cpp b/moses/Syntax/T2S/RuleTrieLoader.cpp
index 026237128..8006799e0 100644
--- a/moses/Syntax/T2S/RuleTrieLoader.cpp
+++ b/moses/Syntax/T2S/RuleTrieLoader.cpp
@@ -44,9 +44,6 @@ bool RuleTrieLoader::Load(Moses::AllOptions const& opts,
 {
   PrintUserTime(std::string("Start loading text phrase table. Moses format"));
 
-  // const StaticData &staticData = StaticData::Instance();
-  // const std::string &factorDelimiter = staticData.GetFactorDelimiter();
-
   std::size_t count = 0;
 
   std::ostream *progress = NULL;