From: stevenj <stevenj@alum.mit.edu>
Date: Tue, 11 Nov 2008 22:10:32 +0000 (-0500)
Subject: bug fix in MMA for infeasible starting point -- feasible points always take precedenc... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=70f7892361ecb957d4cc3dd53a609d8159cb3a7a;p=nlopt.git

bug fix in MMA for infeasible starting point -- feasible points always take precedence over infeasible ones

darcs-hash:20081111221032-c8de0-c23046ac2c38fd7781ba3d7b1e6334126ca9e344.gz
---

diff --git a/mma/mma.c b/mma/mma.c
index 604d45d..a611a1c 100644
--- a/mma/mma.c
+++ b/mma/mma.c
@@ -297,7 +297,8 @@ nlopt_result mma_minimize(int n, nlopt_func f, void *f_data,
 		    }
 	       }
 
-	       if (fcur < *minf && (inner_done || feasible_cur || !feasible)) {
+	       if ((fcur < *minf && (inner_done || feasible_cur || !feasible))
+		    || (!feasible && feasible_cur)) {
 		    if (mma_verbose && !feasible_cur)
 			 printf("MMA - using infeasible point?\n");
 		    dd.fval = *minf = fcur;