提交: a744ab4915f0db65383f6fc4ad0f1e8657cd492d - MolDS (git)

Commit MetaInfo

• 修订版: a744ab4915f0db65383f6fc4ad0f1e8657cd492d (tree)
• 时间: 2013-07-25 01:12:21
• 作者: Mikiya Fujii <mikiya.fujii@gmai...>
• Commiter: Mikiya Fujii

Log Message

Some methods for opt in Parameters-class are inlined #27279

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/trunk@1428 1136aad2-a195-0410-b898-f5ea1d11b9d8

更改概述

• modified: src/base/Parameters.cpp
• modified: src/base/Parameters.h

差异

--- a/src/base/Parameters.cpp
+++ b/src/base/Parameters.cpp
@@ -402,71 +402,6 @@ void Parameters::SetSeedNASCO(unsigned long seed){
    this->seedNASCO = seed;
 }
 
-// Optimization
-OptimizationMethodType Parameters::GetMethodOptimization() const{
-   return this->methodOptimization;
-}
-
-void Parameters::SetMethodOptimization(OptimizationMethodType method){
-   this->methodOptimization = method;
-}
-
-int Parameters::GetTotalStepsOptimization() const{
-   return this->totalStepsOptimization;
-}
-
-void Parameters::SetTotalStepsOptimization(int steps){
-   this->totalStepsOptimization = steps;
-}
-
-int Parameters::GetElectronicStateIndexOptimization() const{
-   return this->electronicStateIndexOptimization;
-}
-
-void Parameters::SetElectronicStateIndexOptimization(int electronicStateIndex){
-   this->electronicStateIndexOptimization = electronicStateIndex;
-}
-
-double Parameters::GetMaxGradientOptimization() const{
-   return this->maxGradientOptimization;
-}
-
-void Parameters::SetMaxGradientOptimization(double maxGradient){
-   this->maxGradientOptimization = maxGradient;
-}
-
-double Parameters::GetRmsGradientOptimization() const{
-   return this->rmsGradientOptimization;
-}
-
-void Parameters::SetRmsGradientOptimization(double rmsGradient){
-   this->rmsGradientOptimization = rmsGradient;
-}
-
-double Parameters::GetInitialTrustRadiusOptimization() const{
-   return this->initialTrustRadiusOptimization;
-}
-
-void Parameters::SetInitialTrustRadiusOptimization(double initialTrustRadius){
-   this->initialTrustRadiusOptimization = initialTrustRadius;
-}
-
-double Parameters::GetMaxNormStepOptimization() const{
-   return this->maxNormStepOptimization;
-}
-
-void Parameters::SetMaxNormStepOptimization(double maxNormStep){
-   this->maxNormStepOptimization = maxNormStep;
-}
-
-double Parameters::GetTimeWidthOptimization() const{
-   return this->timeWidthOptimization;
-}
-
-void Parameters::SetTimeWidthOptimization(double timeWidth){
-   this->timeWidthOptimization = timeWidth;
-}
-
 // Frequencies
 bool Parameters::RequiresFrequencies() const{
    return this->requiresFrequencies;

--- a/src/base/Parameters.h
+++ b/src/base/Parameters.h
@@ -191,22 +191,22 @@ public:
    double        GetTimeWidthNASCO() const;
    void          SetTimeWidthNASCO(double stepWidth);
    // Optimization
-   OptimizationMethodType GetMethodOptimization() const;
-   void                   SetMethodOptimization(OptimizationMethodType method);
-   int                    GetTotalStepsOptimization() const;
-   void                   SetTotalStepsOptimization(int totalSteps);
-   int                    GetElectronicStateIndexOptimization() const;
-   void                   SetElectronicStateIndexOptimization(int electronicStateIndex);
-   double                 GetMaxGradientOptimization() const;
-   void                   SetMaxGradientOptimization(double maxGradient);
-   double                 GetRmsGradientOptimization() const;
-   void                   SetRmsGradientOptimization(double rmsGradient);
-   double                 GetTimeWidthOptimization() const;
-   void                   SetTimeWidthOptimization(double timeWidth);
-   double                 GetInitialTrustRadiusOptimization() const;
-   void                   SetInitialTrustRadiusOptimization(double initialTrustRadius);
-   double                 GetMaxNormStepOptimization() const;
-   void                   SetMaxNormStepOptimization(double maxNormStep);
+   OptimizationMethodType GetMethodOptimization() const                  {return this->methodOptimization;}
+   void                   SetMethodOptimization(OptimizationMethodType m){this->methodOptimization = m;}
+   int                    GetTotalStepsOptimization() const              {return this->totalStepsOptimization;}
+   void                   SetTotalStepsOptimization(int steps)           {this->totalStepsOptimization = steps;}
+   int                    GetElectronicStateIndexOptimization() const    {return this->electronicStateIndexOptimization;}
+   void                   SetElectronicStateIndexOptimization(int i)     {this->electronicStateIndexOptimization = i;}
+   double                 GetMaxGradientOptimization() const             {return this->maxGradientOptimization;}
+   void                   SetMaxGradientOptimization(double m)           {this->maxGradientOptimization = m;}
+   double                 GetRmsGradientOptimization() const             {return this->rmsGradientOptimization;}
+   void                   SetRmsGradientOptimization(double r)           {this->rmsGradientOptimization = r;}
+   double                 GetTimeWidthOptimization() const               {return this->timeWidthOptimization;}
+   void                   SetTimeWidthOptimization(double dt)            {this->timeWidthOptimization = dt;}
+   double                 GetInitialTrustRadiusOptimization() const      {return this->initialTrustRadiusOptimization;}
+   void                   SetInitialTrustRadiusOptimization(double r)    {this->initialTrustRadiusOptimization = r;}
+   double                 GetMaxNormStepOptimization() const             {return this->maxNormStepOptimization;}
+   void                   SetMaxNormStepOptimization(double n)           {this->maxNormStepOptimization = n;}
    // Frequencies 
    bool RequiresFrequencies() const;
    void SetRequiresFrequencies(bool requiresFrequencies);