Merge pull request #30 from SCIP-Interfaces/update-scip-release-4.0

changes to support SCIP 4.0

Makefile

@@ -53,6 +53,11 @@ clean:
 	@rm -f $(CSIPLIB)
 	@rm -f $(TESTBIN)
 
+.PHONY: clean-links
+clean-links: 
+	@echo "removing symlinks"
+	@rm -rf $(CSIPLIBDIR)
+
 .PHONY: test
 test: 
 	@make $(TESTBIN)

README.md

@@ -20,10 +20,11 @@ single callback function.
 
 ### SCIP and SoPlex
 
-CSIP depends on the
-[SCIP Optimization Suite](http://scip.zib.de/#scipoptsuite).
+CSIP depends on the [SCIP Optimization Suite](http://scip.zib.de/#scipoptsuite).
+Starting with release 0.4.0, **CSIP only supports SCIP Optimization Suite
+4.0.0** or newer.
 
-[Download](http://scip.zib.de/download.php?fname=scipoptsuite-3.2.1.tgz)
+[Download](http://scip.zib.de/download.php?fname=scipoptsuite-4.0.0.tgz)
 and extract the source files, then build the shared library
 (containing SCIP and SoPlex) with
 

src/csip.c

@@ -6,8 +6,8 @@
 #include "scip/scipdefplugins.h"
 
 #define CSIP_MAJOR_VERSION 0
-#define CSIP_MINOR_VERSION 3
-#define CSIP_PATCH_VERSION 6
+#define CSIP_MINOR_VERSION 4
+#define CSIP_PATCH_VERSION 0
 
 /* objective type */
 typedef int CSIP_OBJTYPE;
@@ -1473,7 +1473,7 @@ CSIP_RETCODE CSIPheurAddSolution(CSIP_HEURDATA *heurdata, double *values)
 
     SCIP_in_CSIP(SCIPcreateSol(scip, &sol, heurdata->heur));
     SCIP_in_CSIP(SCIPsetSolVals(scip, sol, model->nvars, model->vars, values));
-    SCIP_in_CSIP(SCIPtrySolFree(scip, &sol, FALSE, TRUE, TRUE, TRUE, &stored));
+    SCIP_in_CSIP(SCIPtrySolFree(scip, &sol, FALSE, FALSE, TRUE, TRUE, TRUE, &stored));
 
     if (stored > 0)
     {