dither 0.2.0.rc3-java → 0.2.0.rc4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b038957890a18fdbdee841539d4a1b9b10f926bb
-  data.tar.gz: 2c6d145853709cd26f7d6fa1fb7798d7b4bd39ae
+  metadata.gz: 50e576d6e9e07d6580bae33577e1f87f36156ec3
+  data.tar.gz: 5900588a4ae476efc19fd04d1f008f326a32e68b
 SHA512:
-  metadata.gz: 26cdb10b09d0861eb6fb6d6c19914df5e906c5763768505a398fe752631d6c7eac4488ee6112b5b0c1368e2af8df4d25c6d110d36b9d0d154cc45161391bd8d4
-  data.tar.gz: 00d47f8cbebaf325539c607880973cb68ce84c97de02d01ba662f92155ede37cc8f93855878962987a63d8be919da0b084f48858156901bdb7037cde2a41db2c
+  metadata.gz: 54679f10f893985789178b46b602c460360c4154c3c24bba10458f07570c87b19813e5d910c525396bbc6d40e9f08cc7df78a595fb415f8c88af63c175d62e12
+  data.tar.gz: ea6c142c97711282cf11b1718d9e33630488cde0133c5ed7491df0075f64e3000de40695b27a866cf9b055b8e715ce05f0b4ca533633f4285ddbebfaa7230828

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