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

Comparing trunk/OOPSE/libmdtools/ConjugateMinimizer.hpp (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 1 \| Line 1
1		#ifndef _CONJUGATEMINIMIZER_H_
2		#define _CONJUGATEMINIMIZER_H_
3
4	<	#include "MinimizerBase.hpp"
4	>	#include "Minimizer.hpp"
5
6		//abstract class of conjugate gradient minimizer
7		class ConjugateMinimizerBase : public MinimizerUsingLineSearch{
#	Line 17 \| Line 17 \| class ConjugateMinimizerBase : public MinimizerUsingLi
17		virtual int checkConvergence();
18		virtual void reset();
19		virtual void printMinizerInfo();
20	+	virtual void writeOut(vector<double>& x, double iter) {}
21
22		protected:
23
24	<	double calcGamma(vector<double>& newGrad, vector<double>& oldGrad) = 0;
24	>	virtual double calcGamma(vector<double>& newGrad, vector<double>& oldGrad) = 0;
25		NLModel0 * model;
26
27		vector<double> prevGrad;

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