From fd94521c13e107ae262e2e5a34f80d605b0bd034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20L=C3=B6fberg?= <johanl@isy.liu.se>
Date: Sat, 24 Jun 2017 09:57:18 +0200
Subject: [PATCH] Revert to code around cplex settings bug

---
 extras/sdpsettings.m | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/extras/sdpsettings.m b/extras/sdpsettings.m
index 078cd7ed..9b65deb9 100644
--- a/extras/sdpsettings.m
+++ b/extras/sdpsettings.m
@@ -608,12 +608,13 @@
 
 function cplex = setup_cplex_options
 try
-%    if strfind(version,'2016')
-%        cplex = cplexoptimset;
-%    else
+    v = version;
+    if strfind(v,'2016') || strfind(v,'2017') 
+        cplex = cplexoptimset;
+    else
         cplex = cplexoptimset('cplex');
         cplex.output.clonelog = 0;
-%    end
+    end
 catch
     cplex.presol = 1;
     cplex.niter = 1;