reader_ref.c:

 - prepare for writing ref files (EXTENSION WILL CHANGE TO REF)

dec_arrowheur.c:
 - fixed some issues in when presolving is on

heur_gcgcoefdiving.c:
 - disabled DEBUG output

hmetis:
 - added hmetis so that it can now actually run from svn

Author: Martin Bergner

hmetis

@@ -365,11 +365,25 @@ int computeHyperedgeWeight(SCIP *scip, SCIP_ARROWHEURDATA *arrowheurdata, SCIP_C
 {
    int j;
    int ncurvars;
+   SCIP_Bool upgraded;
    SCIP_CONS* upgdcons;
    const char* hdlrname;
+
+   upgraded = FALSE;
    *cost = arrowheurdata->consWeight;
+   hdlrname = SCIPconshdlrGetName(SCIPconsGetHdlr(cons));
+
+   if((strcmp("linear", hdlrname) == 0))
+   {
+      SCIP_CALL(SCIPupgradeConsLinear(scip, cons, &upgdcons));
+      if(upgdcons != NULL)
+         upgraded = TRUE;
+   }
+   else
+   {
+      upgdcons = cons;
+   }
 
-   SCIP_CALL(SCIPupgradeConsLinear(scip, cons, &upgdcons));
 
    if(upgdcons != NULL)
    {
@@ -448,7 +462,7 @@ int computeHyperedgeWeight(SCIP *scip, SCIP_ARROWHEURDATA *arrowheurdata, SCIP_C
       }
 
    }
-   if(upgdcons != NULL)
+   if(upgraded == TRUE)
    {
       SCIP_CALL(SCIPreleaseCons(scip, &upgdcons));
    }
@@ -1465,7 +1479,7 @@ SCIP_RETCODE detectAndBuildArrowHead(
    else
    {
       SCIP_Real bestscore = 1E20;
-      int bestsetting;
+      int bestsetting = -1;
       for( i = arrowheurdata->minblocks; i <= arrowheurdata->maxblocks; ++i)
       {
          SCIP_Real cumscore;

src/dec_arrowheur.c

@@ -19,7 +19,7 @@
 /*---+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8----+----9----+----0----+----1----+----2*/
 
 /* toggle debug mode */
-#define SCIP_DEBUG
+//#define SCIP_DEBUG
 
 #include <assert.h>
 #include <string.h>

src/heur_gcgcoefdiving.c

@@ -96,6 +96,10 @@ static const char delimchars[] = " \f\n\r\t\v";
 static const char tokenchars[] = "-+:<>=";
 static const char commentchars[] = "\\";
 
+struct SCIP_ReaderData
+{
+   DECDECOMP*           decdecomp;
+};
 
 
 
@@ -822,55 +826,32 @@ SCIP_RETCODE readREFFile(
 
 /** writes a BLK file */
 static
-SCIP_RETCODE writeBLKFile(
+SCIP_RETCODE writeREFFile(
    SCIP*                 scip,              /**< SCIP data structure */
-   REFINPUT*             refinput           /**< REF reading data */
+   SCIP_READER*          reader,
+   FILE*                 file
+
    )
 {
-   char filename[SCIP_MAXSTRLEN];
-   FILE* outfile;
-   SCIP_VAR** vars;
-   SCIP_VARDATA* vardata;
-   int nvars;
-
-   int i;
-   int v;
-
-   SCIPsnprintf(filename, SCIP_MAXSTRLEN, "%s.blk", SCIPgetProbName(scip));
-   outfile = fopen(filename, "w");
-
-   SCIP_CALL( SCIPgetVarsData(scip, &vars, &nvars, NULL, NULL, NULL, NULL) );
+   SCIP_READERDATA* readerdata;
 
-   SCIPinfoMessage(scip, outfile, "NBlocks\n");
-   SCIPinfoMessage(scip, outfile, "%d\n", refinput->nblocks);
+   int nvars;
+   int nconss;
 
-   for( i = 0; i < refinput->nblocks; i++ )
-   {
-      SCIPinfoMessage(scip, outfile, "Block %d\n", i + 1);
+   assert(scip != NULL);
+   assert(reader != NULL);
+   assert(file != NULL);
+   assert(result != NULL);
 
-      for( v = 0; v < nvars; v++ )
-      {
-         vardata = SCIPvarGetData(vars[v]);
-         if( vardata->blocknr == i )
-         {
-            SCIPinfoMessage(scip, outfile, "%s\n", SCIPvarGetName(vars[v]));
-         }
-      }
-   }
+   readerdata = SCIPreaderGetData(reader);
+   assert(readerdata != NULL);
 
-   if( refinput->nmarkedmasterconss > 0 )
+   if(readerdata->decdecomp == NULL)
    {
-      SCIPinfoMessage(scip, outfile, "Masterconss\n");
-      for( i = 0; i < refinput->nmarkedmasterconss; i++ )
-      {
-         SCIPinfoMessage(scip, outfile, "%s\n", SCIPconsGetName(refinput->markedmasterconss[i]));
-      }
+      SCIPerrorMessage("No reformulation exists, cannot write reformulation file!\n");
+      return SCIP_INVALIDCALL;
    }
 
-   SCIPinfoMessage(scip, outfile, "END\n");
-
-   fclose(outfile);
-
    return SCIP_OKAY;
 }
 
@@ -880,7 +861,20 @@ SCIP_RETCODE writeBLKFile(
  */
 
 /** destructor of reader to free user data (called when SCIP is exiting) */
-#define readerFreeRef NULL
+SCIP_DECL_READERFREE(readerFreeRef)
+{
+   SCIP_READERDATA* readerdata;
+   assert(scip != NULL);
+   assert(reader != NULL);
+
+   assert(strcmp(SCIPreaderGetName(reader), READER_NAME) == 0);
+   readerdata = SCIPreaderGetData(reader);
+   assert(readerdata != NULL);
+
+   SCIPfreeMemory(scip, &readerdata);
+
+   return SCIP_OKAY;
+}
 
 
 /** problem reading method of reader */
@@ -897,6 +891,8 @@ SCIP_DECL_READERREAD(readerReadRef)
 static
 SCIP_DECL_READERWRITE(readerWriteRef)
 {
+   SCIP_CALL(writeREFFile(scip, reader, file));
+   *result = SCIP_SUCCESS;
    return SCIP_OKAY;
 }
 
@@ -912,7 +908,7 @@ SCIP_RETCODE SCIPincludeReaderRef(
    SCIP_READERDATA* readerdata;
 
    /* create blk reader data */
-   readerdata = NULL;
+   SCIP_CALL(SCIPallocMemory(scip, readerdata));
 
    /* include lp reader */
    SCIP_CALL( SCIPincludeReader(scip, READER_NAME, READER_DESC, READER_EXTENSION,
@@ -1007,3 +1003,28 @@ SCIP_RETCODE SCIPreadRef(
 
    return SCIP_OKAY;
 }
+
+/** set the decomp structure */
+extern
+SCIP_RETCODE SCIPReaderREFSetDecomp(
+   SCIP*       scip,       /**< SCIP data structure */
+   SCIP_READER* reader,    /**< Reader data structure */
+   DECDECOMP*  decdecomp   /**< DECOMP data structure */
+
+   )
+{
+
+   SCIP_READERDATA* readerdata;
+   assert(scip != NULL);
+   assert(decdecomp != NULL);
+   assert(reader != NULL);
+
+   assert(strcmp(SCIPreaderGetName(reader), READER_NAME) == 0);
+   readerdata = SCIPreaderGetData(reader);
+
+   assert(readerdata != NULL);
+
+   readerdata->decdecomp = decdecomp;
+
+   return SCIP_OKAY;
+}