ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/minimizers/MinimizerParameterSet.cpp
(Generate patch)

Comparing trunk/src/minimizers/MinimizerParameterSet.cpp (file contents):
Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 665 by tim, Thu Oct 13 22:26:47 2005 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 43 | Line 43 | namespace oopse {
43  
44   namespace oopse {
45  
46 < MinimizerParameterSet::MinimizerParameterSet(SimInfo* info) : defaultTolerance(1.0e-8) {
46 >  MinimizerParameterSet::MinimizerParameterSet(SimInfo* info) : defaultTolerance(1.0e-8) {
47      setDefaultParameter();
48  
49      Globals* globals = info->getSimParams();
50  
51      if (globals->haveMinimizer()){
52 <        setFTol(globals->getMinFTol());
52 >      setFTol(globals->getMinimizerFTol());
53      }
54  
55 <    if (globals->haveMinGTol()){
56 <        setGTol(globals->getMinGTol());
55 >    if (globals->haveMinimizerGTol()){
56 >      setGTol(globals->getMinimizerGTol());
57      }
58  
59 <    if (globals->haveMinMaxIter()){
60 <        setMaxIteration(globals->getMinMaxIter());
59 >    if (globals->haveMinimizerMaxIter()){
60 >      setMaxIteration(globals->getMinimizerMaxIter());
61      }
62  
63 <    if (globals->haveMinWriteFrq()){
64 <        setMaxIteration(globals->getMinMaxIter());
63 >    if (globals->haveMinimizerWriteFrq()){
64 >      setMaxIteration(globals->getMinimizerMaxIter());
65      }
66  
67 <    if (globals->haveMinWriteFrq()){
68 <        setWriteFrq(globals->getMinWriteFrq());
67 >    if (globals->haveMinimizerWriteFrq()){
68 >      setWriteFrq(globals->getMinimizerWriteFrq());
69      }
70      
71 <    if (globals->haveMinStepSize()){
72 <        setStepSize(globals->getMinStepSize());
71 >    if (globals->haveMinimizerStepSize()){
72 >      setStepSize(globals->getMinimizerStepSize());
73      }
74  
75 <    if (globals->haveMinLSMaxIter()){
76 <        setLineSearchMaxIteration(globals->getMinLSMaxIter());
75 >    if (globals->haveMinimizerLSMaxIter()){
76 >      setLineSearchMaxIteration(globals->getMinimizerLSMaxIter());
77      }    
78  
79 <    if (globals->haveMinLSTol()){
80 <        setLineSearchTol(globals->getMinLSTol());
79 >    if (globals->haveMinimizerLSTol()){
80 >      setLineSearchTol(globals->getMinimizerLSTol());
81      }
82  
83 < }
83 >  }
84  
85 < void MinimizerParameterSet::setDefaultParameter() {
85 >  void MinimizerParameterSet::setDefaultParameter() {
86      maxIteration = 200;
87      stepSize = 0.01;
88      stepTol = defaultTolerance;
# Line 91 | Line 91 | void MinimizerParameterSet::setDefaultParameter() {
91      writeFrq = maxIteration;
92      lsMaxIteration = 50;
93      lsTol = defaultTolerance;
94 < }
94 >  }
95  
96  
97  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines