Another fix in Mergesat compilation.

pysathq · Mar 31, 2021 · d559ac4 · d559ac4
1 parent ed72c51
commit d559ac4
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 2 deletions.
diff --git a/pysat/__init__.py b/pysat/__init__.py
@@ -10,7 +10,7 @@
 
 # current version
 #==============================================================================
-VERSION = (0, 1, 7, "dev", 0)
+VERSION = (0, 1, 7, "dev", 1)
 
 
 # PEP440 Format

diff --git a/solvers/patches/mergesat3.patch b/solvers/patches/mergesat3.patch
@@ -1850,7 +1850,7 @@ diff -Naur solvers/mergesat3/utils/Options.cc solvers/mgs3/utils/Options.cc
 
 diff -Naur solvers/mergesat3/utils/Options.h solvers/mgs3/utils/Options.h
 --- solvers/mergesat3/utils/Options.h	2021-03-25 18:15:00.000000000 +1100
-+++ solvers/mgs3/utils/Options.h	2021-03-31 12:07:03.000000000 +1100
++++ solvers/mgs3/utils/Options.h	2021-03-31 22:56:29.000000000 +1100
 @@ -17,23 +17,23 @@
  OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  **************************************************************************************************/
@@ -1882,6 +1882,47 @@ diff -Naur solvers/mergesat3/utils/Options.h solvers/mgs3/utils/Options.h
  {
 
  //==================================================================================================
+@@ -638,23 +638,23 @@
+
+     virtual void help(bool verbose = false)
+     {
+-        fprintf(stderr, "  -%-12s = %-8s [", name, type_name);
+-        if (range.begin == INT64_MIN)
+-            fprintf(stderr, "imin");
+-        else
+-            fprintf(stderr, "%4" PRIi64, range.begin);
+-
+-        fprintf(stderr, " .. ");
+-        if (range.end == INT64_MAX)
+-            fprintf(stderr, "imax");
+-        else
+-            fprintf(stderr, "%4" PRIi64, range.end);
+-
+-        fprintf(stderr, "] (default: %" PRIi64 ")\n", value);
+-        if (verbose) {
+-            fprintf(stderr, "\n        %s\n", description);
+-            fprintf(stderr, "\n");
+-        }
++        /* fprintf(stderr, "  -%-12s = %-8s [", name, type_name); */
++        /* if (range.begin == INT64_MIN) */
++        /*     fprintf(stderr, "imin"); */
++        /* else */
++        /*     fprintf(stderr, "%4" PRIi64, range.begin); */
++
++        /* fprintf(stderr, " .. "); */
++        /* if (range.end == INT64_MAX) */
++        /*     fprintf(stderr, "imax"); */
++        /* else */
++        /*     fprintf(stderr, "%4" PRIi64, range.end); */
++
++        /* fprintf(stderr, "] (default: %" PRIi64 ")\n", value); */
++        /* if (verbose) { */
++        /*     fprintf(stderr, "\n        %s\n", description); */
++        /*     fprintf(stderr, "\n"); */
++        /* } */
+     }
+
+     void fillGranularityDomain(int granularity, std::vector<int64_t> &values)
 @@ -715,23 +715,23 @@
                  if (i != 0) {
                      fprintf(pcsFile, ",");

diff --git a/web/news.rst b/web/news.rst
@@ -14,6 +14,11 @@ Changelog and more
 31.03.2021 (*0.1.7.dev1*)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+- An attempt to fix compilation issues of Mergesat.
+
+31.03.2021 (*0.1.7.dev0*)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 - Added basic interface to :class:`Mergesat3`.
 - Ported :class:`Minicard`'s native cardinality support to Glucose, which
   resulted in solvers :class:`Gluecard3` and :class:`Gluecard4`.