dither 0.2.0.rc5-java → 0.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e375f73de29cf2973902fa32746da23ec5b3d04c
-  data.tar.gz: d0934babd6665c4c710be50b62991af2f0cb6385
+  metadata.gz: 3a987783363aa9b53be68e9b15beb1fae453985e
+  data.tar.gz: e207f2588859e02213785fea494d02bc8d75af72
 SHA512:
-  metadata.gz: da0bef56fb262a62bd17070f611523a5a389cfb24c23252a26790f3da8ee046379520062d4f6862c2201d51592d959d3756f48d34177ac90a58c38b4d7278aa5
-  data.tar.gz: cf8c34f22d78dac20e0e68961cf8b2f43c7b6409c54131ef62625ab269a90790e01d755ac558cba3abaabac72ec8cb39c4153f2e15b811330f2276b7591fc554
+  metadata.gz: 04cdb9b5a5d9fa432daeb000a4efc4297d990581d351da6f3b5cc774c864d0043a7daea53abe436b36d50e051189927a2c5cad9bbd072b138a920cd979c5528c
+  data.tar.gz: 00f0c16140b9726118fe75c9caf333bde02e43e00fce6ee369acbcfa3f3baa5291431541193169b017ea8bb2c24457ced00f1bf45b723b66ec567906654b38d8

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.4.jar"
+    files << "lib/dither-0.1.5.jar"
     files << "lib/choco-solver-3.3.1-with-dependencies.jar"
 	else
 		s.add_dependency "ffi", "~> 1.0"

data/ext/dither/combinations.h

@@ -122,6 +122,75 @@ inline void product(
     rvi.pop_back();                   // clean ME off for next round
   }
 }
+
+inline void product3(
+    std::forward_list<dtest_case>& results,
+    std::vector<dtest_case>::const_iterator begin,
+    std::vector<dtest_case>::const_iterator end) {
+  dtest_case ranges;
+  for(auto it = begin; it != end; ++it) {
+    const dval tmp = (*it).size() - 1;
+    ranges.push_back(tmp);
+  }
+
+  dtest_case scratch(ranges.size(), 0);
+
+  const std::size_t max = ranges.size() - 1;
+  for(std::size_t i = max;;) {
+
+    if(i == max) {
+      for(dval val = 0; val <= ranges[i]; val++) {
+        results.push_front(scratch);
+        scratch[i]++;
+      }
+      scratch[i] = 0;
+      i--;
+    } else if(i == 0 && scratch[i] >= ranges[i]) {
+      return;
+    } else if(scratch[i] < ranges[i]) {
+      scratch[i]++;
+      i++;
+    } else {
+      scratch[i] = -1;
+      i--;
+    }
+  }
+}
+
+inline void product4(
+    std::forward_list<std::vector<param>>& results,
+    std::vector<std::vector<param>>& param_matrix) {
+  std::vector<int> ranges;
+  std::vector<param> scratch;
+  for(auto params : param_matrix) {
+    ranges.push_back(params.size() - 1);
+    scratch.push_back(params[0]);
+  }
+  std::vector<int> indexes(scratch.size(), 0);
+
+  const std::size_t max = ranges.size() - 1;
+  for(std::size_t i = max;;) {
+
+    if(i == max) {
+      for(std::size_t val = 0; val <= ranges[i]; val++) {
+        scratch[i] = param_matrix[i][indexes[i]];
+        results.push_front(scratch);
+        indexes[i]++;
+      }
+      indexes[i] = 0;
+      i--;
+    } else if(i == 0 && indexes[i] >= ranges[i]) {
+      return;
+    } else if(indexes[i] < ranges[i]) {
+      indexes[i]++;
+      scratch[i] = param_matrix[i][indexes[i]];
+      i++;
+    } else {
+      indexes[i] = -1;
+      i--;
+    }
+  }
+}
 }
 
 #endif

data/ext/dither/ipog.cc

@@ -31,10 +31,10 @@ Ipog::Ipog(const unsigned int t) {
 }
 
 void Ipog::init_bound() {
-  using dither::product;
+  using dither::product3;
   dtest_case tmp;
 
-  product(bound_, tmp, input_params_.begin(), input_params_.begin() + t_);
+  product3(bound_, input_params_.begin(), input_params_.begin() + t_);
   auto size = param_cache_.size();
   for (auto it = bound_.begin(); it != bound_.end(); ++it) {
     (*it).resize(size, -1);
@@ -77,9 +77,7 @@ std::forward_list<std::vector<param>> Ipog::cover(const int k) {
 
   std::forward_list<std::vector<param>> coverage;
   for (auto it = product_input.begin(); it != product_input.end(); ++it) {
-    std::vector<param> tmp;
-    std::vector<std::vector<param>> x = *it;
-    product2(coverage, tmp, (*it).cbegin(), (*it).cend());
+    product4(coverage, *it);
   }
   coverage.remove_if([this](std::vector<param>& a) { return has_previously_tested(a); });
   return coverage;

data/lib/dither/version.rb

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

data/lib/dither.rb

@@ -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.4.jar'
+  require 'dither-0.1.5.jar'
 
   require 'dither/java_ext/dither'
 else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dither
 version: !ruby/object:Gem::Version
-  version: 0.2.0.rc5
+  version: 0.2.1
 platform: java
 authors:
 - Jason Gowan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-12 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.4.jar
+- lib/dither-0.1.5.jar
 - lib/dither.rb
 - lib/dither/aetg.rb
 - lib/dither/aetg_pairwise.rb
@@ -122,9 +122,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: dither
 rubygems_version: 2.4.8