dither 0.2.1-java → 0.2.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a987783363aa9b53be68e9b15beb1fae453985e
-  data.tar.gz: e207f2588859e02213785fea494d02bc8d75af72
+  metadata.gz: 7c4f7b41b32e5ea6f96a929e5ffe96bb822c1810
+  data.tar.gz: 3cf78c076a39e9031bb4009f51c5e676da3c8589
 SHA512:
-  metadata.gz: 04cdb9b5a5d9fa432daeb000a4efc4297d990581d351da6f3b5cc774c864d0043a7daea53abe436b36d50e051189927a2c5cad9bbd072b138a920cd979c5528c
-  data.tar.gz: 00f0c16140b9726118fe75c9caf333bde02e43e00fce6ee369acbcfa3f3baa5291431541193169b017ea8bb2c24457ced00f1bf45b723b66ec567906654b38d8
+  metadata.gz: e113ff89775611ac9624a6ebaf9c230e176b2b10904333c82134953a2ecb8f9222147e626ff2e48a5c7d6d26747d1639c5309cf748c99bc256be6aa46f6d1d45
+  data.tar.gz: 6b405fa6986676656ec3da84808b7b85453e9a8f94bd8b081b6025cb7349c182e6c5c91e36e468cda5ce01f84f3eb3deda7f3f8a19dc48510fd6636293355fce

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: java
 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
   requirement: !ruby/object:Gem::Requirement