dither 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b23198b7faddebcd97e1656ffa56e8f7dbb067f7
-  data.tar.gz: bb83f1fafe1e7366f090b750af571d1bd61aeb95
+  metadata.gz: 8b2f3f8fa861ae290b01ece8edf0150480d7b3cf
+  data.tar.gz: 3c00e98cf8b3b8a80b4327f2418068d07e871db5
 SHA512:
-  metadata.gz: d199030a4862dfdf5d18744da482bbcef95d29b8a43d85f3285f1e8c90d2c655b34d958ed3c7eae087fc42b9a30ce83bc98d0cd6e9629faab25f5d01c049f643
-  data.tar.gz: 5e5510739b5ac632cf92e8da6cd7ba7e4ae60362a39047c9ea5f2c29f6db4dde73449de47cfc28708c0d366e4af1a2dffadb9ba879d891fe4d68c52e41f1a273
+  metadata.gz: 62e73bc1bf276f26aab2d0115fb6125fb01871695a57823078401a3475a102bffbeb588d3c48552f5094f4a1ec339112053c657329b27f9bac068d4b04400644
+  data.tar.gz: 0154292ff25b831fc39acd29388efb5e0520e7434db8282942ab5f7e1b8bdd00db4215b3a71e2ee83fd1f2f2f07a38b75139b830b745e6af55efc0cc3c4a2a92

data/ext/dither/ipog.cc

@@ -13,6 +13,7 @@
 #include <utility>
 #include <tuple>
 #include <limits.h>
+#include <cstddef>
 
 namespace dither {
 
@@ -107,37 +108,41 @@ void Ipog::run() {
       const std::vector<param> &test_case = *pairs;
       bool case_covered = constraint_handler->violate_constraints(test_case);
 
-			if (!case_covered) {
-				bool is_merged = false;
-				auto prev = unbound_.before_begin();
-				auto next = unbound_.begin();
-				auto end = unbound_.end();
-				while (next != end) {
-					const int merge_result = merge(k, *next, test_case);
-					if (merge_result == 0) {
-						bound_.push_front(*next);
-						unbound_.erase_after(prev);
-						is_merged = true;
-						break;
-					} else if (merge_result == 1) {
-						is_merged = true;
-						break;
-					}
-					++prev;
-					++next;
-				}
-
-				if (!is_merged) {
-					dtest_case unbound_test_case(param_cache_.size(), -1);
-					for (auto it = test_case.cbegin(); it != test_case.cend(); ++it) {
-						unbound_test_case[(*it).first] = (*it).second;
-					}
-					if (!constraint_handler->violate_constraints(unbound_test_case)) {
-						unbound_.push_front(unbound_test_case);
-					}
-				}
-			}
+      if(!case_covered) {
+        for (auto it = unbound_.cbegin(); it != unbound_.cend(); ++it) {
+          if(is_covered(*it, test_case)) {
+            case_covered = true;
+            break;
+          }
+        }
+      }
+
+      if (!case_covered) {
+        bool is_merged = false;
+
+        for(auto next = unbound_.begin(); next != unbound_.end(); ++next) {
+          const int merge_result = merge(k, *next, test_case);
+
+          if (merge_result > 0) {
+            dtest_case tmp = *next;
+            for (auto it = test_case.cbegin(); it != test_case.cend(); ++it) {
+              tmp[(*it).first] = (*it).second;
+            }
+            is_merged = true;
+            break;
+          }
+        }
 
+        if (!is_merged) {
+          dtest_case unbound_test_case(param_cache_.size(), -1);
+          for (auto it = test_case.cbegin(); it != test_case.cend(); ++it) {
+            unbound_test_case[(*it).first] = (*it).second;
+          }
+          if (!constraint_handler->violate_constraints(unbound_test_case)) {
+            unbound_.push_front(unbound_test_case);
+          }
+        }
+      }
     }
   }
   ground_solutions();
@@ -163,12 +168,8 @@ inline const int Ipog::merge(const int k, dtest_case &test_case,
     return -1;
   }
 
-  for (auto it = pairs.cbegin(); it != pairs.cend(); ++it) {
-    test_case[(*it).first] = (*it).second;
-  }
-
-  for (auto i = 0; i < k; i++) {
-    if (test_case[i] == -1) {
+  for (auto i = 0; i <= k; i++) {
+    if (merge_scratch_[i] == -1) {
       return 1;
     }
   }

data/lib/dither/version.rb

@@ -1,4 +1,4 @@
 
 module Dither
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dither
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jason Gowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-12 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dither
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Collection of test generation strategies