ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-3.0/src/minimizers/SDMinimizer.cpp
(Generate patch)

Comparing branches/new_design/OOPSE-3.0/src/minimizers/SDMinimizer.cpp (file contents):
Revision 1829, Thu Oct 28 22:34:02 2004 UTC vs.
Revision 1830 by tim, Thu Dec 2 05:17:10 2004 UTC

# Line 55 | Line 55 | int SDMinimizer::checkConvg(){
55    if (fabs(deltaF) <= relativeFTol) {
56  
57      if (bVerbose){
58 <      cout << "function value tolerance test passed" << endl;
58 >      cout << "function value tolerance test passed" << std::endl;
59        cout << "ftol = " << fTol
60 <             << "\tdeltaf = " << deltaF<< endl;
60 >             << "\tdeltaf = " << deltaF<< std::endl;
61      }
62      return CONVG_FTOL;
63    }
# Line 78 | Line 78 | int SDMinimizer::checkConvg(){
78   #endif
79  
80    if (gnorm <= relativeGTol) {
81 <      cout << "gradient tolerance test" << endl;
81 >      cout << "gradient tolerance test" << std::endl;
82        cout << "gnorm = " << gnorm
83 <             << "\trelativeGTol = " << relativeGTol<< endl;
83 >             << "\trelativeGTol = " << relativeGTol<< std::endl;
84      return CONVG_GTOL;
85    }
86    
87    //absolute gradient tolerance test
88  
89    if (gnorm <= gTol) {
90 <      cout << "absolute gradient tolerance test" << endl;
90 >      cout << "absolute gradient tolerance test" << std::endl;
91        cout << "gnorm = " << gnorm
92 <             << "\tgTol = " << gTol<< endl;
92 >             << "\tgTol = " << gTol<< std::endl;
93      return CONVG_ABSGTOL;
94    }
95  

Diff Legend

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