Merge branch 'debug_sol_for_subscips' into 'master'

Add SCIPdebugClearSol()

See merge request integer/scip!3472

Author: svigerske

CHANGELOG

@@ -36,6 +36,7 @@ Interface changes
 - SCIPclearSymgraph() and SCIPcopySymgraphAsSubgraph() to clear and copy as symmetry detection graph, respectively
 - SCIPincludeSepaMultilinear() to include the new multilinear cut separator
 - SCIPhypergraphCreate(), SCIPhypergraphClear(), SCIPhypergraphFree(), SCIPhypergraphAddVertex(), SCIPhypergraphAddEdge(), SCIPhypergraphIsValid() and SCIPhypergraphComputeVerticesEdges() for building and deleting hypergraphs, SCIPhypergraphComputeOverlaps(), SCIPhypergraphOverlapFind(), SCIPhypergraphIntersectEdges(), SCIPhypergraphComputeOverlapsEdges(), SCIPhypergraphComputeVerticesOverlaps(), SCIPhypergraphOverlapsDisjoint() to deal with pair-wise intersections of hyperedges, SCIPhypergraphIterInit(), SCIPhypergraphIterClear(), SCIPhypergraphIterStart(), SCIPhypergraphIterValid(), SCIPhypergraphIterNext(), SCIPhypergraphIterBase(), SCIPhypergraphIterAdjacent(), SCIPhypergraphIterMinVertex(), SCIPhypergraphIterOverlap() for iterating over adjacent edges, SCIPhypergraphHasVertexEdges() SCIPhypergraphHasOverlaps(), SCIPhypergraphHasOverlapsEdges(), SCIPhypergraphHasVertexOverlaps(), SCIPhypergraphGetNVertices(), SCIPhypergraphGetNEdges(), SCIPhypergraphBlkmem(), SCIPhypergraphGetNOverlaps(), SCIPhypergraphVertexData(), SCIPhypergraphEdgeData(), SCIPhypergraphEdgeSize(), SCIPhypergraphEdgeVertices(), SCIPhypergraphVertexEdgesFirst(), SCIPhypergraphVertexEdgesBeyond(), SCIPhypergraphVertexEdgesGetAtIndex(), SCIPhypergraphOverlapData(), SCIPhypergraphOverlapSize(), SCIPhypergraphOverlapVertices() SCIPhypergraphEdgesOverlapsFirst(), SCIPhypergraphEdgesOverlapsBeyond(), SCIPhypergraphEdgesOverlapsGetAtIndex(), SCIPhypergraphOverlapsEdgesFirst(), SCIPhypergraphOverlapsEdgesBeyond(), SCIPhypergraphOverlapsEdgesGetAtIndex(), SCIPhypergraphVertexOverlapsFirst(), SCIPhypergraphVertexOverlapsBeyond() and SCIPhypergraphVertexOverlapsGetAtIndex() to query information about vertices, edges and overlaps as well as their incidences.
+- SCIPdebugClearSol() for clearing the debug solution
 
 ### Command line interface
 

CMakeLists.txt

@@ -17,7 +17,7 @@ set(SCIP_VERSION_MAJOR 10)
 set(SCIP_VERSION_MINOR 0)
 set(SCIP_VERSION_PATCH 0)
 set(SCIP_VERSION_SUB 0)
-set(SCIP_VERSION_API 120)
+set(SCIP_VERSION_API 121)
 
 project(SCIP
     VERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}.${SCIP_VERSION_PATCH}.${SCIP_VERSION_SUB}

make/make.project

@@ -97,7 +97,7 @@ SCIP_VERSION_MAJOR = 10
 SCIP_VERSION_MINOR = 0
 SCIP_VERSION_PATCH = 0
 SCIP_VERSION_SUB = 0
-SCIP_VERSION_API = 120
+SCIP_VERSION_API = 121
 SCIP_VERSION = $(SCIP_VERSION_MAJOR).$(SCIP_VERSION_MINOR).$(SCIP_VERSION_PATCH).$(SCIP_VERSION_SUB)
 
 # compiling and linking parameters

src/scip/debug.c

@@ -717,6 +717,35 @@ SCIP_RETCODE SCIPdebugFreeSol(
    return SCIP_OKAY;
 }
 
+/** clears the debug solution */
+SCIP_RETCODE SCIPdebugClearSol(
+   SCIP*                 scip                /**< SCIP data structure */
+   )
+{
+   SCIP_DEBUGSOLDATA* debugsoldata;
+   int s;
+
+   assert(scip != NULL);
+
+   debugsoldata = SCIPsetGetDebugSolData(scip->set);
+   assert(debugsoldata != NULL);
+
+   if( debugsoldata->debugsol != NULL )
+   {
+      SCIP_CALL( SCIPfreeSol(scip, &debugsoldata->debugsol) );
+   }
+   SCIP_CALL( SCIPcreateOrigSol(scip, &debugsoldata->debugsol, NULL) );
+
+   for( s = debugsoldata->nsolvals - 1; s >= 0; --s )
+      BMSfreeMemoryArrayNull(&(debugsoldata->solnames[s]));
+
+   debugsoldata->nsolvals = 0;
+   debugsoldata->debugsolval= 0.0;
+   debugsoldata->solisachieved = FALSE;
+
+   return SCIP_OKAY;
+}
+
 /** resets the data structure after restart */
 SCIP_RETCODE SCIPdebugReset(
    SCIP_SET*             set

src/scip/debug.h

@@ -70,6 +70,11 @@ SCIP_RETCODE SCIPdebugFreeSol(
    SCIP_SET*             set
    );
 
+/** clears the debug solution */
+SCIP_RETCODE SCIPdebugClearSol(
+   SCIP*                 scip                /**< SCIP data structure */
+   );
+
 /** resets the data structure after restart */
 SCIP_RETCODE SCIPdebugReset(
    SCIP_SET*             set