ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/NLModel1.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/NLModel1.cpp (file contents):
Revision 1010 by tim, Tue Feb 3 20:43:08 2004 UTC vs.
Revision 1031 by tim, Fri Feb 6 18:58:06 2004 UTC

# Line 1 | Line 1
1   #include "NLModel.hpp"
2 + #include "Utility.hpp"
3 +
4 +
5 +
6   //calculate hessian using finite difference
7   SymMatrix NLModel1::FiniteHessian(vector<double>& x, vector<double>& h){
8  
# Line 11 | Line 15 | SymMatrix NLModel1::FiniteHessian(vector<double>& x, v
15    vector<double> gplusAll;
16    vector<double> tempGradAll;
17  
18 <  tempGradAll = getAllGrad();
18 >  //tempGradAll = getAllGrad();
19   #endif
20  
21    tempX = x;
# Line 43 | Line 47 | SymMatrix NLModel1::FiniteHessian(vector<double>& x, v
47  
48      //very inefficient, need to change
49      for(int j = 0; j , numOfProc; j++){
50 <      brocastVector(gplus, j);
51 <      gplusAll.insert(gplus);
50 >      //brocastVector(gplus, j);
51 >      //gplusAll.insert(gplus);
52      }
53      
54      if(procMappingArray[i] == myRank){
# Line 54 | Line 58 | SymMatrix NLModel1::FiniteHessian(vector<double>& x, v
58  
59      }
60  
61 <    hessian.Cloume(i) = (gplusAll - tempGradAll) / hi;  
61 >    //hessian.Cloume(i) = (gplusAll - tempGradAll) / hi;  
62   #endif
63  
64    }
# Line 63 | Line 67 | SymMatrix NLModel1::FiniteHessian(vector<double>& x, v
67    
68   }
69  
70 < double ConcreteNLMode1::calcF(){
70 > //----------------------------------------------------------------------------//
71 > ConcreteNLModel1::ConcreteNLModel1(int dim, ObjFunctor1* func ,  ConstraintList* cons)
72 >                         : NLModel1(dim, cons){
73 >  objfunc = func;
74 > }
75 > double ConcreteNLModel1::calcF(){
76    
77    currentF = (*objfunc)(currentX, currentGrad);
78    numOfFunEval ++;
# Line 71 | Line 80 | double ConcreteNLMode1::calcF(){
80    return currentF;
81   }
82  
83 < double ConcreteNLMode1::calcF(const vector<double>& x){
83 > double ConcreteNLModel1::calcF(vector<double>& x){
84  
85    vector<double> tempGrad(x.size());
86    
87    double tempF;
88  
89 <  //tempF = (*objfunc)(x, tempGrad);
89 >  tempF = (*objfunc)(x, tempGrad);
90    numOfFunEval ++;
91    
92    return tempF;  
93   }
94  
95 < vector<double> ConcreteNLMode1::calcGrad(){
95 > vector<double> ConcreteNLModel1::calcGrad(){
96    
97    currentF = (*objfunc)(currentX, currentGrad);
98  
# Line 91 | Line 100 | vector<double> ConcreteNLMode1::calcGrad(){
100  
101   }
102  
103 < vector<double> ConcreteNLMode1::calcGrad(const vector<double>& x){
104 <  vector<double> tempGrad;
96 <  //vector<double> tempGrad(x.szie());
103 > vector<double> ConcreteNLModel1::calcGrad(vector<double>& x){
104 >  vector<double> tempGrad(x.size());
105  
106    double tempF;
107    
108 <  //tempF = (*objfunc)(x, tempGrad);
108 >  tempF = (*objfunc)(x, tempGrad);
109  
110    return tempGrad;
111   }
112  
113 < /*
114 < SymMatrix ConcreteNLMode1::calcHessian(){
113 >
114 > SymMatrix ConcreteNLModel1::calcHessian(){
115    calcGrad(currentX);
116 <  return FiniteHessian(currentX);
116 >  
117 >  return FiniteHessian(currentX, currentX);
118   }
119  
120 < SymMatrix ConcreteNLMode1::calcHessian(vector<double>& x){
121 <  return FiniteHessian(x);
120 > SymMatrix ConcreteNLModel1::calcHessian(vector<double>& x){
121 >  return FiniteHessian(x, x);
122   }
123 < */
123 >

Diff Legend

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