[ViewVC] Diff of: group/trunk/OOPSE/libmdtools/ConjugateMinimizer.cpp

Comparing trunk/OOPSE/libmdtools/ConjugateMinimizer.cpp (file contents):
Revision 1031 by tim, Fri Feb 6 18:58:06 2004 UTC vs.
Revision 1046 by tim, Tue Feb 10 21:33:44 2004 UTC

#	Line 6 \| Line 6 \| ConjugateMinimizerBase::ConjugateMinimizerBase(NLModel
6
7		model = nlmodel;
8		//set the dimension
9	<
9	>
10		#ifndef IS_MPI
11		dim = model->getDim();
12		#else
13	<
13	>	dim = model->getDim();
14		#endif
15		prevGrad.resize(dim);
16		gradient.resize(dim);
#	Line 68 \| Line 68 \| void ConjugateMinimizerBase::minimize(){
68		for(currentIter = 1;currentIter <= maxIteration; currentIter++){
69
70		// perform line search to minimize f(x + lamda * direction) where stepSize > 0
71	<	lsMinimizer->minimize(direction, 0.0, 1.0);
71	>	lsMinimizer->minimize(direction, 0.0, 0.01);
72
73		lsStatus = lsMinimizer->getMinimizationStatus();
74

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