Merge remote-tracking branch 'origin/v10-minor'

Author: scip-ci

src/scip/nlpi_filtersqp.c

@@ -33,7 +33,7 @@
 /*---+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8----+----9----+----0----+----1----+----2*/
 
 #include <string.h>
-#if defined(_WIN32)
+#ifdef _WIN32
 #include <windows.h>
 #else
 #include <sys/time.h>

src/symmetry/compute_symmetry_sassy_bliss.cpp

@@ -269,68 +269,79 @@ SCIP_RETCODE computeAutomorphisms(
    /* call sassy to reduce graph */
    sassy.reduce(G, &sassyglue);
 
-   /* create bliss graph */
-   bliss::Graph blissgraph(0);
+   if( G->get_sgraph()->v_size == 0 )
+   {
+      dejavu::big_number grp_sz = sassy.grp_sz;
+      *log10groupsize = (SCIP_Real) log10l(grp_sz.mantissa * powl(10.0, (SCIP_Real) grp_sz.exponent));
+   }
+   else
+   {
+      /* create bliss graph */
+      bliss::Graph blissgraph(0);
 
-   /* convert sassy to bliss graph */
-   convert_dejavu_to_bliss(G, &blissgraph);
+      /* convert sassy to bliss graph */
+      convert_dejavu_to_bliss(G, &blissgraph);
 
 #ifdef SCIP_OUTPUT
-   blissgraph.write_dot("debug.dot");
+      blissgraph.write_dot("debug.dot");
 #endif
 
 #ifdef SCIP_DISABLED_CODE
-   char filename[SCIP_MAXSTRLEN];
-   (void) SCIPsnprintf(filename, SCIP_MAXSTRLEN, "%s.dimacs", SCIPgetProbName(scip));
-   FILE* fp = fopen(filename, "w");
-   if ( fp )
-   {
-      blissgraph.write_dimacs(fp);
-      fclose(fp);
-   }
+      char filename[SCIP_MAXSTRLEN];
+      (void) SCIPsnprintf(filename, SCIP_MAXSTRLEN, "%s.dimacs", SCIPgetProbName(scip));
+      FILE* fp = fopen(filename, "w");
+      if ( fp )
+      {
+         blissgraph.write_dimacs(fp);
+         fclose(fp);
+      }
 #endif
 
+      /* compute automorphisms */
+      bliss::Stats stats;
 
-   /* compute automorphisms */
-   bliss::Stats stats;
-
-   /* Prefer splitting partition cells corresponding to variables over those corresponding
-    * to inequalities. This is because we are only interested in the action
-    * of the automorphism group on the variables, and we need a base for this action */
-   blissgraph.set_splitting_heuristic(bliss::Graph::shs_f);
-   /* disable component recursion as advised by Tommi Junttila from bliss */
-   blissgraph.set_component_recursion(false);
+      /* Prefer splitting partition cells corresponding to variables over those corresponding
+       * to inequalities. This is because we are only interested in the action
+       * of the automorphism group on the variables, and we need a base for this action */
+      blissgraph.set_splitting_heuristic(bliss::Graph::shs_f);
+      /* disable component recursion as advised by Tommi Junttila from bliss */
+      blissgraph.set_component_recursion(false);
 
 #if BLISS_VERSION_MAJOR >= 1 || BLISS_VERSION_MINOR >= 76
-   /* lambda function to have access to data and terminate the search if maxgenerators are reached */
-   auto term = [&]() {
-      return (maxgenerators != 0 && data.nperms >= maxgenerators); /* check the number of generators that we have created so far */
-   };
+      /* lambda function to have access to data and terminate the search if maxgenerators are reached */
+      auto term = [&]() {
+         return (maxgenerators != 0 && data.nperms >= maxgenerators); /* check the number of generators that we have created so far */
+      };
 
-   auto hook = [&](unsigned int n, const unsigned int* aut) {
-      sassy.bliss_hook(n, aut);
-   };
+      auto hook = [&](unsigned int n, const unsigned int* aut) {
+         sassy.bliss_hook(n, aut);
+      };
 
-   /* start search */
-   blissgraph.find_automorphisms(stats, hook, term);
+      /* start search */
+      blissgraph.find_automorphisms(stats, hook, term);
 #else
 
-   /* Older bliss versions do not allow to terminate with a limit on the number of generators unless patched. */
+      /* Older bliss versions do not allow to terminate with a limit on the number of generators unless patched. */
 #ifdef BLISS_PATCH_PRESENT
-   /* If patch is present, do not use a node limit, but set generator limit. This approach is not very accurate, since
-    * it limits the generators considered in bliss and not the ones that we generate (the ones that work on the variable
-    * set). */
-   blissgraph.set_search_limits(0, (unsigned) maxgenerators);
+      /* If patch is present, do not use a node limit, but set generator limit. This approach is not very accurate, since
+       * it limits the generators considered in bliss and not the ones that we generate (the ones that work on the variable
+       * set). */
+      blissgraph.set_search_limits(0, (unsigned) maxgenerators);
 #endif
 
-   /* start search */
-   blissgraph.find_automorphisms(stats, dejavu::preprocessor::bliss_hook, (void*) &sassy);
+      /* start search */
+      blissgraph.find_automorphisms(stats, dejavu::preprocessor::bliss_hook, (void*) &sassy);
 #endif
-   *symcodetime = SCIPgetSolvingTime(scip) - oldtime;
 
 #ifdef SCIP_OUTPUT
-   (void) stats.print(stdout);
+      (void) stats.print(stdout);
 #endif
+      /* determine log10 of symmetry group size */
+      dejavu::big_number grp_sz = sassy.grp_sz;
+      *log10groupsize = (SCIP_Real) log10l(stats.get_group_size_approx() * grp_sz.mantissa * powl(10.0, (SCIP_Real) grp_sz.exponent));
+   }
+
+   *symcodetime = SCIPgetSolvingTime(scip) - oldtime;
 
    /* prepare return values */
    if ( data.nperms > 0 )
@@ -349,10 +360,6 @@ SCIP_RETCODE computeAutomorphisms(
       *nmaxperms = 0;
    }
 
-   /* determine log10 of symmetry group size */
-   dejavu::big_number grp_sz = sassy.grp_sz;
-   *log10groupsize = (SCIP_Real) log10l(stats.get_group_size_approx() * grp_sz.mantissa * powl(10.0, (SCIP_Real) grp_sz.exponent));
-
    return SCIP_OKAY;
 }
 

src/symmetry/compute_symmetry_sassy_nauty.cpp

@@ -324,7 +324,7 @@ SCIP_RETCODE computeAutomorphisms(
    *nperms = 0;
    *nmaxperms = 0;
    *perms = NULL;
-   *log10groupsize = 0;
+   *log10groupsize = 0.0;
    *symcodetime = 0.0;
 
    /* init data */
@@ -357,50 +357,55 @@ SCIP_RETCODE computeAutomorphisms(
    /* call sassy to reduce graph */
    sassy.reduce(G, &sassyglue);
 
-   /* first, convert the graph */
-   sparsegraph sg;
-   DYNALLSTAT(int, lab, lab_sz);
-   DYNALLSTAT(int, ptn, ptn_sz);
+   if( G->get_sgraph()->v_size == 0 )
+   {
+      dejavu::big_number grp_sz = sassy.grp_sz;
+      *log10groupsize = (SCIP_Real) log10l(grp_sz.mantissa * powl(10.0, (SCIP_Real) grp_sz.exponent));
+   }
+   else
+   {
+      /* first, convert the graph */
+      sparsegraph sg;
+      DYNALLSTAT(int, lab, lab_sz);
+      DYNALLSTAT(int, ptn, ptn_sz);
 
 #ifdef NAUTY
-   convert_dejavu_to_nauty(G, &sg, &lab, &lab_sz, &ptn, &ptn_sz);
-   statsblk stats;
-   DYNALLSTAT(int, orbits, orbits_sz);
-   DYNALLOC1(int, orbits, orbits_sz, sg.nv, "malloc");
-   DEFAULTOPTIONS_SPARSEGRAPH(options);
-   /* init callback functions for nauty (accumulate the group generators found by nauty) */
-   options.writeautoms = FALSE;
-   options.userautomproc = dejavu::preprocessor::nauty_hook;
-   options.defaultptn = FALSE; /* use color classes */
-   if ( canterminateearly )
-      options.usernodeproc = nautyterminationhook;
-   *log10groupsize = 0.0;
-   if(sg.nv > 0) {
+      convert_dejavu_to_nauty(G, &sg, &lab, &lab_sz, &ptn, &ptn_sz);
+      assert( sg.nv > 0 );
+
+      statsblk stats;
+      DYNALLSTAT(int, orbits, orbits_sz);
+      DYNALLOC1(int, orbits, orbits_sz, sg.nv, "malloc");
+      DEFAULTOPTIONS_SPARSEGRAPH(options);
+      /* init callback functions for nauty (accumulate the group generators found by nauty) */
+      options.writeautoms = FALSE;
+      options.userautomproc = dejavu::preprocessor::nauty_hook;
+      options.defaultptn = FALSE; /* use color classes */
+      if ( canterminateearly )
+         options.usernodeproc = nautyterminationhook;
       sparsenauty(&sg, lab, ptn, orbits, &options, &stats, NULL);
       dejavu::big_number grp_sz = sassy.grp_sz;
       *log10groupsize = log10(stats.grpsize1 * grp_sz.mantissa * pow(10.0, (SCIP_Real) (stats.grpsize2 + grp_sz.exponent)));
-   }
 #else
-   convert_dejavu_to_traces(&sassygraph, &sg, &lab, &lab_sz, &ptn, &ptn_sz);
-   TracesStats stats;
-   DYNALLSTAT(int, orbits, orbits_sz);
-   DYNALLOC1(int, orbits, orbits_sz, sg.nv, "malloc");
-   DEFAULTOPTIONS_TRACES(options);
-   /* init callback functions for traces (accumulate the group generators found by traces) */
-   options.writeautoms = FALSE;
-   options.userautomproc = dejavu::preprocessor::traces_hook;
-   options.defaultptn = FALSE; /* use color classes */
-   if(sg.nv > 0) {
+      convert_dejavu_to_traces(&sassygraph, &sg, &lab, &lab_sz, &ptn, &ptn_sz);
+      TracesStats stats;
+      DYNALLSTAT(int, orbits, orbits_sz);
+      DYNALLOC1(int, orbits, orbits_sz, sg.nv, "malloc");
+      DEFAULTOPTIONS_TRACES(options);
+      /* init callback functions for traces (accumulate the group generators found by traces) */
+      options.writeautoms = FALSE;
+      options.userautomproc = dejavu::preprocessor::traces_hook;
+      options.defaultptn = FALSE; /* use color classes */
       Traces(&sg, lab, ptn, orbits, &options, &stats, NULL);
       dejavu::big_number grp_sz = sassy.grp_sz;
       *log10groupsize = log10(stats.grpsize1 * grp_sz.mantissa * pow(10.0, (SCIP_Real) (stats.grpsize2 + grp_sz.exponent)));
-   }
 #endif
 
-   /* clean up */
-   DYNFREE(lab, lab_sz);
-   DYNFREE(ptn, ptn_sz);
-   SG_FREE(sg);
+      /* clean up */
+      DYNFREE(lab, lab_sz);
+      DYNFREE(ptn, ptn_sz);
+      SG_FREE(sg);
+   }
 
    *symcodetime = SCIPgetSolvingTime(scip) - oldtime;