ruby-minisat 2.2.0.1 → 2.2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a154d9157d2e65b5e29e65434c3acf26ddafae4982c3fdb5bf27e890fb3f60a
-  data.tar.gz: 9d85a3db858add69252a19b185bc50716f14ba651c35cadc3a189caaee8e1500
+  metadata.gz: 34056195496ee40822633a89100c76924d2996a03c530f509837a929ca858695
+  data.tar.gz: 33f663f96330f53227c5eacbda20eb4c90d95cfb1ddb8049b01ee4820e7d566a
 SHA512:
-  metadata.gz: f74ed73c8416fa4bb7131a70e2525d1850b7ba88a115c1b4d048053dc4c59bf32b13fbf3402246b7b5990f2b2d23a485abea39db1a737d3eb802c2a624e9ece1
-  data.tar.gz: e0698e3afff27bc6de4dc7c28085192a65288b0b2c2704d0c1995320fa179cb9d6db0bc379673ae85b68cb74fc073fc042f73864f42e84ceca3d67c9f5e6aa61
+  metadata.gz: a4828f7b39efd95eb28956fca07ec6e650dbc941ef8d3526b5e0841f021c3eb486947dc9d8cf01c0e7e2ab155983b0dd36aadf5329b7b7bdfbcbdc02d7716898
+  data.tar.gz: 55f0c175f2798efa0773ddae57440537be275ee56eb42f6881b29a96cf9ddc226763b37915588449cf5704c70727d2cc8ca19db803e883ef9063537d782b1691

data/.github/workflows/main.yml

@@ -0,0 +1,37 @@
+name: Ruby
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby-truffleruby
+      min_version: 3.3
+
+  build:
+    needs: ruby-versions
+    name: build (${{ matrix.ruby }})
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
+        include:
+          - ruby: "3.3"
+            rubyopt: "--enable-frozen-string-literal"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Bundle install
+      run: |
+        bundle install
+    - name: Run the test suite
+      run: |
+        bundle exec rake TESTOPT=-v RUBYOPT="${{ matrix.rubyopt }}"

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in minisat.gemspec
 gemspec
+
+group :development do
+  gem "rake"
+  gem "test-unit"
+end

data/Rakefile

@@ -1 +1,13 @@
 require "bundler/gem_tasks"
+require "rake/extensiontask"
+require "rake/testtask"
+
+Rake::ExtensionTask.new("minisat")
+
+Rake::TestTask.new(:test => :compile) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/test_*.rb"]
+end
+
+task :default => :test

data/ext/minisat/minisat-wrap.cpp

@@ -58,6 +58,10 @@ extern "C" void wrap_solver_free(wrap_solver slv) {
     delete (Solver*) slv;
 }
 
+extern "C" size_t wrap_solver_memsize(wrap_solver slv) {
+    return sizeof(Solver);
+}
+
 extern "C" int wrap_solver_new_var(wrap_solver slv) {
     return ((Solver*) slv)->newVar();
 }

data/ext/minisat/minisat.c

@@ -39,6 +39,8 @@ THE SOFTWARE.
 
 VALUE rb_mMiniSat, rb_cSolver, rb_cVariable, rb_cLiteral;
 
+static const rb_data_type_t minisat_solver_data_type;
+
 #define SATISFIED                       0 /* satisfied */
 #define NOT_SOLVED_YET                  1 /* not solved yet */
 #define UNSATISFIABLE                   2 /* always unsatisfiable */
@@ -79,16 +81,29 @@ static void check_model_available(int result, int check_only_unsatisfied)
 
 /***** variable **************************************************************/
 
-static void value_free(cvariable *cvar)
+static void value_free(void *ptr)
 {
+    cvariable *cvar = (cvariable *)ptr;
     free(cvar);
 }
 
-static void value_mark(cvariable *cval)
+static void value_mark(void *ptr)
 {
+    cvariable *cval = (cvariable *)ptr;
     rb_gc_mark(cval->solver);
 }
 
+static size_t value_memsize(const void *ptr)
+{
+    return sizeof(cvariable);
+}
+
+static const rb_data_type_t minisat_value_data_type = {
+    "minisat_value",
+    { value_mark, value_free, value_memsize, },
+     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 /*
  *  call-seq:
  *     +variable   -> Literal
@@ -101,11 +116,10 @@ static VALUE variable_pos(VALUE rvar)
     cvariable *cvar, *clit;
     VALUE rlit;
 
-    Data_Get_Struct(rvar, cvariable, cvar);
-    rlit = Data_Make_Struct(rb_cLiteral, cvariable, value_mark, value_free, clit);
+    TypedData_Get_Struct(rvar, cvariable, &minisat_value_data_type, cvar);
+    rlit = TypedData_Make_Struct(rb_cLiteral, cvariable, &minisat_value_data_type, clit);
     clit->value = wrap_lit_pos_var(cvar->value);
     clit->solver = cvar->solver;
-    if(OBJ_TAINTED(rvar)) OBJ_TAINT(rlit);
 
     return rlit;
 }
@@ -122,11 +136,10 @@ static VALUE variable_neg(VALUE rvar)
     cvariable *cvar, *clit;
     VALUE rlit;
 
-    Data_Get_Struct(rvar, cvariable, cvar);
-    rlit = Data_Make_Struct(rb_cLiteral, cvariable, value_mark, value_free, clit);
+    TypedData_Get_Struct(rvar, cvariable, &minisat_value_data_type, cvar);
+    rlit = TypedData_Make_Struct(rb_cLiteral, cvariable, &minisat_value_data_type, clit);
     clit->value = wrap_lit_neg_var(cvar->value);
     clit->solver = cvar->solver;
-    if(OBJ_TAINTED(rvar)) OBJ_TAINT(rlit);
 
     return rlit;
 }
@@ -144,8 +157,8 @@ static VALUE variable_value(VALUE rvar)
     cvariable *cvar;
     csolver *cslv;
 
-    Data_Get_Struct(rvar, cvariable, cvar);
-    Data_Get_Struct(cvar->solver, csolver, cslv);
+    TypedData_Get_Struct(rvar, cvariable, &minisat_value_data_type, cvar);
+    TypedData_Get_Struct(cvar->solver, csolver, &minisat_solver_data_type, cslv);
     check_model_available(cslv->result, 0);
     switch(wrap_solver_ref_var(cslv->solver, cvar->value)) {
         case 0: return Qfalse;
@@ -163,13 +176,12 @@ static void convert_lits(int *lits, int argc, VALUE *argv, VALUE rslv)
 
     for(i = 0; i < argc; i++) {
         rval = argv[i];
-        if(TYPE(rval) != T_DATA
-           || RDATA(rval)->dfree != (RUBY_DATA_FUNC)value_free) {
+        if(!rb_typeddata_is_kind_of(rval, &minisat_value_data_type)) {
             rb_raise(rb_eTypeError,
                      "wrong argument type %s (expected Variable or Literal)",
                      rb_obj_classname(rval));
         }
-        Data_Get_Struct(rval, cvariable, cval);
+        TypedData_Get_Struct(rval, cvariable, &minisat_value_data_type,cval);
         if(cval->solver != rslv) {
             rb_raise(rb_eArgError,
                      "Variable or Literal of different solver");
@@ -182,18 +194,31 @@ static void convert_lits(int *lits, int argc, VALUE *argv, VALUE rslv)
 
 /***** solver ****************************************************************/
 
-static void solver_free(csolver *cslv)
+static void solver_free(void *ptr)
 {
+    csolver *cslv = (csolver *)ptr;
     wrap_solver_free(cslv->solver);
     free(cslv);
 }
 
+static size_t solver_memsize(const void *ptr)
+{
+    const csolver *cslv = (const csolver *)ptr;
+    return sizeof(csolver) + wrap_solver_memsize(cslv->solver);
+}
+
+static const rb_data_type_t minisat_solver_data_type = {
+    "minisat_solver",
+    { NULL, solver_free, solver_memsize, },
+     0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static VALUE solver_alloc(VALUE klass)
 {
     csolver *cslv;
     VALUE rslv;
 
-    rslv = Data_Make_Struct(klass, csolver, NULL, solver_free, cslv);
+    rslv = TypedData_Make_Struct(klass, csolver, &minisat_solver_data_type, cslv);
     cslv->solver = wrap_solver_new();
     cslv->result = NOT_SOLVED_YET;
 
@@ -214,14 +239,13 @@ static VALUE solver_new_var(VALUE rslv)
     cvariable *cvar;
     VALUE rvar;
 
-    Data_Get_Struct(rslv, csolver, cslv);
+    TypedData_Get_Struct(rslv, csolver, &minisat_solver_data_type, cslv);
     check_model_available(cslv->result, 1);
     rvar =
-      Data_Make_Struct(rb_cVariable, cvariable, value_mark, value_free, cvar);
+      TypedData_Make_Struct(rb_cVariable, cvariable, &minisat_value_data_type, cvar);
     cvar->value = wrap_solver_new_var(cslv->solver);
     cvar->solver = rslv;
     cslv->result = NOT_SOLVED_YET;
-    if(OBJ_TAINTED(rslv)) OBJ_TAINT(rvar);
 
     return rvar;
 }
@@ -243,9 +267,10 @@ static VALUE solver_add_clause(int argc, VALUE *argv, VALUE rslv)
 {
     csolver *cslv;
     int *lits;
+    VALUE lits_val;
 
-    Data_Get_Struct(rslv, csolver, cslv);
-    lits = ALLOCA_N(int, argc);
+    TypedData_Get_Struct(rslv, csolver, &minisat_solver_data_type, cslv);
+    lits = (int *)RB_ALLOCV_N(int, lits_val, argc);
     convert_lits(lits, argc, argv, rslv);
     if(!wrap_solver_add_clause(cslv->solver, lits, argc)) {
         cslv->result = UNSATISFIABLE;
@@ -255,6 +280,8 @@ static VALUE solver_add_clause(int argc, VALUE *argv, VALUE rslv)
         cslv->clause_count++;
     }
 
+    RB_GC_GUARD(lits_val);
+
     return rslv;
 }
 
@@ -271,8 +298,7 @@ static VALUE solver_add_clause(int argc, VALUE *argv, VALUE rslv)
  */
 static VALUE solver_add_clause_2(VALUE rslv, VALUE rcls)
 {
-    if(TYPE(rcls) == T_DATA
-       && RDATA(rcls)->dfree == (RUBY_DATA_FUNC)value_free) {
+    if(rb_typeddata_is_kind_of(rcls, &minisat_value_data_type)) {
       return solver_add_clause(1, &rcls, rslv);
     }
     else {
@@ -294,14 +320,14 @@ static VALUE solver_ref_var(VALUE rslv, VALUE rvar)
     csolver *cslv;
     cvariable *cvar;
 
-    Data_Get_Struct(rslv, csolver, cslv);
+    TypedData_Get_Struct(rslv, csolver, &minisat_solver_data_type, cslv);
     if(CLASS_OF(rvar) != rb_cVariable) {
         rb_raise(rb_eTypeError,
                  "wrong argument type %s (expected Variable)",
                  rb_obj_classname(rvar));
     }
     check_model_available(cslv->result, 0);
-    Data_Get_Struct(rvar, cvariable, cvar);
+    TypedData_Get_Struct(rvar, cvariable, &minisat_value_data_type, cvar);
     switch(wrap_solver_ref_var(cslv->solver, cvar->value)) {
         case 0: return Qfalse;
         case 1: return Qtrue;
@@ -322,9 +348,10 @@ static VALUE solver_solve(int argc, VALUE *argv, VALUE rslv)
 {
     csolver *cslv;
     int *lits;
+    VALUE lits_val;
 
-    Data_Get_Struct(rslv, csolver, cslv);
-    lits = ALLOCA_N(int, argc);
+    TypedData_Get_Struct(rslv, csolver, &minisat_solver_data_type, cslv);
+    lits = (int *)RB_ALLOCV_N(int, lits_val, argc);
     convert_lits(lits, argc, argv, rslv);
     if(wrap_solver_solve(cslv->solver, lits, argc)) {
         cslv->result = SATISFIED;
@@ -335,6 +362,7 @@ static VALUE solver_solve(int argc, VALUE *argv, VALUE rslv)
           argc == 0 ? UNSATISFIABLE : UNSATISFIABLE_UNDER_ASSUMPTIONS;
         return Qfalse;
     }
+    RB_GC_GUARD(lits_val);
 }
 
 /*
@@ -350,7 +378,7 @@ static VALUE solver_simplify(VALUE rslv)
 {
     csolver *cslv;
 
-    Data_Get_Struct(rslv, csolver, cslv);
+    TypedData_Get_Struct(rslv, csolver, &minisat_solver_data_type, cslv);
 
     check_model_available(cslv->result, 0);
     if(!wrap_solver_simplify(cslv->solver)) {
@@ -384,7 +412,7 @@ static VALUE solver_var_size(VALUE rslv)
 {
     csolver *cslv;
 
-    Data_Get_Struct(rslv, csolver, cslv);
+    TypedData_Get_Struct(rslv, csolver, &minisat_solver_data_type, cslv);
 
     return LONG2NUM(wrap_solver_var_size(cslv->solver));
 }
@@ -400,7 +428,7 @@ static VALUE solver_clause_size(VALUE rslv)
 {
     csolver *cslv;
 
-    Data_Get_Struct(rslv, csolver, cslv);
+    TypedData_Get_Struct(rslv, csolver, &minisat_solver_data_type, cslv);
 
     return LONG2NUM(cslv->clause_count);
 }
@@ -419,12 +447,9 @@ static VALUE solver_to_s(VALUE rslv)
 {
     const char *cname = rb_obj_classname(rslv);
     const char *msg = NULL;
-    char *buf;
     csolver *cslv;
-    VALUE str;
-    size_t len;
 
-    Data_Get_Struct(rslv, csolver, cslv);
+    TypedData_Get_Struct(rslv, csolver, &minisat_solver_data_type, cslv);
     switch(cslv->result) {
         case NOT_SOLVED_YET:
             msg = "not solved yet";
@@ -439,13 +464,8 @@ static VALUE solver_to_s(VALUE rslv)
             msg = "unsatisfiable under assumptions";
             break;
     }
-    len = strlen(cname) + strlen(msg) + 6 + 16;
-    buf = ALLOCA_N(char, len);
-    snprintf(buf, len + 1, "#<%s:%p %s>", cname, (void*)rslv, msg);
-    str = rb_str_new2(buf);
-    if(OBJ_TAINTED(rslv)) OBJ_TAINT(str);
 
-    return str;
+    return rb_sprintf("#<%s:%p %s", cname, (void*)rslv, msg);
 }
 
 /*
@@ -459,7 +479,7 @@ static VALUE solver_solved_p(VALUE rslv)
 {
     csolver *cslv;
 
-    Data_Get_Struct(rslv, csolver, cslv);
+    TypedData_Get_Struct(rslv, csolver, &minisat_solver_data_type, cslv);
 
     return (cslv->result != NOT_SOLVED_YET ? Qtrue : Qfalse);
 }
@@ -475,13 +495,13 @@ static VALUE solver_satisfied_p(VALUE rslv)
 {
     csolver *cslv;
 
-    Data_Get_Struct(rslv, csolver, cslv);
+    TypedData_Get_Struct(rslv, csolver, &minisat_solver_data_type, cslv);
 
     return (cslv->result == SATISFIED ? Qtrue : Qfalse);
 }
 
 
-void Init_minisat()
+void Init_minisat(void)
 {
     rb_mMiniSat = rb_define_module("MiniSat");
 
@@ -502,10 +522,12 @@ void Init_minisat()
 
     rb_cVariable = rb_define_class_under(rb_mMiniSat, "Variable", rb_cObject);
     rb_undef_method(CLASS_OF(rb_cVariable), "new");
+    rb_undef_alloc_func(rb_cVariable);
     rb_define_method(rb_cVariable, "+@", variable_pos, 0);
     rb_define_method(rb_cVariable, "-@", variable_neg, 0);
     rb_define_method(rb_cVariable, "value", variable_value, 0);
 
     rb_cLiteral = rb_define_class_under(rb_mMiniSat, "Literal", rb_cObject);
     rb_undef_method(CLASS_OF(rb_cLiteral), "new");
+    rb_undef_alloc_func(rb_cLiteral);
 }

data/ext/minisat/minisat.h

@@ -40,6 +40,7 @@ extern int wrap_lit_neg_var(int v);
 
 extern wrap_solver wrap_solver_new();
 extern void wrap_solver_free(wrap_solver slv);
+extern size_t wrap_solver_memsize(wrap_solver slv);
 extern int wrap_solver_new_var(wrap_solver slv);
 extern int wrap_solver_add_clause(wrap_solver slv, int *lits, int len);
 extern int wrap_solver_ref_var(wrap_solver slv, int var);

data/minisat/minisat/core/Solver.cc

@@ -209,7 +209,7 @@ void Solver::cancelUntil(int level) {
         for (int c = trail.size()-1; c >= trail_lim[level]; c--){
             Var      x  = var(trail[c]);
             assigns [x] = l_Undef;
-            if (phase_saving > 1 || (phase_saving == 1) && c > trail_lim.last())
+            if ((phase_saving > 1 || (phase_saving == 1)) && (c > trail_lim.last()))
                 polarity[x] = sign(trail[c]);
             insertVarOrder(x); }
         qhead = trail_lim[level];
@@ -499,7 +499,7 @@ CRef Solver::propagate()
 
         NextClause:;
         }
-        ws.shrink(i - j);
+        ws.shrink(int(i - j));
     }
     propagations += num_props;
     simpDB_props -= num_props;
@@ -657,7 +657,7 @@ lbool Solver::search(int nof_conflicts)
 
         }else{
             // NO CONFLICT
-            if (nof_conflicts >= 0 && conflictC >= nof_conflicts || !withinBudget()){
+            if ((nof_conflicts >= 0) && (conflictC >= nof_conflicts || !withinBudget())) {
                 // Reached bound on number of conflicts:
                 progress_estimate = progressEstimate();
                 cancelUntil(0);

data/minisat/minisat/mtl/Vec.h

@@ -96,7 +96,7 @@ template<class T>
 void vec<T>::capacity(int min_cap) {
     if (cap >= min_cap) return;
     int add = imax((min_cap - cap + 1) & ~1, ((cap >> 1) + 2) & ~1);   // NOTE: grow by approximately 3/2
-    if (add > INT_MAX - cap || ((data = (T*)::realloc(data, (cap += add) * sizeof(T))) == NULL) && errno == ENOMEM)
+    if ((add > INT_MAX - cap || ((data = (T*)::realloc(data, (cap += add) * sizeof(T))) == NULL)) && (errno == ENOMEM))
         throw OutOfMemoryException();
  }
 

data/minisat/minisat/utils/Options.h

@@ -60,7 +60,7 @@ class Option
     struct OptionLt {
         bool operator()(const Option* x, const Option* y) {
             int test1 = strcmp(x->category, y->category);
-            return test1 < 0 || test1 == 0 && strcmp(x->type_name, y->type_name) < 0;
+            return (test1 < 0 || test1 == 0) && (strcmp(x->type_name, y->type_name) < 0);
         }
     };
 
@@ -282,15 +282,15 @@ class Int64Option : public Option
         if (range.begin == INT64_MIN)
             fprintf(stderr, "imin");
         else
-            fprintf(stderr, "%4"PRIi64, range.begin);
+            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, "%4" PRIi64, range.end);
 
-        fprintf(stderr, "] (default: %"PRIi64")\n", value);
+        fprintf(stderr, "] (default: %" PRIi64")\n", value);
         if (verbose){
             fprintf(stderr, "\n        %s\n", description);
             fprintf(stderr, "\n");

data/ruby-minisat.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = "ruby-minisat"
-  spec.version       = "2.2.0.1"
+  spec.version       = "2.2.0.3"
   spec.authors       = ["Yusuke Endoh"]
   spec.email         = ["mame@ruby-lang.org"]
   spec.description   = %q{ruby binding for MiniSat, an open-source SAT solver}
@@ -16,6 +16,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["ext/minisat/"]
   spec.rdoc_options = %w[--exclude .*\.o --exclude minisat.so]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake-compiler"
 end

data/test/test_minisat.rb

@@ -104,9 +104,9 @@ class TestMiniSat < Test::Unit::TestCase
 
   def test_var_size
     assert_equal(0, @solver.var_size)
-    var1 = @solver.new_var
+    _var1 = @solver.new_var
     assert_equal(1, @solver.var_size)
-    var2 = @solver.new_var
+    _var2 = @solver.new_var
     assert_equal(2, @solver.var_size)
   end
 

metadata

@@ -1,31 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ruby-minisat
 version: !ruby/object:Gem::Version
-  version: 2.2.0.1
+  version: 2.2.0.3
 platform: ruby
 authors:
 - Yusuke Endoh
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -46,6 +31,7 @@ extensions:
 - ext/minisat/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE
@@ -105,7 +91,6 @@ homepage: http://github.com/mame/ruby-minisat
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options:
 - "--exclude"
 - ".*\\.o"
@@ -124,8 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.8.0.dev
 specification_version: 4
 summary: ruby binding for MiniSat, an open-source SAT solver
 test_files: