From: Ian Jackson <ian@liberator.(none)>
Date: Fri, 2 Oct 2009 22:02:12 +0000 (+0100)
Subject: Use GLPK's simplex solver instead
X-Git-Tag: 5.0^2~87
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=81bd9338a2395caf88731f9d16de5b88868dd5c9

Use GLPK's simplex solver instead
(interior point solver complains about numerical instability)
---

diff --git a/yarrg/rsvalue.c b/yarrg/rsvalue.c
index 70e1f65..f867319 100644
--- a/yarrg/rsvalue.c
+++ b/yarrg/rsvalue.c
@@ -313,14 +313,15 @@ double value_route(int nislands, const int *islands) {
     if (DEBUGP(lp))
       lpx_write_cpxlp(lp, (char*)DEBUG_DEV);
 
-    int ipr= lpx_interior(lp);
+    int ipr= lpx_simplex(lp);
     assert(ipr==LPX_E_OK);
 
     if (DEBUGP(lp))
-      lpx_print_ips(lp, (char*)DEBUG_DEV);
+      lpx_print_sol(lp, (char*)DEBUG_DEV);
 
-    assert(lpx_ipt_status(lp) == LPX_T_OPT);
-    profit= lpx_ipt_obj_val(lp);
+    int lpst= lpx_get_status(lp);
+    assert(lpst == LPX_OPT);
+    profit= lpx_get_obj_val(lp);
   }
 
   lpx_delete_prob(lp);