dither 0.2.0.rc4-java → 0.2.0.rc5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50e576d6e9e07d6580bae33577e1f87f36156ec3
-  data.tar.gz: 5900588a4ae476efc19fd04d1f008f326a32e68b
+  metadata.gz: e375f73de29cf2973902fa32746da23ec5b3d04c
+  data.tar.gz: d0934babd6665c4c710be50b62991af2f0cb6385
 SHA512:
-  metadata.gz: 54679f10f893985789178b46b602c460360c4154c3c24bba10458f07570c87b19813e5d910c525396bbc6d40e9f08cc7df78a595fb415f8c88af63c175d62e12
-  data.tar.gz: ea6c142c97711282cf11b1718d9e33630488cde0133c5ed7491df0075f64e3000de40695b27a866cf9b055b8e715ce05f0b4ca533633f4285ddbebfaa7230828
+  metadata.gz: da0bef56fb262a62bd17070f611523a5a389cfb24c23252a26790f3da8ee046379520062d4f6862c2201d51592d959d3756f48d34177ac90a58c38b4d7278aa5
+  data.tar.gz: cf8c34f22d78dac20e0e68961cf8b2f43c7b6409c54131ef62625ab269a90790e01d755ac558cba3abaabac72ec8cb39c4153f2e15b811330f2276b7591fc554

data/dither.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   if RUBY_PLATFORM =~ /java/
     s.platform = "java"
     # compile dither-java on jdk 8
-    files << "lib/dither-0.1.3.jar"
+    files << "lib/dither-0.1.4.jar"
     files << "lib/choco-solver-3.3.1-with-dependencies.jar"
 	else
 		s.add_dependency "ffi", "~> 1.0"

data/ext/dither/simple_constraint_handler.cc

@@ -12,7 +12,7 @@
 
 namespace dither {
 
-  SimpleConstraintHandler::SimpleConstraintHandler(std::vector<dval>& ranges, std::vector<std::vector<dval>>& pconstraints) : params(ranges) {
+  SimpleConstraintHandler::SimpleConstraintHandler(std::vector<dval>& ranges, std::vector<std::vector<dval>>& pconstraints) : params(ranges), scratch(ranges.size(), -1) {
     for(auto it = pconstraints.cbegin(); it != pconstraints.cend(); ++it) {
       std::vector<std::pair<std::size_t, dval>> constraint;
       std::size_t i = 0;
@@ -27,6 +27,14 @@ namespace dither {
   }
 
   bool SimpleConstraintHandler::violate_constraints(const dtest_case &test_case) {
+    if(violate_constraints_(test_case)) {
+      return true;
+    }
+    std::copy(test_case.cbegin(), test_case.cend(), scratch.begin());
+    return !ground(scratch);
+  }
+
+  inline bool SimpleConstraintHandler::violate_constraints_(const dtest_case &test_case) {
     for(auto constraint = constraints.cbegin(); constraint != constraints.cend(); ++constraint) {
       if(violate_constraint(test_case, *constraint)) {
         return true;
@@ -46,32 +54,14 @@ namespace dither {
   }
 
   bool SimpleConstraintHandler::violate_constraints(const std::vector<param> &test_case) {
-    for(auto constraint = constraints.cbegin(); constraint != constraints.cend(); ++constraint) {
-      if(violate_constraint(test_case, *constraint)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  inline bool SimpleConstraintHandler::violate_constraint(const std::vector<param>& test_case, const std::vector<std::pair<std::size_t, dval>>& constraint) {
-    if(test_case.size() < constraint.size()) {
-      return false;
-    }
-
-    std::size_t count = 0;
-    for(auto it = constraint.cbegin(); it != constraint.cend(); ++it) {
-      for(auto iit = test_case.cbegin(); iit != test_case.cend(); ++iit) {
-        if((*iit).first == (*it).first && (*iit).second == (*it).second) {
-          count++;
-          break;
-        }
-      }
+    std::fill(scratch.begin(), scratch.end(), -1);
+    for(auto p : test_case) {
+      scratch[p.first] = p.second;
     }
-    if(count == constraint.size()) {
+    if(violate_constraints_(scratch)) {
       return true;
     }
-    return false;
+    return !ground(scratch);
   }
 
   bool SimpleConstraintHandler::ground(dtest_case &test_case) {
@@ -84,9 +74,6 @@ namespace dither {
         indexes.push_back(i);
       }
     }
-    if(indexes.size() == 0) {
-      return true;
-    }
     std::vector<dval> bound_values(indexes.size(), -1);
     i = 0;
 
@@ -95,7 +82,7 @@ LOOP:while(i < indexes.size()) {
        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)) {
+         if(violate_constraints_(test_case)) {
            continue;
          }
          bound_values[i] = value;

data/ext/dither/simple_constraint_handler.h

@@ -22,9 +22,10 @@ namespace dither {
     protected:
       std::vector<std::vector<std::pair<std::size_t, dval>>> constraints;
       std::vector<dval> params;
+      std::vector<dval> scratch;
 
       inline bool violate_constraint(const dtest_case& test_case, const std::vector<std::pair<std::size_t, dval>>& constraint);
-      inline bool violate_constraint(const std::vector<param>& test_case, const std::vector<std::pair<std::size_t, dval>>& constraint);
+      inline bool violate_constraints_(const dtest_case &test_case);
 
     public:
       SimpleConstraintHandler(std::vector<dval>& ranges, std::vector<std::vector<dval>>& pconstraints);

data/lib/dither/version.rb

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

data/lib/dither.rb

@@ -62,7 +62,7 @@ module Dither
         end
         arr = Array.new(params.size)
         (0...params.size).each do |i|
-          arr[i] = params[i].find(test_case[i]).first
+          arr[i] = params[i].find_index(test_case[i])
         end
         tested_scratch.write_array_of_int(arr)
         Dither::API.dither_ipog_add_previously_tested(pointer, tested_scratch, params.size)
@@ -97,7 +97,7 @@ require 'dither/graph'
 if RUBY_PLATFORM =~ /java/
   require 'java'
   require 'choco-solver-3.3.1-with-dependencies.jar'
-  require 'dither-0.1.3.jar'
+  require 'dither-0.1.4.jar'
 
   require 'dither/java_ext/dither'
 else

data/spec/dither/dither_spec.rb

@@ -63,7 +63,7 @@ describe Dither do
   end
 
   it 'can compute 3-way ipog with constraints' do
-    params = [(0...2).to_a, (0...2).to_a, (0..3).to_a]
+    params = [[:a, :b], (0...2).to_a, (0..3).to_a]
     results = Dither.ipog(params, :t => 3,
                        :constraints => [
                          {0 => 0,
@@ -71,16 +71,16 @@ describe Dither do
                          {0 => 0,
                           1 => 1,
                           2 => 0}],
-                        :previously_tested => [[0, 0, 0]]
+                        :previously_tested => [[:a, 0, 0]]
                       )
     results.each do |result|
-      expect(result[0] == 0 && result[1] == 1 && result[2] == 0).to be false
+      expect(result[0] == :a && result[1] == 1 && result[2] == 0).to be false
     end
     results.each do |result|
-      expect(result[0] == 0 && result[1] == 2).to be false
+      expect(result[0] == :a && result[1] == 2).to be false
     end
     results.each do |result|
-      expect(result[0] == 0 && result[1] == 0 && result[2] == 0).to be false
+      expect(result[0] == :a && result[1] == 0 && result[2] == 0).to be false
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dither
 version: !ruby/object:Gem::Version
-  version: 0.2.0.rc4
+  version: 0.2.0.rc5
 platform: java
 authors:
 - Jason Gowan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ files:
 - ext/dither/simple_constraint_handler.cc
 - ext/dither/simple_constraint_handler.h
 - lib/choco-solver-3.3.1-with-dependencies.jar
-- lib/dither-0.1.3.jar
+- lib/dither-0.1.4.jar
 - lib/dither.rb
 - lib/dither/aetg.rb
 - lib/dither/aetg_pairwise.rb