From: stevenj <stevenj@alum.mit.edu>
Date: Tue, 11 Sep 2007 22:42:19 +0000 (-0400)
Subject: first stab at minf_max support in StoGO (clearly too conservative still)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7d6fcd69c02677a342236dcde292cadd97a7f33b;p=nlopt.git

first stab at minf_max support in StoGO (clearly too conservative still)

darcs-hash:20070911224219-c8de0-7eb662a7671d5ae99616bb64dc3cf754c1d7376f.gz
---

diff --git a/stogo/global.cc b/stogo/global.cc
index b27925e..6a54518 100644
--- a/stogo/global.cc
+++ b/stogo/global.cc
@@ -140,6 +140,10 @@ double Global::NewtonTest(RTBox box, int axis, RCRVector x_av, int *noutside) {
 	  cout << " F=" <<tmpTrial.objval << " FC=" << FC << endl;
 	}
 	SolSet.push_back(tmpTrial);
+#ifdef NLOPT_UTIL_H
+	if (tmpTrial.objval < stop->minf_max)
+	  break;
+#endif
       }
 #ifdef GS_DEBUG
       cout << "Found a stationary point, X= " << tmpTrial.xvals;
@@ -236,6 +240,12 @@ void Global::Search(int axis, RCRVector x_av){
 #endif
       ReduceOrSubdivide(box, axis, x_av);
 
+#ifdef NLOPT_UTIL_H
+      if (!NoMinimizers() && OneMinimizer(x) < stop->minf_max) {
+	done = TRUE;
+	break;
+      }
+#endif
       if (!InTime()) {
         done=TRUE;
 	if (stogo_verbose)