Commit d9056751 authored by Robert Ricci's avatar Robert Ricci

Back out last commit - it's causing assing to go into an infinite loop

in some (okay, many) cases. Not sure why, though.
parent 20b09670
......@@ -34,11 +34,6 @@ name_name_map fixed_nodes;
// allowed to move these.
name_name_map node_hints;
// From assign.cc
#ifdef GNUPLOT_OUTPUT
extern FILE *scoresout, *tempout, *deltaout;
#endif
// Determines whether to accept a change of score difference 'change' at
// temperature 'temperature'.
inline int accept(double change, double temperature)
......@@ -894,13 +889,11 @@ void anneal(bool scoring_selftest, double scale_neighborhood,
if (accepttrans) {
bestscore = newscore;
bestviolated = violated;
#ifdef GNUPLOT_OUTPUT
fprintf(tempout,"%f\n",temp);
fprintf(scoresout,"%f\n",newscore);
fprintf(deltaout,"%f\n",-scorediff);
#endif
avgscore += newscore;
accepts++;
......@@ -1080,9 +1073,8 @@ NOTQUITEDONE:
);
if ((tsteps >= mintsteps) &&
#ifdef ALLOW_NEGATIVE_DELTA
// ((fabs(deltaavg) < 0.0000001)
// || (fabs((temp / initialavg) * (deltaavg/ deltatemp)) < epsilon))) {
((temp / initialavg) * (deltaavg/ deltatemp)) < epsilon) {
((fabs(deltaavg) < 0.0000001)
|| (fabs((temp / initialavg) * (deltaavg/ deltatemp)) < epsilon))) {
#else
(deltaavg > 0) && ((temp / initialavg) * (deltaavg/ deltatemp) < epsilon)) {
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment