dither 0.2.0.rc3 → 0.2.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 378d5b7748d2b3993ef979f2e0ecc1e7f2f1866a
-  data.tar.gz: 6c3159e8073600044df182be4bd6dc201c9f45a1
+  metadata.gz: c7e321420a2ba706f3f24e8e3d2191da27fce614
+  data.tar.gz: 094b5152e0d320355a6e465210ecd9c267f0c6f8
 SHA512:
-  metadata.gz: 8ac2ff8f4c0110f4a3b5d81e361bb52c568eccb7bc32cb28a7eed55f0f36ae7f7b2f1689804c4ed5a4c2cddec162c3946fa8bc995980e1f9968b606368e132b3
-  data.tar.gz: 6c4cc50f3da60255d6f1065506a8d1b2a2d0b601e96af11d3f664ee2374c08bd06c2bbc40006c2403308d021dd84d96d15f8cb83a11be9e51d4663c52ef88dab
+  metadata.gz: 06c79a55ca5dcfbef0a287120bebf8aa6b558f079a6ba08551c2786abd5b15bf7b95059ec231a71dcbca736c514a6a5a29e0ce24d57c94c9210ebe280ffbe7b1
+  data.tar.gz: 456b3f07542dbb81a580910b7468ff2f39cc48b422e0704defcf8473c84cf7edf0676920b79b54aab72e176100afee574a2f55ba9c335e216f85477d6ebd8d70

data/ext/dither/simple_constraint_handler.cc

@@ -8,13 +8,14 @@
  */
 
 #include "simple_constraint_handler.h"
+#include <iostream>
 
 namespace dither {
 
   SimpleConstraintHandler::SimpleConstraintHandler(std::vector<dval>& ranges, std::vector<std::vector<dval>>& pconstraints) : params(ranges) {
     for(auto it = pconstraints.cbegin(); it != pconstraints.cend(); ++it) {
       std::vector<std::pair<std::size_t, dval>> constraint;
-      int i = 0;
+      std::size_t i = 0;
       for(auto iit = (*it).cbegin(); iit != (*it).cend(); ++iit, i++) {
         if((*iit) != -1) {
           constraint.push_back(std::make_pair(i, *iit));
@@ -86,32 +87,30 @@ namespace dither {
     if(indexes.size() == 0) {
       return true;
     }
-    std::vector<dval> bound_values(indexes.size(), 0);
+    std::vector<dval> bound_values(indexes.size(), -1);
     i = 0;
 
-LOOP:{
-       do {
-         test_case[indexes[i]] = bound_values[i];
-         if(violate_constraints(test_case)) {
-           // try to bump a bound value... return false if no valid value
-           const std::size_t upper_bound = i + 1;
-           for(std::size_t j = 0; j < upper_bound; j++) {
-             auto bump_value = bound_values[i] + 1;
-             if(bump_value < params[indexes[i]]) {
-               bound_values[i] = bump_value;
-               goto LOOP;
-             }
-
-             // unwind
-             bound_values[i] = 0;
-             test_case[indexes[i]] = -1;
-             i--;
-           }
+LOOP:while(i < indexes.size()) {
 
-           return false;
+       const dval max = params[indexes[i]];
+       for(dval value = bound_values[i] + 1; value <= max; value++) {
+         test_case[indexes[i]] = value;
+         if(violate_constraints(test_case)) {
+           continue;
          }
+         bound_values[i] = value;
          i++;
-       }while(i < indexes.size());
+         goto LOOP;
+       }
+
+       if(i == 0) {
+         return false;
+       }
+
+       // unwind
+       bound_values[i] = -1;
+       test_case[indexes[i]] = -1;
+       i--;
      }
 
      return true;

data/lib/dither/api.rb

@@ -5,7 +5,8 @@ require 'ffi'
 module Dither
   module API
     extend FFI::Library
-    ffi_lib %w[lib/dither.so lib/dither.dll]
+    LIB_DIR = File.expand_path('../..', __FILE__)
+    ffi_lib %W[#{LIB_DIR}/dither.so #{LIB_DIR}/dither.dll]
 
     attach_function :dither_ipog_new, [:int], :pointer
     attach_function :dither_ipog_add_parameter_int, [:pointer, :int, :pointer, :int], :void

data/lib/dither/version.rb

@@ -1,4 +1,4 @@
 
 module Dither
-  VERSION = '0.2.0.rc3'
+  VERSION = '0.2.0.rc4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dither
 version: !ruby/object:Gem::Version
-  version: 0.2.0.rc3
+  version: 0.2.0.rc4
 platform: ruby
 authors:
 - Jason Gowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 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