dither 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b006159a1b729a73db618c798df025d7ac71584f
-  data.tar.gz: d53268fc1aaa144bedd5e216d887235cc573af4d
+  metadata.gz: 01b92d7c2a5378b386ca65f4d71df1120c3782cf
+  data.tar.gz: 6c44ca627b200e9188f4aad2dab3575cf6a4742b
 SHA512:
-  metadata.gz: e06c1afdd9e517e00c70a8dcf8984425059d4024ec86cc0fafc1a0a8a1049c7de825dd0daf5bcafeacc5f8ea04b2f441c29b6ddf679b394787a4f89e83a096bc
-  data.tar.gz: af4aa4e4434de024b19b50552aa63ed3cf29a50aaf8646a2278f8418e3fbffa95271af6bf1bc6497fc69c4124e2d3d0822edaa9e8c49d13acdbb1f5bd16da7fd
+  metadata.gz: 5318e78b9eb0b81b49441b7c1a3784bca2c73be27a569170b5e9e7889258af4b846806f39b10a25cb21828b5b0dc5ff219afc576739a8f6c2b85cf3d721087e5
+  data.tar.gz: 1aa0885ecffc700a43937bef1f79fccb2c5985816825e0d07390c0b2b65b5a1f4d97166b40f14ac905a00b50f2767ad03bca8a6af41276110a1e740b5e84d942

data/README.md

@@ -2,7 +2,7 @@
 Collection of combinatorial test generation strategies.
 
 # Requirements
-a c++ compiler is required when installing on mri.
+a c++ compiler is required when installing on mri.  tested on gcc 4.6, gcc 5.3, and clang 3.7.
 
 # Usage
 

data/ext/dither/ipog.cc

@@ -122,19 +122,28 @@ void Ipog::run() {
 
       if (!case_covered) {
         bool is_merged = false;
-
-        for (auto next = unbound_.begin(); next != unbound_.end(); ++next) {
+        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) {
-            dtest_case tmp = *next;
+          if (merge_result >= 0) {
             for (std::size_t i = 0; i < t_; i++) {
               const param *it = test_case[i];
-              tmp[it->first] = it->second;
+              (*next)[it->first] = it->second;
             }
             is_merged = true;
+          }
+          if (merge_result == 0) {
+            bound_.push_front(*next);
+            unbound_.erase_after(prev);
+            break;
+          } else if (merge_result == 1) {
             break;
           }
+          ++prev;
+          ++next;
         }
 
         if (!is_merged) {
@@ -150,6 +159,7 @@ void Ipog::run() {
       }
     }
   }
+
   ground_solutions();
 }
 
@@ -206,32 +216,39 @@ inline bool Ipog::is_covered(const dtest_case &test_case,
 inline const int Ipog::maximize_coverage(const int k, dtest_case &test_case,
                                          std::forward_list<param **> &pi) {
   const std::vector<param> &param_range = param_cache_[k];
-  int current_max = -1;
-  param max_param = param_range[0];
-  std::forward_list<std::forward_list<param **>::iterator> covered;
-
-  for (auto it = param_range.cbegin(); it != param_range.cend(); ++it) {
-    std::forward_list<std::forward_list<param **>::iterator> tmp_covered;
-    const param current_param = *it;
-
-    test_case[current_param.first] = current_param.second;
-    if (!constraint_handler->violate_constraints(test_case)) {
-      int count = 0;
-      auto prev = pi.before_begin();
-      for (auto params = pi.begin(); params != pi.end(); ++params, ++prev) {
-        if (is_covered(test_case, *params)) {
-          tmp_covered.push_front(prev);
-          count++;
-        }
-      }
+  std::vector<std::forward_list<std::forward_list<param **>::iterator>> covered(
+      param_range.size());
+  std::vector<int> counts(param_range.size());
+  const std::size_t index = param_range[0].first;
+  std::vector<std::size_t> valid_indexes;
+  valid_indexes.reserve(counts.size());
+  for (std::size_t i = 0; i < counts.size(); i++) {
+    test_case[index] = param_range[i].second;
+    if (constraint_handler->violate_constraints(test_case)) {
+      counts[i] = -1;
+    } else {
+      valid_indexes.push_back(i);
+    }
+  }
 
-      if (count > current_max) {
-        current_max = count;
-        max_param = current_param;
-        covered = tmp_covered;
+  auto prev = pi.before_begin();
+  for (auto params = pi.begin(); params != pi.end(); ++params, ++prev) {
+    for (auto i : valid_indexes) {
+      test_case[index] = param_range[i].second;
+      if (is_covered(test_case, *params)) {
+        covered[i].push_front(prev);
+        ++counts[i];
       }
     }
-    test_case[current_param.first] = -1;
+  }
+
+  int current_max = -1;
+  std::size_t max_index = 0;
+  for (auto i : valid_indexes) {
+    if (current_max < counts[i]) {
+      current_max = counts[i];
+      max_index = i;
+    }
   }
 
   if (current_max == -1) {
@@ -239,11 +256,12 @@ inline const int Ipog::maximize_coverage(const int k, dtest_case &test_case,
   }
 
   /* remove covered */
-  for (auto it = covered.begin(); it != covered.end(); ++it) {
+  for (auto it = covered[max_index].begin(); it != covered[max_index].end();
+       ++it) {
     pi.erase_after(*it);
   }
 
-  test_case[max_param.first] = max_param.second;
+  test_case[index] = param_range[max_index].second;
   return current_max;
 }
 

data/lib/dither/version.rb

@@ -1,4 +1,4 @@
 
 module Dither
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dither
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Jason Gowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2016-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dither
-rubygems_version: 2.4.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Collection of test generation strategies