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

Comparing branches/new_design/OOPSE-4/src/minimizers/OOPSEMinimizer.cpp (file contents):
Revision 1829 by tim, Thu Dec 2 05:04:20 2004 UTC vs.
Revision 1830 by tim, Thu Dec 2 05:17:10 2004 UTC

# Line 460 | Line 460 | int OOPSEMinimizer::shakeR(){
460  
461   #endif //is_mpi
462  
463 <            //cerr << "Waring: constraint failure" << endl;
463 >            //std::cerr << "Waring: constraint failure" << std::endl;
464  
465              gab = sqrt(rabsq/pabsq);
466  
# Line 562 | Line 562 | int OOPSEMinimizer::shakeR(){
562  
563    if (!done){
564  
565 <    cerr << "Waring: can not constraint within maxIteration" << endl;
565 >    std::cerr << "Waring: can not constraint within maxIteration" << std::endl;
566  
567      return -1;
568  
# Line 782 | Line 782 | int OOPSEMinimizer::shakeF(){
782  
783    if (!done){
784  
785 <    cerr << "Waring: can not constraint within maxIteration" << endl;
785 >    std::cerr << "Waring: can not constraint within maxIteration" << std::endl;
786  
787      return -1;
788  
# Line 938 | Line 938 | void OOPSEMinimizer::printMinimizerInfo(){
938  
939   void OOPSEMinimizer::printMinimizerInfo(){
940  
941 <  cout << "--------------------------------------------------------------------" << endl;
942 <
943 <  cout << minimizerName << endl;
941 >  cout << "--------------------------------------------------------------------" << std::endl;
942  
943 <  cout << "minimization parameter set" << endl;
943 >  cout << minimizerName << std::endl;
944  
945 <  cout << "function tolerance = " << paramSet->getFTol() << endl;
945 >  cout << "minimization parameter set" << std::endl;
946 >
947 >  cout << "function tolerance = " << paramSet->getFTol() << std::endl;
948 >
949 >  cout << "gradient tolerance = " << paramSet->getGTol() << std::endl;
950  
951 <  cout << "gradient tolerance = " << paramSet->getGTol() << endl;
951 >  cout << "step tolerance = "<< paramSet->getFTol() << std::endl;
952  
953 <  cout << "step tolerance = "<< paramSet->getFTol() << endl;
953 >  cout << "absolute gradient tolerance = " << std::endl;
954  
955 <  cout << "absolute gradient tolerance = " << endl;
956 <
957 <  cout << "max iteration = " << paramSet->getMaxIteration() << endl;
955 >  cout << "max iteration = " << paramSet->getMaxIteration() << std::endl;
956 >
957 >  cout << "max line search iteration = " << paramSet->getLineSearchMaxIteration() <<std::endl;
958  
959 <  cout << "max line search iteration = " << paramSet->getLineSearchMaxIteration() <<endl;
959 >  cout << "shake algorithm = " << bShake << std::endl;
960  
961 <  cout << "shake algorithm = " << bShake << endl;
961 >  cout << "--------------------------------------------------------------------" << std::endl;
962  
961 –  cout << "--------------------------------------------------------------------" << endl;
963  
964  
964 –
965   }
966  
967  
# Line 1102 | Line 1102 | int OOPSEMinimizer::doLineSearch(vector<double>& direc
1102  
1103               << " is guaranteed"
1104  
1105 <             << endl;
1105 >             << std::endl;
1106  
1107      }    
1108  
# Line 1142 | Line 1142 | int OOPSEMinimizer::doLineSearch(vector<double>& direc
1142  
1143      if (bVerbose)
1144  
1145 <      cerr << "Function Evaluation Error" << endl;
1145 >      std::cerr << "Function Evaluation Error" << std::endl;
1146  
1147    }
1148  
# Line 1212 | Line 1212 | int OOPSEMinimizer::doLineSearch(vector<double>& direc
1212  
1213          if (bVerbose)
1214  
1215 <          cout << "stepSize is less than line search tolerance" << endl;
1215 >          cout << "stepSize is less than line search tolerance" << std::endl;
1216  
1217          break;        
1218  
# Line 1240 | Line 1240 | int OOPSEMinimizer::doLineSearch(vector<double>& direc
1240  
1241        if (bVerbose)
1242  
1243 <        cerr << "Function Evaluation Error" << endl;
1243 >        std::cerr << "Function Evaluation Error" << std::endl;
1244  
1245      }
1246  
# Line 1428 | Line 1428 | void OOPSEMinimizer::minimize(){
1428  
1429        minStatus = MIN_LSERROR;
1430  
1431 <      cerr << "OOPSEMinimizer Error: line search error, please try a small stepsize" << endl;
1431 >      std::cerr << "OOPSEMinimizer Error: line search error, please try a small stepsize" << std::endl;
1432  
1433        return;
1434  
# Line 1478 | Line 1478 | void OOPSEMinimizer::minimize(){
1478  
1479             << minimizerName << " algorithm did not converge within "
1480  
1481 <           << maxIter << " iteration" << endl;
1481 >           << maxIter << " iteration" << std::endl;
1482  
1483    }
1484  

Diff Legend

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