ruby-minisat 2.2.0.1 → 2.2.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/minisat/minisat/core/Solver.cc +3 -3
- data/minisat/minisat/mtl/Vec.h +1 -1
- data/minisat/minisat/utils/Options.h +4 -4
- data/ruby-minisat.gemspec +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 56d2498370e733a7bb4a2e20db76990b4db87bf15b72fc4475cd2bb031d99593
|
4
|
+
data.tar.gz: 7da4e10783c565025222ee3ba90df0043206343210d4faf0bd50748deddc77aa
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: '08b3ea24f656cba2cf2d00c4e9a3bee8e7e54eab4198bd113ec8c64402ceb9c34d2c1970da82b64cc5cc10c9d7f78457c8b68721b97a0277a6db4f508ce59e2f'
|
7
|
+
data.tar.gz: be10fdee68ddfceff50aa553a1b8ed3b59360d0c10c4448efd5b10012a19558646c75e20018e5d756825e820a413b1e30d0f9bbbdf37c6baf8e137b36d1e82eb
|
@@ -209,7 +209,7 @@ void Solver::cancelUntil(int level) {
|
|
209
209
|
for (int c = trail.size()-1; c >= trail_lim[level]; c--){
|
210
210
|
Var x = var(trail[c]);
|
211
211
|
assigns [x] = l_Undef;
|
212
|
-
if (phase_saving > 1 || (phase_saving == 1) && c > trail_lim.last())
|
212
|
+
if ((phase_saving > 1 || (phase_saving == 1)) && (c > trail_lim.last()))
|
213
213
|
polarity[x] = sign(trail[c]);
|
214
214
|
insertVarOrder(x); }
|
215
215
|
qhead = trail_lim[level];
|
@@ -499,7 +499,7 @@ CRef Solver::propagate()
|
|
499
499
|
|
500
500
|
NextClause:;
|
501
501
|
}
|
502
|
-
ws.shrink(i - j);
|
502
|
+
ws.shrink(int(i - j));
|
503
503
|
}
|
504
504
|
propagations += num_props;
|
505
505
|
simpDB_props -= num_props;
|
@@ -657,7 +657,7 @@ lbool Solver::search(int nof_conflicts)
|
|
657
657
|
|
658
658
|
}else{
|
659
659
|
// NO CONFLICT
|
660
|
-
if (nof_conflicts >= 0 && conflictC >= nof_conflicts || !withinBudget()){
|
660
|
+
if ((nof_conflicts >= 0) && (conflictC >= nof_conflicts || !withinBudget())) {
|
661
661
|
// Reached bound on number of conflicts:
|
662
662
|
progress_estimate = progressEstimate();
|
663
663
|
cancelUntil(0);
|
data/minisat/minisat/mtl/Vec.h
CHANGED
@@ -96,7 +96,7 @@ template<class T>
|
|
96
96
|
void vec<T>::capacity(int min_cap) {
|
97
97
|
if (cap >= min_cap) return;
|
98
98
|
int add = imax((min_cap - cap + 1) & ~1, ((cap >> 1) + 2) & ~1); // NOTE: grow by approximately 3/2
|
99
|
-
if (add > INT_MAX - cap || ((data = (T*)::realloc(data, (cap += add) * sizeof(T))) == NULL) && errno == ENOMEM)
|
99
|
+
if ((add > INT_MAX - cap || ((data = (T*)::realloc(data, (cap += add) * sizeof(T))) == NULL)) && (errno == ENOMEM))
|
100
100
|
throw OutOfMemoryException();
|
101
101
|
}
|
102
102
|
|
@@ -60,7 +60,7 @@ class Option
|
|
60
60
|
struct OptionLt {
|
61
61
|
bool operator()(const Option* x, const Option* y) {
|
62
62
|
int test1 = strcmp(x->category, y->category);
|
63
|
-
return test1 < 0 || test1 == 0 && strcmp(x->type_name, y->type_name) < 0;
|
63
|
+
return (test1 < 0 || test1 == 0) && (strcmp(x->type_name, y->type_name) < 0);
|
64
64
|
}
|
65
65
|
};
|
66
66
|
|
@@ -282,15 +282,15 @@ class Int64Option : public Option
|
|
282
282
|
if (range.begin == INT64_MIN)
|
283
283
|
fprintf(stderr, "imin");
|
284
284
|
else
|
285
|
-
fprintf(stderr, "%4"PRIi64, range.begin);
|
285
|
+
fprintf(stderr, "%4" PRIi64, range.begin);
|
286
286
|
|
287
287
|
fprintf(stderr, " .. ");
|
288
288
|
if (range.end == INT64_MAX)
|
289
289
|
fprintf(stderr, "imax");
|
290
290
|
else
|
291
|
-
fprintf(stderr, "%4"PRIi64, range.end);
|
291
|
+
fprintf(stderr, "%4" PRIi64, range.end);
|
292
292
|
|
293
|
-
fprintf(stderr, "] (default: %"PRIi64")\n", value);
|
293
|
+
fprintf(stderr, "] (default: %" PRIi64")\n", value);
|
294
294
|
if (verbose){
|
295
295
|
fprintf(stderr, "\n %s\n", description);
|
296
296
|
fprintf(stderr, "\n");
|
data/ruby-minisat.gemspec
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# coding: utf-8
|
2
2
|
Gem::Specification.new do |spec|
|
3
3
|
spec.name = "ruby-minisat"
|
4
|
-
spec.version = "2.2.0.
|
4
|
+
spec.version = "2.2.0.2"
|
5
5
|
spec.authors = ["Yusuke Endoh"]
|
6
6
|
spec.email = ["mame@ruby-lang.org"]
|
7
7
|
spec.description = %q{ruby binding for MiniSat, an open-source SAT solver}
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ruby-minisat
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.2.0.
|
4
|
+
version: 2.2.0.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Yusuke Endoh
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-10-
|
11
|
+
date: 2019-10-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|