[ViewVC] Diff of: OpenMD/trunk/src/optimization/EndCriteria.cpp

Comparing:
branches/development/src/optimization/EndCriteria.cpp (file contents), Revision 1741 by gezelter, Tue Jun 5 18:02:44 2012 UTC vs.
trunk/src/optimization/EndCriteria.cpp (file contents), Revision 1981 by gezelter, Mon Apr 14 18:32:51 2014 UTC

#	Line 22 \| Line 22
22		#include "optimization/EndCriteria.hpp"
23		#include "utils/simError.h"
24		#include <cmath>
25	+	#include <cstdio>
26
27
27	–
28		namespace QuantLib {
29
30		EndCriteria::EndCriteria(size_t maxIterations,
#	Line 144 \| Line 144 \| namespace QuantLib {
144		checkStationaryFunctionValue(fold, fnew, statStateIterations, ecType) \|\|
145		checkStationaryFunctionAccuracy(fnew, positiveOptimization, ecType) \|\|
146		checkZeroGradientNorm(normgnew, ecType);
147	+	sprintf(painCave.errMsg,
148	+	"\n\tOptimization: Current iteration Count: ( %lu )\n",
149	+	(unsigned long)iteration);
150	+	painCave.isFatal = 0;
151	+	painCave.severity = OPENMD_INFO;
152	+	simError();
153		}
154
155		// Inspectors
#	Line 190 \| Line 196 \| namespace QuantLib {
196		painCave.severity = OPENMD_ERROR;
197		simError();
198		}
199	+	return out;
200		}
201
202		}

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