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 1015 by tim, Tue Feb 3 22:54:52 2004 UTC

# Line 71 | Line 71 | double ConcreteNLMode1::calcF(){
71    return currentF;
72   }
73  
74 < double ConcreteNLMode1::calcF(const vector<double>& x){
74 > double ConcreteNLMode1::calcF(vector<double>& x){
75  
76    vector<double> tempGrad(x.size());
77    
78    double tempF;
79  
80 <  //tempF = (*objfunc)(x, tempGrad);
80 >  tempF = (*objfunc)(x, tempGrad);
81    numOfFunEval ++;
82    
83    return tempF;  
# Line 91 | Line 91 | vector<double> ConcreteNLMode1::calcGrad(){
91  
92   }
93  
94 < vector<double> ConcreteNLMode1::calcGrad(const vector<double>& x){
95 <  vector<double> tempGrad;
96 <  //vector<double> tempGrad(x.szie());
94 > vector<double> ConcreteNLMode1::calcGrad(vector<double>& x){
95 >  vector<double> tempGrad(x.size());
96  
97    double tempF;
98    
99 <  //tempF = (*objfunc)(x, tempGrad);
99 >  tempF = (*objfunc)(x, tempGrad);
100  
101    return tempGrad;
102   }

Diff Legend

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