dither 0.2.6-java → 0.2.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5451ba9a4cb0e3bb48ed5accc4551a170d721d0f
-  data.tar.gz: 717a068e48067f82e382599dbb046f835b8a8f4d
+  metadata.gz: c6fe27a250e8719c615e1f020154efb39cfdb2df
+  data.tar.gz: ef2f4bb9a9bed51991c12fd06626b8d21e198bf0
 SHA512:
-  metadata.gz: a0df5437c9c56ff572c2dd1a845810033c4a923b9762f13a2918f0542e9e4009184765a92d8e4f7a1ec11036d17f5883b2a2426d11287a21d4655327d3cb2c29
-  data.tar.gz: 41289c4554624115fc351266c16aff0892de9cc69b19bfaa206ffdfc290a9b456771d233810cd3507962261873661c59295fed66ebb15718eece2c59a48f0e41
+  metadata.gz: fa1317fb2274cbe47c2113a25d81917c4ac1b284b585c002733ecc4dc5daf2fa960f7524f636365d5a1728bafb465d8909d9f92126c8e9bbb96868135122fc3e
+  data.tar.gz: 6331a0442c3dd2433d8356e2f295ff4df0c2f5e930b7ab92fa5edc705d73e75278209ee41ea1f1a6f1b7d9e9c323f9396f66e483e737f93af073d81961d31ecd

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: java
 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