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

Comparing trunk/OOPSE/libmdtools/ConjugateMinimizer.cpp (file contents):
Revision 1035 by tim, Fri Feb 6 21:37:59 2004 UTC vs.
Revision 1057 by tim, Tue Feb 17 19:23:44 2004 UTC

#	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
#	Line 122 \| Line 122 \| void ConjugateMinimizerBase::minimize(){
122
123		// if writeFrq is not a multipiler of maxIteration, we need to write the final result
124		// otherwise, we already write it inside the loop, just skip it
125	<	if(currentIter != (nextWriteIter - writeFrq))
125	>	if(currentIter - 1 != (nextWriteIter - writeFrq))
126		writeOut(minX, currentIter);
127
128		minStatus = MINSTATUS_MAXITER;

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