| 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 | 
| 47 |  |  | 
| 48 |  | namespace oopse { | 
| 49 |  |  | 
| 50 | < | CGFamilyMinimizer::CGFamilyMinimizer(SimInfo *info) : Minimizer(info){ | 
| 50 | > | CGFamilyMinimizer::CGFamilyMinimizer(SimInfo *info) : Minimizer(info){ | 
| 51 |  | prevG.resize(ndim); | 
| 52 |  | prevX.resize(ndim); | 
| 53 |  | direction.resize(ndim); | 
| 54 |  |  | 
| 55 |  | stepSize = paramSet->getStepSize(); | 
| 56 | < | } | 
| 56 | > | } | 
| 57 |  |  | 
| 58 | < | int CGFamilyMinimizer::checkConvg(){ | 
| 59 | < | double fTol; | 
| 60 | < | double relativeFTol;  // relative tolerance | 
| 61 | < | double deltaF; | 
| 62 | < | double gTol; | 
| 63 | < | double relativeGTol; | 
| 64 | < | double gnorm; | 
| 58 | > | int CGFamilyMinimizer::checkConvg(){ | 
| 59 | > | double fTol; | 
| 60 | > | double relativeFTol;  // relative tolerance | 
| 61 | > | double deltaF; | 
| 62 | > | double gTol; | 
| 63 | > | double relativeGTol; | 
| 64 | > | double gnorm; | 
| 65 |  |  | 
| 66 |  |  | 
| 67 | < | // test function tolerance test | 
| 68 | < | fTol =paramSet->getFTol(); | 
| 69 | < | relativeFTol = fTol * std::max(1.0,fabs(curF));  // relative tolerance | 
| 70 | < | deltaF = prevF - curF; | 
| 67 | > | // test function tolerance test | 
| 68 | > | fTol =paramSet->getFTol(); | 
| 69 | > | relativeFTol = fTol * std::max(1.0,fabs(curF));  // relative tolerance | 
| 70 | > | deltaF = prevF - curF; | 
| 71 |  |  | 
| 72 | < | if (fabs(deltaF) <= relativeFTol) { | 
| 72 | > | if (fabs(deltaF) <= relativeFTol) { | 
| 73 |  |  | 
| 74 | < | if (bVerbose){ | 
| 75 | < | std::cout << "function value tolerance test passed" << std::endl; | 
| 76 | < | std::cout << "ftol = " << fTol | 
| 77 | < | << "\tdeltaf = " << deltaF<< std::endl; | 
| 74 | > | if (bVerbose){ | 
| 75 | > | std::cout << "function value tolerance test passed" << std::endl; | 
| 76 | > | std::cout << "ftol = " << fTol | 
| 77 | > | << "\tdeltaf = " << deltaF<< std::endl; | 
| 78 | > | } | 
| 79 | > | return CONVG_FTOL; | 
| 80 |  | } | 
| 79 | – | return CONVG_FTOL; | 
| 80 | – | } | 
| 81 |  |  | 
| 82 | < | //gradient tolerance test | 
| 83 | < | gTol = paramSet->getGTol(); | 
| 84 | < | relativeGTol = gTol * std::max(1.0,fabs(curF)); | 
| 82 | > | //gradient tolerance test | 
| 83 | > | gTol = paramSet->getGTol(); | 
| 84 | > | relativeGTol = gTol * std::max(1.0,fabs(curF)); | 
| 85 |  |  | 
| 86 |  | #ifndef IS_MPI | 
| 87 | < | gnorm = sqrt(dotProduct(curG, curG)); | 
| 87 | > | gnorm = sqrt(dotProduct(curG, curG)); | 
| 88 |  | #else | 
| 89 | < | double localDP; | 
| 90 | < | double globalDP; | 
| 89 | > | double localDP; | 
| 90 | > | double globalDP; | 
| 91 |  |  | 
| 92 | < | localDP = dotProduct(curG, curG); | 
| 93 | < | MPI_Allreduce(&localDP, &globalDP, 1, MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD); | 
| 94 | < | gnorm  = sqrt(globalDP); | 
| 92 | > | localDP = dotProduct(curG, curG); | 
| 93 | > | MPI_Allreduce(&localDP, &globalDP, 1, MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD); | 
| 94 | > | gnorm  = sqrt(globalDP); | 
| 95 |  | #endif | 
| 96 |  |  | 
| 97 | < | if (gnorm <= relativeGTol) { | 
| 97 | > | if (gnorm <= relativeGTol) { | 
| 98 |  | std::cout << "gradient tolerance test" << std::endl; | 
| 99 |  | std::cout << "gnorm = " << gnorm | 
| 100 | < | << "\trelativeGTol = " << relativeGTol<< std::endl; | 
| 101 | < | return CONVG_GTOL; | 
| 102 | < | } | 
| 100 | > | << "\trelativeGTol = " << relativeGTol<< std::endl; | 
| 101 | > | return CONVG_GTOL; | 
| 102 | > | } | 
| 103 |  |  | 
| 104 | < | //absolute gradient tolerance test | 
| 104 | > | //absolute gradient tolerance test | 
| 105 |  |  | 
| 106 | < | if (gnorm <= gTol) { | 
| 106 | > | if (gnorm <= gTol) { | 
| 107 |  | std::cout << "absolute gradient tolerance test" << std::endl; | 
| 108 |  | std::cout << "gnorm = " << gnorm | 
| 109 | < | << "\tgTol = " << gTol<< std::endl; | 
| 110 | < | return CONVG_ABSGTOL; | 
| 109 | > | << "\tgTol = " << gTol<< std::endl; | 
| 110 | > | return CONVG_ABSGTOL; | 
| 111 | > | } | 
| 112 | > |  | 
| 113 | > | // did not converge yet | 
| 114 | > | return CONVG_UNCONVG; | 
| 115 |  | } | 
| 116 |  |  | 
| 113 | – | // did not converge yet | 
| 114 | – | return CONVG_UNCONVG; | 
| 117 |  | } | 
| 116 | – |  | 
| 117 | – | } |